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

diff --git a/osx_write.c b/osx_write.c
index 153ae3d6..107746c7 100644
--- a/osx_write.c
+++ b/osx_write.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2006-2007 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
@@ -44,7 +44,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 +52,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 +60,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;
@@ -142,10 +143,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);
 			/*
@@ -246,7 +244,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));