X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=osx_write.c;h=aa95d38314a169f7dcb37f83634ca969f97857c5;hp=6001b8597d8823f1c7d528439580836088b269cf;hb=749fe6ea3ee4f9411d82ced21bba9029c410ed87;hpb=806fcbb5a8c00d6b8c1a228b9b4d6b6758f613ca

diff --git a/osx_write.c b/osx_write.c
index 6001b859..aa95d383 100644
--- a/osx_write.c
+++ b/osx_write.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006-2008 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2006-2009 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -19,6 +19,7 @@
 #include "string.h"
 #include "list.h"
 #include "sched.h"
+#include "ggo.h"
 #include "write.h"
 #include "osx_write.cmdline.h"
 #include "error.h"
@@ -81,7 +82,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;
@@ -148,6 +149,12 @@ static OSStatus osx_callback(void * inClientData,
 	return 0;
 }
 
+#ifdef WORDS_BIGENDIAN /* ppc */
+#define ENDIAN_FLAGS kLinearPCMFormatFlagIsBigEndian
+#else
+#define ENDIAN_FLAGS 0
+#endif
+
 static int osx_write_open(struct writer_node *wn)
 {
 	struct private_osx_write_data *powd = para_calloc(
@@ -195,7 +202,7 @@ static int osx_write_open(struct writer_node *wn)
 	/* flags specific to each format */
 	format.mFormatFlags = kLinearPCMFormatFlagIsFloat
 		| kLinearPCMFormatFlagIsPacked
-		| kLinearPCMFormatFlagIsBigEndian;
+		| ENDIAN_FLAGS;
 	if (!conf->channels_given && wng->channels)
 		powd->channels = *wng->channels;
 	else
@@ -272,7 +279,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;