Core Audio support should now include descriptions in error strings.

[disorder] / server / speaker-coreaudio.c

diff --git a/server/speaker-coreaudio.c b/server/speaker-coreaudio.c
index 75a69dd7d2d9ba72819f6458ca607e92eb8b3570..ac4e7e70251360d2d7d8211638cb45dbb1ff688b 100644 (file)
--- a/server/speaker-coreaudio.c
+++ b/server/speaker-coreaudio.c
@@ -2,20 +2,18 @@
  * This file is part of DisOrder
  * Copyright (C) 2007 Richard Kettlewell
  *
- * This program is free software; you can redistribute it and/or modify
+ * 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
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 /** @file server/speaker-coreaudio.c
  * @brief Support for @ref BACKEND_COREAUDIO
@@ -32,22 +30,20 @@
  * @todo support @ref config::device
  */
 
-#include <config.h>
+#include "common.h"
 
 #if HAVE_COREAUDIO_AUDIOHARDWARE_H
 
-#include "types.h"
-
 #include <poll.h>
 #include <sys/socket.h>
 #include <unistd.h>
-#include <CoreAudio/AudioHardware.h>
 
 #include "configuration.h"
 #include "syscalls.h"
 #include "log.h"
 #include "speaker-protocol.h"
 #include "speaker.h"
+#include "coreaudio.h"
 
 /** @brief Core Audio Device ID */
 static AudioDeviceID adid;
@@ -117,13 +113,7 @@ static void coreaudio_init(void) {
   UInt32 propertySize;
   AudioStreamBasicDescription asbd;
 
-  propertySize = sizeof adid;
-  status = AudioHardwareGetProperty(kAudioHardwarePropertyDefaultOutputDevice,
-                                   &propertySize, &adid);
-  if(status)
-    fatal(0, "AudioHardwareGetProperty: %d", (int)status);
-  if(adid == kAudioDeviceUnknown)
-    fatal(0, "no output device");
+  adid = coreaudio_getdevice(config->device);
   propertySize = sizeof asbd;
   status = AudioDeviceGetProperty(adid, 0, false,
                                  kAudioDevicePropertyStreamFormat,
@@ -202,7 +192,7 @@ static size_t coreaudio_play(size_t frames) {
 }
 
 /** @brief Fill in poll fd array for Core Audio */
-static void coreaudio_beforepoll(void) {
+static void coreaudio_beforepoll(int attribute((unused)) *timeoutp) {
   pfd_slot = addfd(pfd[1], POLLOUT);
 }