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

diff --git a/server/play.c b/server/play.c
index 7b70799..f38c9d5 100644
--- a/server/play.c
+++ b/server/play.c
@@ -44,6 +44,7 @@
 #include "configuration.h"
 #include "queue.h"
 #include "server-queue.h"
+#include "rights.h"
 #include "trackdb.h"
 #include "play.h"
 #include "plugin.h"
@@ -110,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 */
@@ -371,6 +373,7 @@ 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);
     if(lfd != -1) {
@@ -387,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 */
@@ -398,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);
@@ -426,6 +435,7 @@ static int start(ev_source *ev,
 	   * (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 */