chiark
/
gitweb
/
~mdw
/
disorder
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
report unreadable tracks and dirs
[disorder]
/
lib
/
configuration.c
diff --git
a/lib/configuration.c
b/lib/configuration.c
index 92acce183f8b75eec4b70d2aa3a28e78483ca4cd..a506ee948fe8439167324c928017c341aca36d93 100644
(file)
--- a/
lib/configuration.c
+++ b/
lib/configuration.c
@@
-439,7
+439,7
@@
static int set_backend(const struct config_state *cs,
return -1;
}
if(!strcmp(vec[0], "alsa")) {
return -1;
}
if(!strcmp(vec[0], "alsa")) {
-#if
API_ALSA
+#if
HAVE_ALSA_ASOUNDLIB_H
*valuep = BACKEND_ALSA;
#else
error(0, "%s:%d: ALSA is not available on this platform",
*valuep = BACKEND_ALSA;
#else
error(0, "%s:%d: ALSA is not available on this platform",
@@
-1084,8
+1084,10
@@
static void config_postdefaults(struct config *c,
else if(c->broadcast.n)
c->speaker_backend = BACKEND_NETWORK;
else {
else if(c->broadcast.n)
c->speaker_backend = BACKEND_NETWORK;
else {
-#if
API_ALSA
+#if
HAVE_ALSA_ASOUNDLIB_H
c->speaker_backend = BACKEND_ALSA;
c->speaker_backend = BACKEND_ALSA;
+#elif HAVE_SYS_SOUNDCARD_H
+ c->speaker_backend = BACKEND_OSS;
#elif HAVE_COREAUDIO_AUDIOHARDWARE_H
c->speaker_backend = BACKEND_COREAUDIO;
#else
#elif HAVE_COREAUDIO_AUDIOHARDWARE_H
c->speaker_backend = BACKEND_COREAUDIO;
#else