~mdw
/
disorder
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
server subprocesses should log to the same place the server does
[disorder]
/
server
/
play.c
diff --git
a/server/play.c
b/server/play.c
index
f0ac386
..
13854f7
100644
(file)
--- a/
server/play.c
+++ b/
server/play.c
@@
-151,10
+151,14
@@
void speaker_setup(ev_source *ev) {
signal(SIGPIPE, SIG_DFL);
#if 0
execlp("valgrind", "valgrind", SPEAKER, "--config", configfile,
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,
#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);
}
#endif
fatal(errno, "error invoking %s", SPEAKER);
}
@@
-285,15
+289,15
@@
static int find_player(const struct queue_entry *q) {
}
/* Return values from start() */
}
/* 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
/** @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_SOFTF
T
AIL
+ * @return @ref START_OK, @ref START_HARDFAIL or @ref START_SOFTFAIL
*/
static int start(ev_source *ev,
struct queue_entry *q,
*/
static int start(ev_source *ev,
struct queue_entry *q,