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

diff --git a/osx_write.c b/osx_write.c
index 153ae3d6..aa95d383 100644
--- a/osx_write.c
+++ b/osx_write.c
@@ -1,19 +1,7 @@
 /*
- * Copyright (C) 2006 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2006-2009 Andre Noll <maan@systemlinux.org>
  *
- *     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
- *     (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.
- *
- *     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, USA.
+ * Licensed under the GPL v2. For licencing details see COPYING.
  */
 
 /** \file osx_write.c paraslash's output plugin for MacOs */
@@ -23,12 +11,15 @@
  * <skortze@sourceforge.net>
  */
 
+#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"
@@ -44,7 +35,7 @@ struct osx_buffer {
 	float *buffer;
 	/** the size of this buffer */
 	long size;
-	/* current position in the buffer */
+	/** current position in the buffer */
 	float *ptr;
 	/** number of floats not yet consuned */
 	long remaining;
@@ -52,6 +43,7 @@ struct osx_buffer {
 	struct osx_buffer *next;
 };
 
+/** data specific to the osx writer */
 struct private_osx_write_data {
 	/** the main control structure for audio data manipulation */
 	AudioUnit audio_unit;
@@ -59,7 +51,7 @@ struct private_osx_write_data {
 	char play;
 	/** callback reads audio data from this buffer */
 	struct osx_buffer *from;
-	/* the post_select writes audio data here */
+	/** the post_select writes audio data here */
 	struct osx_buffer *to;
 	/** sample rate of the current audio stream */
 	unsigned samplerate;
@@ -90,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;
@@ -110,14 +102,8 @@ static void fill_buffer(struct osx_buffer *b, short *source, long size)
 		b->size = size;
 	}
 	dest = b->buffer;
-	while (size--) {
-		char *tmp = (char *)source;
-		char c = *tmp;
-		*tmp = *(tmp + 1);
-		*(tmp + 1) = c;
-		/* *dest++ = ((*source++) + 32768) / 65536.0; */
+	while (size--)
 		*dest++ = (*source++) / 32768.0;
-	}
 	b->ptr = b->buffer;
 	b->remaining = b->size;
 }
@@ -141,11 +127,8 @@ static OSStatus osx_callback(void * inClientData,
 		dest = outOutputData->mBuffers[i].mData;
 		while (m > 0) {
 			if ((n = powd->from->remaining) <= 0) {
-				PARA_INFO_LOG("%s", "buffer underrun\n");
-				/* no more bytes in the current read buffer! */
-				while ((n = powd->from->remaining) <= 0)
-					/* wait for the results */
-					usleep(2000);
+				PARA_INFO_LOG("buffer underrun\n");
+				return 0;
 			}
 //			PARA_INFO_LOG("buf %p: n = %ld, m= %ld\n", powd->from->buffer, n, m);
 			/*
@@ -166,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(
@@ -213,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
@@ -246,7 +235,7 @@ e0:
 	return ret;
 }
 
-__malloc void *osx_write_parse_config(char *options)
+__malloc static void *osx_write_parse_config(const char *options)
 {
 	struct osx_write_args_info *conf
 		= para_calloc(sizeof(struct osx_write_args_info));
@@ -290,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;