#include <fcntl.h>
#include <poll.h>
#include <sys/un.h>
+#include <sys/stat.h>
#include "configuration.h"
#include "syscalls.h"
#include "speaker-protocol.h"
#include "user.h"
#include "speaker.h"
+#include "printf.h"
/** @brief Linked list of all prepared tracks */
struct track *tracks;
/* 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);
}
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;
+ }
frames -= written_frames;
return;
}
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");
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);