~mdw
/
disorder
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
make sure disorder-normalize gets the right config file
[disorder]
/
server
/
speaker.c
diff --git
a/server/speaker.c
b/server/speaker.c
index
fabdfc4
..
8a3eb06
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);
}
@@
-195,7
+198,7
@@
static void destroy(struct track *t) {
* main loop whenever the track's file descriptor is readable, assuming the
* buffer has not reached the maximum allowed occupancy.
*/
* main loop whenever the track's file descriptor is readable, assuming the
* buffer has not reached the maximum allowed occupancy.
*/
-static int fill(struct track *t) {
+static int
speaker_
fill(struct track *t) {
size_t where, left;
int n;
size_t where, left;
int n;
@@
-218,9
+221,12
@@
static int fill(struct track *t) {
if(n == 0) {
D(("fill %s: eof detected", t->id));
t->eof = 1;
if(n == 0) {
D(("fill %s: eof detected", t->id));
t->eof = 1;
+ t->playable = 1;
return -1;
}
t->used += n;
return -1;
}
t->used += n;
+ if(t->used == sizeof t->buffer)
+ t->playable = 1;
}
return 0;
}
}
return 0;
}
@@
-280,6
+286,17
@@
static void maybe_finished(void) {
abandon();
}
abandon();
}
+/** @brief Return nonzero if we want to play some audio
+ *
+ * We want to play audio if there is a current track; and it is not paused; and
+ * it is playable according to the rules for @ref track::playable.
+ */
+static int playable(void) {
+ return playing
+ && !paused
+ && playing->playable;
+}
+
/** @brief Play up to @p frames frames of audio
*
* It is always safe to call this function.
/** @brief Play up to @p frames frames of audio
*
* It is always safe to call this function.
@@
-290,15
+307,15
@@
static void maybe_finished(void) {
* - If there is not enough audio to play then it play what is available.
*
* If there are not enough frames to play then whatever is available is played
* - If there is not enough audio to play then it play what is available.
*
* If there are not enough frames to play then whatever is available is played
- * instead. It is up to mainloop() to ensure that
play() is not called when
- * unreasonably only an small amounts of data is available to play.
+ * instead. It is up to mainloop() to ensure that
speaker_play() is not called
+ *
when
unreasonably only an small amounts of data is available to play.
*/
*/
-static void play(size_t frames) {
+static void
speaker_
play(size_t frames) {
size_t avail_frames, avail_bytes, written_frames;
ssize_t written_bytes;
size_t avail_frames, avail_bytes, written_frames;
ssize_t written_bytes;
- /* Make sure there's a track to play and it is not pa
su
ed */
- if(!play
ing || paused
)
+ /* Make sure there's a track to play and it is not pa
us
ed */
+ if(!play
able()
)
return;
/* Make sure the output device is open */
if(device_state != device_open) {
return;
/* Make sure the output device is open */
if(device_state != device_open) {
@@
-336,6
+353,11
@@
static void play(size_t frames) {
* empty) wrap it back to the start. */
if(!playing->used || playing->start == (sizeof playing->buffer))
playing->start = 0;
* empty) wrap it back to the start. */
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->eof) {
+ error(0, "track buffer emptied");
+ playing->playable = 0;
+ }
frames -= written_frames;
return;
}
frames -= written_frames;
return;
}
@@
-389,18
+411,6
@@
static const struct speaker_backend *backends[] = {
0
};
0
};
-/** @brief Return nonzero if we want to play some audio
- *
- * We want to play audio if there is a current track; and it is not paused; and
- * there are at least @ref FRAMES frames of audio to play, or we are in sight
- * of the end of the current track.
- */
-static int playable(void) {
- return playing
- && !paused
- && (playing->used >= FRAMES || playing->eof);
-}
-
/** @brief Main event loop */
static void mainloop(void) {
struct track *t;
/** @brief Main event loop */
static void mainloop(void) {
struct track *t;
@@
-460,15
+470,15
@@
static void mainloop(void) {
/* We want to play some audio */
if(device_state == device_open) {
if(backend->ready())
/* We want to play some audio */
if(device_state == device_open) {
if(backend->ready())
- play(3 * FRAMES);
+
speaker_
play(3 * FRAMES);
} else {
/* We must be in _closed or _error, and it should be the latter, but we
* cope with either.
*
} else {
/* We must be in _closed or _error, and it should be the latter, but we
* cope with either.
*
- * We most likely timed out, so now is a good time to retry.
play()
- * knows to re-activate the device if necessary.
+ * We most likely timed out, so now is a good time to retry.
+ *
speaker_play()
knows to re-activate the device if necessary.
*/
*/
- play(3 * FRAMES);
+
speaker_
play(3 * FRAMES);
}
}
/* Perhaps a connection has arrived */
}
}
/* Perhaps a connection has arrived */
@@
-522,9
+532,9
@@
static void mainloop(void) {
error(0, "cannot play track because no connection arrived");
playing = t;
/* We attempt to play straight away rather than going round the loop.
error(0, "cannot play track because no connection arrived");
playing = t;
/* We attempt to play straight away rather than going round the loop.
- * play() is clever enough to perform any activation that is
+ *
speaker_
play() is clever enough to perform any activation that is
* required. */
* required. */
- play(3 * FRAMES);
+
speaker_
play(3 * FRAMES);
report();
break;
case SM_PAUSE:
report();
break;
case SM_PAUSE:
@@
-538,7
+548,7
@@
static void mainloop(void) {
paused = 0;
/* As for SM_PLAY we attempt to play straight away. */
if(playing)
paused = 0;
/* As for SM_PLAY we attempt to play straight away. */
if(playing)
- play(3 * FRAMES);
+
speaker_
play(3 * FRAMES);
}
report();
break;
}
report();
break;
@@
-571,7
+581,7
@@
static void mainloop(void) {
if(t->fd != -1
&& t->slot != -1
&& (fds[t->slot].revents & (POLLIN | POLLHUP)))
if(t->fd != -1
&& t->slot != -1
&& (fds[t->slot].revents & (POLLIN | POLLHUP)))
- fill(t);
+
speaker_
fill(t);
/* Maybe we finished playing a track somewhere in the above */
maybe_finished();
/* If we don't need the sound device for now then close it for the benefit
/* Maybe we finished playing a track somewhere in the above */
maybe_finished();
/* If we don't need the sound device for now then close it for the benefit
@@
-590,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");
@@
-631,11
+642,16
@@
int main(int argc, char **argv) {
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);