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

diff --git a/osx_write.c b/osx_write.c
index 45d6802a..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,12 +52,19 @@ struct osx_buffer {
 	struct osx_buffer *next;
 };
 
+/** data specific to the osx writer */
 struct private_osx_write_data {
-	AudioUnit output;
+	/** the main control structure for audio data manipulation */
+	AudioUnit audio_unit;
+	/** non-zero if playback has started */
 	char play;
-	struct osx_buffer *from; /* Current buffers */
+	/** callback reads audio data from this buffer */
+	struct osx_buffer *from;
+	/** the post_select writes audio data here */
 	struct osx_buffer *to;
+	/** sample rate of the current audio stream */
 	unsigned samplerate;
+	/** number of channels of the current audio stream */
 	unsigned channels;
 };
 
@@ -136,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);
 			/*
@@ -185,10 +189,10 @@ static int osx_write_open(struct writer_node *wn)
 	if (!comp)
 		goto e0;
 	ret = -E_OPEN_COMP;
-	if (OpenAComponent(comp, &powd->output))
+	if (OpenAComponent(comp, &powd->audio_unit))
 		goto e0;
 	ret = -E_UNIT_INIT;
-	if (AudioUnitInitialize(powd->output))
+	if (AudioUnitInitialize(powd->audio_unit))
 		goto e1;
 	powd->play = 0;
 	/* Hmmm, let's choose PCM format */
@@ -219,13 +223,13 @@ static int osx_write_open(struct writer_node *wn)
 	/* one of the most constant constants of the whole computer history */
 	format.mBitsPerChannel = sizeof(float) * 8;
 	ret = -E_STREAM_FORMAT;
-	if (AudioUnitSetProperty(powd->output, kAudioUnitProperty_StreamFormat,
+	if (AudioUnitSetProperty(powd->audio_unit, kAudioUnitProperty_StreamFormat,
 			kAudioUnitScope_Input, 0, &format,
 			sizeof(AudioStreamBasicDescription)))
 		goto e2;
 	init_buffers(wn);
 	ret = -E_ADD_CALLBACK;
-	if (AudioUnitSetProperty(powd->output, kAudioUnitProperty_SetRenderCallback,
+	if (AudioUnitSetProperty(powd->audio_unit, kAudioUnitProperty_SetRenderCallback,
 			kAudioUnitScope_Input, 0, &inputCallback,
 			sizeof(inputCallback)) < 0)
 		goto e3;
@@ -233,14 +237,14 @@ static int osx_write_open(struct writer_node *wn)
 e3:
 	destroy_buffers(powd);
 e2:
-	AudioUnitUninitialize(powd->output);
+	AudioUnitUninitialize(powd->audio_unit);
 e1:
-	CloseComponent(powd->output);
+	CloseComponent(powd->audio_unit);
 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));
@@ -260,9 +264,9 @@ static void osx_write_close(struct writer_node *wn)
 	struct private_osx_write_data *powd = wn->private_data;
 
 	PARA_INFO_LOG("closing writer node %p\n", wn);
-	AudioOutputUnitStop(powd->output);
-	AudioUnitUninitialize(powd->output);
-	CloseComponent(powd->output);
+	AudioOutputUnitStop(powd->audio_unit);
+	AudioUnitUninitialize(powd->audio_unit);
+	CloseComponent(powd->audio_unit);
 	destroy_buffers(powd);
 	free(powd);
 }
@@ -292,7 +296,7 @@ static int osx_write_post_select(__a_unused struct sched *s,
 	powd->to = powd->to->next;
 	wn->written = *wng->loaded;
 	if (!powd->play) {
-		if (AudioOutputUnitStart(powd->output))
+		if (AudioOutputUnitStart(powd->audio_unit))
 			return -E_UNIT_START;
 		powd->play = 1;
 	}
@@ -326,6 +330,7 @@ min_delay:
 	return 1;
 }
 
+/** the init function of the osx writer */
 void osx_write_init(struct writer *w)
 {
 	w->open = osx_write_open;