More reliable gapless play.

[disorder] / server / play.c

diff --git a/server/play.c b/server/play.c
index 9a04a98860e3325c0f739f8ac17006f459ca0564..93a7f48fa8996f8a8d6b456245b652f477c16fdc 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);


@@ -492,7 +494,6 @@ static void chosen_random_track(ev_source *ev,
     return;
   /* Add the track to the queue */
   q = queue_add(track, 0, WHERE_END, origin_random);
     return;
   /* Add the track to the queue */
   q = queue_add(track, 0, WHERE_END, origin_random);

-  q->state = playing_random;

   D(("picked %p (%s) at random", (void *)q, q->track));
   queue_write();
   /* Maybe a track can now be played */
   D(("picked %p (%s) at random", (void *)q, q->track));
   queue_write();
   /* Maybe a track can now be played */


@@ -644,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);