chiark
/
gitweb
/
~mdw
/
disorder
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Complete README changes for scripts/setup. README.{mac,freebsd} are
[disorder]
/
server
/
speaker.c
diff --git
a/server/speaker.c
b/server/speaker.c
index d21ad7cd8c4e976eff06580ab2e20de92896c9c6..407b1d7a6f37000e9d1334eadf8d5c0333dc881a 100644
(file)
--- a/
server/speaker.c
+++ b/
server/speaker.c
@@
-69,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"
@@
-78,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;
@@
-561,8
+563,11
@@
static void mainloop(void) {
playing = 0;
}
destroy(t);
playing = 0;
}
destroy(t);
- } else
+ } else {
+ sm.type = SM_UNKNOWN;
+ speaker_send(1, &sm);
error(0, "SM_CANCEL for unknown track %s", sm.id);
error(0, "SM_CANCEL for unknown track %s", sm.id);
+ }
report();
break;
case SM_RELOAD:
report();
break;
case SM_RELOAD:
@@
-598,6
+603,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");
@@
-632,18
+638,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);