~mdw
/
disorder
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
disorder-speaker now correctly listens for its own 'sigpipe'
[disorder]
/
server
/
play.c
diff --git
a/server/play.c
b/server/play.c
index
8b79843
..
93a7f48
100644
(file)
--- a/
server/play.c
+++ b/
server/play.c
@@
-128,7
+128,8
@@
void speaker_setup(ev_source *ev) {
/* Wait for the speaker to be ready */
speaker_recv(speaker_fd, &sm);
nonblock(speaker_fd);
/* Wait for the speaker to be ready */
speaker_recv(speaker_fd, &sm);
nonblock(speaker_fd);
- ev_fd(ev, ev_read, speaker_fd, speaker_readable, 0, "speaker read");
+ if(ev_fd(ev, ev_read, speaker_fd, speaker_readable, 0, "speaker read") < 0)
+ fatal(0, "error registering speaker socket fd");
}
void speaker_reload(void) {
}
void speaker_reload(void) {
@@
-365,7
+366,8
@@
static int start(ev_source *ev,
|| write(sfd, q->id, l) < 0)
fatal(errno, "writing to %s", addr.sun_path);
/* Await the ack */
|| write(sfd, q->id, l) < 0)
fatal(errno, "writing to %s", addr.sun_path);
/* Await the ack */
- read(sfd, &l, 1);
+ if (read(sfd, &l, 1) < 0)
+ fatal(errno, "reading ack from %s", addr.sun_path);
/* Plumbing */
xdup2(np[0], 0);
xdup2(sfd, 1);
/* Plumbing */
xdup2(np[0], 0);
xdup2(sfd, 1);
@@
-643,7
+645,6
@@
void scratch(const char *who, const char *id) {
if(playing_is_enabled() && config->scratch.n) {
int r = rand() * (double)config->scratch.n / (RAND_MAX + 1.0);
q = queue_add(config->scratch.s[r], who, WHERE_START, origin_scratch);
if(playing_is_enabled() && config->scratch.n) {
int r = rand() * (double)config->scratch.n / (RAND_MAX + 1.0);
q = queue_add(config->scratch.s[r], who, WHERE_START, origin_scratch);
- q->state = playing_isscratch;
}
notify_scratch(playing->track, playing->submitter, who,
time(0) - playing->played);
}
notify_scratch(playing->track, playing->submitter, who,
time(0) - playing->played);