X-Git-Url: https://git.distorted.org.uk/~mdw/disorder/blobdiff_plain/e99d42b153659e7ac644bb93700acb81514998e5..b9ea01d83fc29c8a2d3fdae6d31bdc0a524a91e8:/server/play.c

diff --git a/server/play.c b/server/play.c
index 1ca6434..01d80a6 100644
--- a/server/play.c
+++ b/server/play.c
@@ -43,6 +43,7 @@
 #include "mem.h"
 #include "configuration.h"
 #include "queue.h"
+#include "server-queue.h"
 #include "trackdb.h"
 #include "play.h"
 #include "plugin.h"
@@ -150,10 +151,14 @@ void speaker_setup(ev_source *ev) {
     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 +169,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 +289,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,
@@ -423,7 +428,9 @@ 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);
+	  execlp("disorder-normalize", "disorder-normalize",
+		 log_default == &log_syslog ? "--syslog" : "--no-syslog",
+		 (char *)0);
 	  fatal(errno, "executing disorder-normalize");
 	  /* end of the innermost fork */
 	}