~mdw
/
disorder
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Confirmation strings are now invariant under URL-encoding. They are still
[disorder]
/
server
/
speaker.c
diff --git
a/server/speaker.c
b/server/speaker.c
index
dc9b981
..
ae43f12
100644
(file)
--- a/
server/speaker.c
+++ b/
server/speaker.c
@@
-1,6
+1,7
@@
/*
* This file is part of DisOrder
* Copyright (C) 2005, 2006, 2007 Richard Kettlewell
/*
* This file is part of DisOrder
* Copyright (C) 2005, 2006, 2007 Richard Kettlewell
+ * Portions (C) 2007 Mark Wooding
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@
-68,6
+69,7
@@
#include <fcntl.h>
#include <poll.h>
#include <sys/un.h>
#include <fcntl.h>
#include <poll.h>
#include <sys/un.h>
+#include <sys/stat.h>
#include "configuration.h"
#include "syscalls.h"
#include "configuration.h"
#include "syscalls.h"
@@
-77,6
+79,7
@@
#include "speaker-protocol.h"
#include "user.h"
#include "speaker.h"
#include "speaker-protocol.h"
#include "user.h"
#include "speaker.h"
+#include "printf.h"
/** @brief Linked list of all prepared tracks */
struct track *tracks;
/** @brief Linked list of all prepared tracks */
struct track *tracks;
@@
-141,7
+144,7
@@
static void help(void) {
/* Display version number and terminate. */
static void version(void) {
/* Display version number and terminate. */
static void version(void) {
- xprintf("
disorder-speaker version %s\n
", disorder_version_string);
+ xprintf("
%s
", disorder_version_string);
xfclose(stdout);
exit(0);
}
xfclose(stdout);
exit(0);
}
@@
-351,8
+354,10
@@
static void speaker_play(size_t frames) {
if(!playing->used || playing->start == (sizeof playing->buffer))
playing->start = 0;
/* If the buffer emptied out mark the track as unplayably */
if(!playing->used || playing->start == (sizeof playing->buffer))
playing->start = 0;
/* If the buffer emptied out mark the track as unplayably */
- if(!playing->used)
+ if(!playing->used && !playing->eof) {
+ error(0, "track buffer emptied");
playing->playable = 0;
playing->playable = 0;
+ }
frames -= written_frames;
return;
}
frames -= written_frames;
return;
}
@@
-595,6
+600,7
@@
int main(int argc, char **argv) {
static const int one = 1;
struct speaker_message sm;
const char *d;
static const int one = 1;
struct speaker_message sm;
const char *d;
+ char *dir;
set_progname(argv);
if(!setlocale(LC_CTYPE, "")) fatal(errno, "error calling setlocale");
set_progname(argv);
if(!setlocale(LC_CTYPE, "")) fatal(errno, "error calling setlocale");
@@
-629,18
+635,23
@@
int main(int argc, char **argv) {
if(getuid() == 0 || geteuid() == 0) fatal(0, "do not run as root");
/* identify the backend used to play */
for(n = 0; backends[n]; ++n)
if(getuid() == 0 || geteuid() == 0) fatal(0, "do not run as root");
/* identify the backend used to play */
for(n = 0; backends[n]; ++n)
- if(backends[n]->backend == config->
speaker_backend
)
+ if(backends[n]->backend == config->
api
)
break;
if(!backends[n])
break;
if(!backends[n])
- fatal(0, "unsupported
backend %d", config->speaker_backend
);
+ fatal(0, "unsupported
api %d", config->api
);
backend = backends[n];
/* backend-specific initialization */
backend->init();
backend = backends[n];
/* backend-specific initialization */
backend->init();
+ /* create the socket directory */
+ byte_xasprintf(&dir, "%s/speaker", config->home);
+ unlink(dir); /* might be a leftover socket */
+ if(mkdir(dir, 0700) < 0 && errno != EEXIST)
+ fatal(errno, "error creating %s", dir);
/* set up the listen socket */
listenfd = xsocket(PF_UNIX, SOCK_STREAM, 0);
memset(&addr, 0, sizeof addr);
addr.sun_family = AF_UNIX;
/* set up the listen socket */
listenfd = xsocket(PF_UNIX, SOCK_STREAM, 0);
memset(&addr, 0, sizeof addr);
addr.sun_family = AF_UNIX;
- snprintf(addr.sun_path, sizeof addr.sun_path, "%s/speaker",
+ snprintf(addr.sun_path, sizeof addr.sun_path, "%s/speaker
/socket
",
config->home);
if(unlink(addr.sun_path) < 0 && errno != ENOENT)
error(errno, "removing %s", addr.sun_path);
config->home);
if(unlink(addr.sun_path) < 0 && errno != ENOENT)
error(errno, "removing %s", addr.sun_path);