X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/blobdiff_plain/937be4c02816d026de3063f32d82fafda1f3c512..af7a85b709c60a644fe04e77a3289bcd120ba1b2:/server/play.c

diff --git a/server/play.c b/server/play.c
index 35d756b..f38c9d5 100644
--- a/server/play.c
+++ b/server/play.c
@@ -43,6 +43,8 @@
 #include "mem.h"
 #include "configuration.h"
 #include "queue.h"
+#include "server-queue.h"
+#include "rights.h"
 #include "trackdb.h"
 #include "play.h"
 #include "plugin.h"
@@ -109,10 +111,11 @@ static int speaker_readable(ev_source *ev, int fd,
     D(("SM_PAUSED %s %ld", sm.id, sm.data));
     playing->sofar = sm.data;
     break;
-  case SM_FINISHED:
-    /* the playing track finished */
-    D(("SM_FINISHED %s", sm.id));
-    finished(ev);
+  case SM_FINISHED:			/* scratched the playing track */
+  case SM_STILLBORN:			/* scratched too early */
+  case SM_UNKNOWN:			/* scratched WAY too early */
+    if(playing && !strcmp(sm.id, playing->id))
+      finished(ev);
     break;
   case SM_PLAYING:
     /* track ID is playing, DATA seconds played */
@@ -126,16 +129,12 @@ static int speaker_readable(ev_source *ev, int fd,
 }
 
 void speaker_setup(ev_source *ev) {
-  int sp[2], lfd;
+  int sp[2];
   pid_t pid;
   struct speaker_message sm;
 
   if(socketpair(PF_UNIX, SOCK_DGRAM, 0, sp) < 0)
     fatal(errno, "error calling socketpair");
-  if(!isatty(2))
-    lfd = logfd(ev, SPEAKER);
-  else
-    lfd = -1;
   if(!(pid = xfork())) {
     exitfn = _exit;
     ev_signal_atfork(ev);
@@ -143,17 +142,17 @@ void speaker_setup(ev_source *ev) {
     xdup2(sp[0], 1);
     xclose(sp[0]);
     xclose(sp[1]);
-    if(lfd != -1) {
-      xdup2(lfd, 2);
-      xclose(lfd);
-    }
     signal(SIGPIPE, SIG_DFL);
 #if 0
     execlp("valgrind", "valgrind", SPEAKER, "--config", configfile,
-	   debugging ? "--debug" : "--no-debug", (char *)0);
+	   debugging ? "--debug" : "--no-debug",
+	   log_default == &log_syslog ? "--syslog" : "--no-syslog",
+	   (char *)0);
 #else
     execlp(SPEAKER, SPEAKER, "--config", configfile,
-	   debugging ? "--debug" : "--no-debug", (char *)0);
+	   debugging ? "--debug" : "--no-debug",
+	   log_default == &log_syslog ? "--syslog" : "--no-syslog",
+	   (char *)0);
 #endif
     fatal(errno, "error invoking %s", SPEAKER);
   }
@@ -164,7 +163,7 @@ void speaker_setup(ev_source *ev) {
   /* 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);
+  ev_fd(ev, ev_read, speaker_fd, speaker_readable, 0, "speaker read");
 }
 
 void speaker_reload(void) {
@@ -284,15 +283,15 @@ static int find_player(const struct queue_entry *q) {
 }
 
 /* Return values from start() */
-#define START_OK 0			/* Succeeded. */
-#define START_HARDFAIL 1		/* Track is broken. */
-#define START_SOFTFAIL 2	   /* Track OK, system (temporarily?) broken */
+#define START_OK 0			/**< @brief Succeeded. */
+#define START_HARDFAIL 1		/**< @brief Track is broken. */
+#define START_SOFTFAIL 2	   /**< @brief Track OK, system (temporarily?) broken */
 
 /** @brief Play or prepare @p q
  * @param ev Event loop
  * @param q Track to play/prepare
  * @param prepare_only If true, only prepares track
- * @return @ref START_OK, @ref START_HARDFAIL or @ref START_SOFTFTAIL
+ * @return @ref START_OK, @ref START_HARDFAIL or @ref START_SOFTFAIL
  */
 static int start(ev_source *ev,
 		 struct queue_entry *q,
@@ -315,14 +314,16 @@ static int start(ev_source *ev,
 
   memset(&sm, 0, sizeof sm);
   D(("start %s %d", q->id, prepare_only));
-  if(find_player_pid(q->id) > 0) {
-    if(prepare_only) return START_OK;
-    /* We have already prepared this track so we just need to tell the speaker
-     * process to start actually playing the queued up audio data */
-    strcpy(sm.id, q->id);
-    sm.type = SM_PLAY;
-    speaker_send(speaker_fd, &sm);
-    D(("sent SM_PLAY for %s", sm.id));
+  if(q->prepared) {
+    /* The track is alraedy prepared */
+    if(!prepare_only) {
+      /* We want to run it, since it's prepared the answer is to tell the
+       * speaker to set it off */
+      strcpy(sm.id, q->id);
+      sm.type = SM_PLAY;
+      speaker_send(speaker_fd, &sm);
+      D(("sent SM_PLAY for %s", sm.id));
+    }
     return START_OK;
   }
   /* Find the player plugin. */
@@ -343,8 +344,11 @@ static int start(ev_source *ev,
     }
   /* Use the second arg as the tag if available (it's probably a command name),
    * otherwise the module name. */
-  lfd = logfd(ev, (config->player.s[n].s[2]
-		   ? config->player.s[n].s[2] : config->player.s[n].s[1]));
+  if(!isatty(2))
+    lfd = logfd(ev, (config->player.s[n].s[2]
+		     ? config->player.s[n].s[2] : config->player.s[n].s[1]));
+  else
+    lfd = -1;
   optc = config->player.s[n].n - 2;
   optv = (void *)&config->player.s[n].s[2];
   while(optc > 0 && optv[0][0] == '-') {
@@ -369,11 +373,14 @@ static int start(ev_source *ev,
   switch(pid = fork()) {
   case 0:			/* child */
     exitfn = _exit;
+    progname = "disorderd-fork";
     ev_signal_atfork(ev);
     signal(SIGPIPE, SIG_DFL);
-    xdup2(lfd, 1);
-    xdup2(lfd, 2);
-    xclose(lfd);			/* tidy up */
+    if(lfd != -1) {
+      xdup2(lfd, 1);
+      xdup2(lfd, 2);
+      xclose(lfd);			/* tidy up */
+    }
     setpgid(0, 0);
     if((q->type & DISORDER_PLAYER_TYPEMASK) == DISORDER_PLAYER_RAW) {
       /* "Raw" format players always have their output send down a pipe
@@ -383,8 +390,14 @@ static int start(ev_source *ev,
       /* np will be the pipe to disorder-normalize */
       if(socketpair(PF_UNIX, SOCK_STREAM, 0, np) < 0)
 	fatal(errno, "error calling socketpair");
-      xshutdown(np[0], SHUT_WR);	/* normalize reads from np[0] */
+      /* Beware of the Leopard!  On OS X 10.5.x, the order of the shutdown
+       * calls here DOES MATTER.  If you do the SHUT_WR first then the SHUT_RD
+       * fails with "Socket is not connected".  I think this is a bug but
+       * provided implementors either don't care about the order or all agree
+       * about the order, choosing the reliable order is an adequate
+       * workaround.  */
       xshutdown(np[1], SHUT_RD);	/* decoder writes to np[1] */
+      xshutdown(np[0], SHUT_WR);	/* normalize reads from np[0] */
       blocking(np[0]);
       blocking(np[1]);
       /* Start disorder-normalize */
@@ -394,7 +407,7 @@ static int start(ev_source *ev,
 	  memset(&addr, 0, sizeof addr);
 	  addr.sun_family = AF_UNIX;
 	  snprintf(addr.sun_path, sizeof addr.sun_path,
-		   "%s/speaker", config->home);
+		   "%s/speaker/socket", config->home);
 	  sfd = xsocket(PF_UNIX, SOCK_STREAM, 0);
 	  if(connect(sfd, (const struct sockaddr *)&addr, sizeof addr) < 0)
 	    fatal(errno, "connecting to %s", addr.sun_path);
@@ -418,7 +431,12 @@ static int start(ev_source *ev,
 	    speaker_send(speaker_fd, &sm);
 	    D(("sent SM_PLAY for %s", sm.id));
 	  }
-	  execlp("disorder-normalize", "disorder-normalize", (char *)0);
+	  /* TODO stderr shouldn't be redirected for disorder-normalize
+	   * (but it should be for play_track() */
+	  execlp("disorder-normalize", "disorder-normalize",
+		 log_default == &log_syslog ? "--syslog" : "--no-syslog",
+		 "--config", configfile,
+		 (char *)0);
 	  fatal(errno, "executing disorder-normalize");
 	  /* end of the innermost fork */
 	}
@@ -467,11 +485,14 @@ static int start(ev_source *ev,
     error(errno, "error calling fork");
     if(q->type & DISORDER_PLAYER_PREFORK)
       play_cleanup(q->pl, q->data);	/* else would leak */
-    xclose(lfd);
+    if(lfd != -1)
+      xclose(lfd);
     return START_SOFTFAIL;
   }
   store_player_pid(q->id, pid);
-  xclose(lfd);
+  q->prepared = 1;
+  if(lfd != -1)
+    xclose(lfd);
   setpgid(pid, pid);
   ev_child(ev, pid, 0, player_finished, q);
   D(("player subprocess ID %lu", (unsigned long)pid));