From: Andre Noll <maan@systemlinux.org>
Date: Thu, 10 Dec 2009 13:50:03 +0000 (+0100)
Subject: Merge branch 'maint'
X-Git-Tag: v0.4.1~7
X-Git-Url: http://git.tuebingen.mpg.de/?a=commitdiff_plain;h=63c4f3404cfb3aea943949d81b03bca14dbea559;hp=c553c9e0439eac2e0e03c9e948698e192ef63234;p=paraslash.git

Merge branch 'maint'

Conflicts:

	osx_write.c
---

diff --git a/osx_write.c b/osx_write.c
index bc11e61a..97a7ccf4 100644
--- a/osx_write.c
+++ b/osx_write.c
@@ -14,7 +14,6 @@
 #include <regex.h>
 #include <sys/types.h>
 #include <dirent.h>
-#include <CoreAudio/CoreAudio.h>
 
 #include "para.h"
 #include "fd.h"
@@ -26,10 +25,9 @@
 #include "osx_write.cmdline.h"
 #include "error.h"
 
-
-#include <CoreAudio/CoreAudio.h>
+#include <CoreServices/CoreServices.h>
 #include <AudioUnit/AudioUnit.h>
-#include <AudioToolbox/DefaultAudioOutput.h>
+#include <AudioToolbox/AudioToolbox.h>
 
 /** describes one input buffer for the osx writer */
 struct osx_buffer {