Merge disorder.userman branch

[disorder] / server / speaker-alsa.c

diff --git a/server/speaker-alsa.c b/server/speaker-alsa.c
index 731c4ff4c3dddd07db298de5bf8fdc51d7cac20c..8ed01a849cab810aa2a83dcb9a876944f8408f90 100644 (file)
--- a/server/speaker-alsa.c
+++ b/server/speaker-alsa.c
@@ -219,7 +219,7 @@ static size_t alsa_play(size_t frames) {
 static int alsa_slots, alsa_nslots = -1;
 
 /** @brief Fill in poll fd array for ALSA */
-static void alsa_beforepoll(void) {
+static void alsa_beforepoll(int attribute((unused)) *timeoutp) {
   /* We send sample data to ALSA as fast as it can accept it, relying on
    * the fact that it has a relatively small buffer to minimize pause
    * latency. */