X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=osx_writer.c;h=9ea7ad454aafce0588a00a33f4122914e65f45ee;hp=4b505f0ee5de74be4cf8ec3902e74bb774820945;hb=b829b61f516298a0de3907cd4c30aef189dd8dd4;hpb=96bdf2d7b6206bb042031f2b13075a56bb8921a3

diff --git a/osx_writer.c b/osx_writer.c
index 4b505f0e..9ea7ad45 100644
--- a/osx_writer.c
+++ b/osx_writer.c
@@ -284,20 +284,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;