X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=osx_write.c;h=f2e5c485e52dada412c0e2c8e7b6bc3971720b7b;hp=4d0bfbdf4f4f9aa300364aa3d53dcee40bb8ba14;hb=883af7d8af543616fe4ca09b0273dd4f59848779;hpb=d7fd31be838a33e3a55717f80be850b7db55746d

diff --git a/osx_write.c b/osx_write.c
index 4d0bfbdf..f2e5c485 100644
--- a/osx_write.c
+++ b/osx_write.c
@@ -52,13 +52,19 @@ struct osx_buffer {
 	struct osx_buffer *next;
 };
 
+/** data specific to the osx writer */
 struct private_osx_write_data {
-	long size;
-	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;
 };
 
@@ -186,12 +192,11 @@ 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->size = 0;
 	powd->play = 0;
 	/* Hmmm, let's choose PCM format */
 	/* We tell the Output Unit what format we're going to supply data to it.
@@ -221,13 +226,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;
@@ -235,9 +240,9 @@ 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;
 }
@@ -262,9 +267,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);
 }
@@ -294,7 +299,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;
 	}
@@ -328,6 +333,7 @@ min_delay:
 	return 1;
 }
 
+/** the init function of the osx writer */
 void osx_write_init(struct writer *w)
 {
 	w->open = osx_write_open;