From 9994521b8cbb15cc455d62e129a9c6cebdc7e42a Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Tue, 2 Oct 2012 17:27:47 +0200 Subject: [PATCH 1/2] test/dump_playlist: add missing newline to error message --- test/dump_playlist.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/dump_playlist.c b/test/dump_playlist.c index 0570f6e49..84ac69045 100644 --- a/test/dump_playlist.c +++ b/test/dump_playlist.c @@ -161,7 +161,7 @@ int main(int argc, char **argv) config_global_init(); success = config_read_file(argv[1], &error); if (!success) { - g_printerr("%s:", error->message); + g_printerr("%s\n", error->message); g_error_free(error); return 1; } From 03a401e4779a287d2760376a10ef4ea415803b00 Mon Sep 17 00:00:00 2001 From: Gregory Smith Date: Tue, 2 Oct 2012 08:18:41 -0700 Subject: [PATCH 2/2] OSX: Set mDataByteSize correctly on AudioBuffers during render. --- NEWS | 1 + src/output/osx_output_plugin.c | 10 +++++++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/NEWS b/NEWS index c08a779e0..b280e6162 100644 --- a/NEWS +++ b/NEWS @@ -1,5 +1,6 @@ ver 0.17.3 (2012/??/??) * output: + - osx: fix pops during playback - recorder: fix I/O error check - shout: fix memory leak in error handler - recorder, shout: support Ogg packets that span more than one page diff --git a/src/output/osx_output_plugin.c b/src/output/osx_output_plugin.c index fbba81749..cd51fca20 100644 --- 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; }