X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=osx_write.c;h=c40428895ece1e8376cd6e58b83a2369eba53fa4;hp=f67a63ac1cae42eea3e7a4776e3b3353aadfedcb;hb=refs%2Fheads%2Fv0.3;hpb=00e4d4da1b2c00da139b09d3ed4ab9ad9fba2691

diff --git a/osx_write.c b/osx_write.c
index f67a63ac..c4042889 100644
--- a/osx_write.c
+++ b/osx_write.c
@@ -13,20 +13,20 @@
 
 #include <sys/types.h>
 #include <dirent.h>
-#include <CoreAudio/CoreAudio.h>
+
 #include "para.h"
 #include "fd.h"
 #include "string.h"
 #include "list.h"
 #include "sched.h"
+#include "ggo.h"
 #include "write.h"
 #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 {
@@ -81,7 +81,7 @@ static void init_buffers(struct writer_node *wn)
 
 	ptrptr = &powd->to;
 	for (i = 0; i < conf->numbuffers_arg; i++) {
-		*ptrptr = malloc(sizeof(struct osx_buffer));
+		*ptrptr = para_malloc(sizeof(struct osx_buffer));
 		(*ptrptr)->size = 0;
 		(*ptrptr)->remaining = 0;
 		(*ptrptr)->buffer = NULL;
@@ -278,7 +278,7 @@ static int osx_write_post_select(__a_unused struct sched *s,
 {
 	struct private_osx_write_data *powd = wn->private_data;
 	struct writer_node_group *wng = wn->wng;
-	short *data = (short*)wng->buf;
+	short *data = (short*)*wng->bufp;
 
 	if (!need_new_buffer(wn))
 		return 1;