~mdw
/
disorder
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
utf32_word_split() and utf8_word_split() splits a string into words
[disorder]
/
server
/
speaker.c
diff --git
a/server/speaker.c
b/server/speaker.c
index
75e9cd7
..
55dde7e
100644
(file)
--- a/
server/speaker.c
+++ b/
server/speaker.c
@@
-117,6
+117,8
@@
static const struct option options[] = {
{ "config", required_argument, 0, 'c' },
{ "debug", no_argument, 0, 'd' },
{ "no-debug", no_argument, 0, 'D' },
{ "config", required_argument, 0, 'c' },
{ "debug", no_argument, 0, 'd' },
{ "no-debug", no_argument, 0, 'D' },
+ { "syslog", no_argument, 0, 's' },
+ { "no-syslog", no_argument, 0, 'S' },
{ 0, 0, 0, 0 }
};
{ 0, 0, 0, 0 }
};
@@
-129,6
+131,7
@@
static void help(void) {
" --version, -V Display version number\n"
" --config PATH, -c PATH Set configuration file\n"
" --debug, -d Turn on debugging\n"
" --version, -V Display version number\n"
" --config PATH, -c PATH Set configuration file\n"
" --debug, -d Turn on debugging\n"
+ " --[no-]syslog Force logging\n"
"\n"
"Speaker process for DisOrder. Not intended to be run\n"
"directly.\n");
"\n"
"Speaker process for DisOrder. Not intended to be run\n"
"directly.\n");
@@
-372,7
+375,7
@@
int addfd(int fd, int events) {
/** @brief Table of speaker backends */
static const struct speaker_backend *backends[] = {
/** @brief Table of speaker backends */
static const struct speaker_backend *backends[] = {
-#if
API_ALSA
+#if
HAVE_ALSA_ASOUNDLIB_H
&alsa_backend,
#endif
&command_backend,
&alsa_backend,
#endif
&command_backend,
@@
-380,6
+383,9
@@
static const struct speaker_backend *backends[] = {
#if HAVE_COREAUDIO_AUDIOHARDWARE_H
&coreaudio_backend,
#endif
#if HAVE_COREAUDIO_AUDIOHARDWARE_H
&coreaudio_backend,
#endif
+#if HAVE_SYS_SOUNDCARD_H
+ &oss_backend,
+#endif
0
};
0
};
@@
-429,7
+435,7
@@
static void mainloop(void) {
* instead, but the post-poll code will cope even if it's
* device_closed. */
if(device_state == device_open)
* instead, but the post-poll code will cope even if it's
* device_closed. */
if(device_state == device_open)
- backend->beforepoll();
+ backend->beforepoll(
&timeout
);
}
/* If any other tracks don't have a full buffer, try to read sample data
* from them. We do this last of all, so that if we run out of slots,
}
/* If any other tracks don't have a full buffer, try to read sample data
* from them. We do this last of all, so that if we run out of slots,
@@
-579,26
+585,28
@@
static void mainloop(void) {
}
int main(int argc, char **argv) {
}
int main(int argc, char **argv) {
- int n;
+ int n
, logsyslog = !isatty(2)
;
struct sockaddr_un addr;
static const int one = 1;
struct speaker_message sm;
struct sockaddr_un addr;
static const int one = 1;
struct speaker_message sm;
+ const char *d;
set_progname(argv);
if(!setlocale(LC_CTYPE, "")) fatal(errno, "error calling setlocale");
set_progname(argv);
if(!setlocale(LC_CTYPE, "")) fatal(errno, "error calling setlocale");
- while((n = getopt_long(argc, argv, "hVc:dD", options, 0)) >= 0) {
+ while((n = getopt_long(argc, argv, "hVc:dD
Ss
", options, 0)) >= 0) {
switch(n) {
case 'h': help();
case 'V': version();
case 'c': configfile = optarg; break;
case 'd': debugging = 1; break;
case 'D': debugging = 0; break;
switch(n) {
case 'h': help();
case 'V': version();
case 'c': configfile = optarg; break;
case 'd': debugging = 1; break;
case 'D': debugging = 0; break;
+ case 'S': logsyslog = 0; break;
+ case 's': logsyslog = 1; break;
default: fatal(0, "invalid option");
}
}
default: fatal(0, "invalid option");
}
}
- if(getenv("DISORDER_DEBUG_SPEAKER")) debugging = 1;
- /* If stderr is a TTY then log there, otherwise to syslog. */
- if(!isatty(2)) {
+ if((d = getenv("DISORDER_DEBUG_SPEAKER"))) debugging = atoi(d);
+ if(logsyslog) {
openlog(progname, LOG_PID, LOG_DAEMON);
log_default = &log_syslog;
}
openlog(progname, LOG_PID, LOG_DAEMON);
log_default = &log_syslog;
}