Merge branch 'v0.17.x'

2012-10-02 17:34:03 +02:00
parent e5fd1924db 03a401e477
commit ade0483641
3 changed files with 9 additions and 4 deletions
--- a/src/output/osx_output_plugin.c
+++ b/src/output/osx_output_plugin.c
@@ -228,9 +228,13 @@ osx_render(void *vdata,
 	g_cond_signal(od->condition);
 	g_mutex_unlock(od->mutex);

-	if (nbytes < buffer_size)
-		memset((unsigned char*)buffer->mData + nbytes, 0,
-		       buffer_size - nbytes);
+	buffer->mDataByteSize = nbytes;
+
+	unsigned i;
+	for (i = 1; i < buffer_list->mNumberBuffers; ++i) {
+		buffer = &buffer_list->mBuffers[i];
+		buffer->mDataByteSize = 0;
+	}

 	return 0;
 }