X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=osx_write.c;h=366252c4539b1b022d2625c22c1c8bbae211c668;hp=95a84f2a548cbe153cff31f1ae831ecb1cebae6a;hb=cd8bb5a2d51179a31842a2cd7012cad28deea78d;hpb=2e8b7f42a30ebe41c862cc603c8f746b1e202479

diff --git a/osx_write.c b/osx_write.c
index 95a84f2a..366252c4 100644
--- a/osx_write.c
+++ b/osx_write.c
@@ -1,19 +1,7 @@
 /*
- * Copyright (C) 2006-2007 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2006-2008 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,6 +11,8 @@
  * <skortze@sourceforge.net>
  */
 
+#include <sys/types.h>
+#include <dirent.h>
 #include <CoreAudio/CoreAudio.h>
 #include "para.h"
 #include "fd.h"
@@ -44,7 +34,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;
@@ -60,7 +50,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;
@@ -111,14 +101,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;
 }
@@ -143,10 +127,7 @@ static OSStatus osx_callback(void * inClientData,
 		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);
+				return 0;
 			}
 //			PARA_INFO_LOG("buf %p: n = %ld, m= %ld\n", powd->from->buffer, n, m);
 			/*