X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=osx_writer.c;h=c4a97e4b5ae9c0f2575f8239bb79c43dab45a8f7;hb=ee055536fd64fa1c382d0c8f81c242ef2e8a79db;hp=df4194122f50818270c904da533fc4a113d81c93;hpb=c839ef92e35d5604748aa4674b400156ff7baced;p=paraslash.git

diff --git a/osx_writer.c b/osx_writer.c
index df419412..c4a97e4b 100644
--- a/osx_writer.c
+++ b/osx_writer.c
@@ -50,6 +50,7 @@ struct private_osx_writer_data {
 	sem_t *semaphore;
 	osx_buffer *from; /* Current buffers */
 	osx_buffer *to;
+	unsigned samplerate;
 };
 
 
@@ -113,9 +114,14 @@ static void fill_buffer(osx_buffer *b, short *source, long size)
 		b->size = size;
 	}
 	dest = b->buffer;
-	while (size--)
+	while (size--) {
+		char *tmp = (char *)source;
+		char c = *tmp;
+		*tmp = *(tmp + 1);
+		*(tmp + 1) = c;
 		/* *dest++ = ((*source++) + 32768) / 65536.0; */
 		*dest++ = (*source++) / 32768.0;
+	}
 	b->ptr = b->buffer;
 	b->remaining = b->size;
 }
@@ -176,6 +182,8 @@ static int osx_writer_open(struct writer_node *wn)
 	AudioStreamBasicDescription format;
 	char s[10];
 	int m, ret;
+	struct writer_node_group *wng = wn->wng;
+	struct osx_write_args_info *conf = wn->conf;
 
 	wn->private_data = powd;
 	/* where did that default audio output go? */
@@ -204,7 +212,11 @@ static int osx_writer_open(struct writer_node *wn)
 	 * AND you want the DefaultOutputUnit to do any format conversions
 	 * necessary from your format to the device's format.
 	 */
-	format.mSampleRate = 44100.0; /* The sample rate of the audio stream */
+	if (!conf->samplerate_given && wng->samplerate)
+		powd->samplerate = *wng->samplerate;
+	else
+		powd->samplerate = conf->samplerate_arg;
+	format.mSampleRate = powd->samplerate;
 	/* The specific encoding type of audio stream*/
 	format.mFormatID = kAudioFormatLinearPCM;
 	/* flags specific to each format */
@@ -215,8 +227,10 @@ static int osx_writer_open(struct writer_node *wn)
 	 * We produce 2-channel audio. Now if we have a mega-super-hyper card for our
 	 * audio, it is its problem to convert it to 8-, 16-, 32- or 1024-channel data.
 	 */
-	format.mBytesPerFrame = (format.mFramesPerPacket = 1)
-		* (format.mBytesPerPacket = (format.mChannelsPerFrame = 2) * sizeof(float));
+	format.mFramesPerPacket = 1;
+	format.mChannelsPerFrame = 2;
+	format.mBytesPerPacket = format.mChannelsPerFrame * sizeof(float);
+	format.mBytesPerFrame = format.mFramesPerPacket * format.mBytesPerPacket;
 	/* one of the most constant constants of the whole computer history */
 	format.mBitsPerChannel = sizeof(float) * 8;
 	ret = -E_STREAM_FORMAT;
@@ -240,7 +254,7 @@ static int osx_writer_open(struct writer_node *wn)
 			kAudioUnitScope_Input, 0, &inputCallback,
 			sizeof(inputCallback)) < 0)
 		goto e3;
-	return 0;
+	return 1;
 e3:
 	destroy_buffers(powd);
 e2:
@@ -279,20 +293,30 @@ static void osx_writer_close(struct writer_node *wn)
 	free(powd);
 }
 
+static int need_new_buffer(struct writer_node *wn)
+{
+	struct writer_node_group *wng = wn->wng;
+	struct private_osx_writer_data *powd = wn->private_data;
+
+	if (*wng->loaded < sizeof(short))
+		return 0;
+	if (powd->to->remaining) /* Non empty buffer, must still be playing */
+		return 0;
+	return 1;
+}
+
 static int osx_write_post_select(__a_unused struct sched *s,
 		struct writer_node *wn)
 {
 	struct private_osx_writer_data *powd = wn->private_data;
 	struct writer_node_group *wng = wn->wng;
-	short *data = (short*)wng->buf + wn->written;
+	short *data = (short*)wng->buf;
 
-	if (*wng->loaded <= wn->written)
-		return 1;
-	if (powd->to->remaining) /* Non empty buffer, must still be playing */
+	if (!need_new_buffer(wn))
 		return 1;
-	fill_buffer(powd->to, data, (*wng->loaded - wn->written) / sizeof(short));
+	fill_buffer(powd->to, data, *wng->loaded / sizeof(short));
 	powd->to = powd->to->next;
-	wn->written += (*wng->loaded - wn->written);
+	wn->written = *wng->loaded;
 	if (!powd->play) {
 		if (AudioOutputUnitStart(powd->output))
 			return -1;
@@ -301,15 +325,8 @@ static int osx_write_post_select(__a_unused struct sched *s,
 	return 1;
 }
 
-static int osx_write_pre_select(struct sched *s, struct writer_node *wn)
+static int osx_write_pre_select(struct sched *s, __a_unused struct writer_node *wn)
 {
-	struct writer_node_group *wng = wn->wng;
-	struct private_osx_writer_data *powd = wn->private_data;
-
-//	if (!*wng->loaded)
-//		return 1;
-//	if (powd->to->remaining) /* Non empty buffer, must still be playing */
-//		return 1;
 	s->timeout.tv_sec = 0;
 	s->timeout.tv_usec = 20;
 	return 1;