X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/blobdiff_plain/937be4c02816d026de3063f32d82fafda1f3c512..e84fb5f0c934ff2b8054a582c2ce09bcb05cba40:/server/speaker.c diff --git a/server/speaker.c b/server/speaker.c index 75e9cd7..19f88b2 100644 --- a/server/speaker.c +++ b/server/speaker.c @@ -372,13 +372,16 @@ int addfd(int fd, int events) { /** @brief Table of speaker backends */ static const struct speaker_backend *backends[] = { -#if API_ALSA +#if HAVE_ALSA_ASOUNDLIB_H &alsa_backend, #endif &command_backend, &network_backend, #if HAVE_COREAUDIO_AUDIOHARDWARE_H &coreaudio_backend, +#endif +#if HAVE_SYS_SOUNDCARD_H + &oss_backend, #endif 0 }; @@ -429,7 +432,7 @@ static void mainloop(void) { * 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,