Complete Disobedience transition to event_ from _monitor.

[disorder] / server / speaker-command.c

diff --git a/server/speaker-command.c b/server/speaker-command.c
index 088d0cd77b5faf57112aafecef8627491a2b19db..7e19e2b58a961332a61aed5a298c8cd3a359d9d7 100644 (file)
--- a/server/speaker-command.c
+++ b/server/speaker-command.c
@@ -1,6 +1,7 @@
 /*
  * This file is part of DisOrder
  * Copyright (C) 2005, 2006, 2007 Richard Kettlewell
 /*
  * This file is part of DisOrder
  * Copyright (C) 2005, 2006, 2007 Richard Kettlewell

+ * Portions (C) 2007 Mark Wooding

  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by


@@ -20,8 +21,7 @@
 /** @file server/speaker-command.c
  * @brief Support for @ref BACKEND_COMMAND */
 
 /** @file server/speaker-command.c
  * @brief Support for @ref BACKEND_COMMAND */
 

-#include <config.h>
-#include "types.h"
+#include "common.h"

 
 #include <unistd.h>
 #include <poll.h>
 
 #include <unistd.h>
 #include <poll.h>


@@ -96,7 +96,7 @@ static size_t command_play(size_t frames) {
 }
 
 /** @brief Update poll array for writing to subprocess */
 }
 
 /** @brief Update poll array for writing to subprocess */

-static void command_beforepoll(void) {
+static void command_beforepoll(int attribute((unused)) *timeoutp) {

   /* We send sample data to the subprocess as fast as it can accept it.
    * This isn't ideal as pause latency can be very high as a result. */
   if(cmdfd >= 0)
   /* We send sample data to the subprocess as fast as it can accept it.
    * This isn't ideal as pause latency can be very high as a result. */
   if(cmdfd >= 0)