X-Git-Url: https://git.distorted.org.uk/~mdw/disorder/blobdiff_plain/f74fc096a6c4e8f2e5742c9a6114916d950db5fa..bd8895a87731c72190ea2012f36583f796d4181a:/server/speaker.c?ds=sidebyside

diff --git a/server/speaker.c b/server/speaker.c
index 4082064..ae43f12 100644
--- a/server/speaker.c
+++ b/server/speaker.c
@@ -69,6 +69,7 @@
 #include <fcntl.h>
 #include <poll.h>
 #include <sys/un.h>
+#include <sys/stat.h>
 
 #include "configuration.h"
 #include "syscalls.h"
@@ -78,6 +79,7 @@
 #include "speaker-protocol.h"
 #include "user.h"
 #include "speaker.h"
+#include "printf.h"
 
 /** @brief Linked list of all prepared tracks */
 struct track *tracks;
@@ -142,7 +144,7 @@ static void help(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);
 }
@@ -352,7 +354,7 @@ 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) {
+  if(!playing->used && !playing->eof) {
     error(0, "track buffer emptied");
     playing->playable = 0;
   }
@@ -598,6 +600,7 @@ int main(int argc, char **argv) {
   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");
@@ -632,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(backends[n]->backend == config->speaker_backend)
+    if(backends[n]->backend == config->api)
       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();
+  /* 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;
-  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);