diff options
| author | Max Kellermann <max@duempel.org> | 2012-10-02 17:34:03 +0200 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2012-10-02 17:34:03 +0200 |
| commit | ade04836419cadeae3a831575c53f76019ca5ae8 (patch) | |
| tree | 6f93740b2ab114320a2169f9db94a45ceed632c1 | |
| parent | e5fd1924dba9bcf2a296fa16561e00d72cb0bc00 (diff) | |
| parent | 03a401e4779a287d2760376a10ef4ea415803b00 (diff) | |
| download | mpd-ade04836419cadeae3a831575c53f76019ca5ae8.tar.gz mpd-ade04836419cadeae3a831575c53f76019ca5ae8.tar.xz mpd-ade04836419cadeae3a831575c53f76019ca5ae8.zip | |
Merge branch 'v0.17.x'
| -rw-r--r-- | NEWS | 1 | ||||
| -rw-r--r-- | src/output/osx_output_plugin.c | 10 | ||||
| -rw-r--r-- | test/dump_playlist.c | 2 |
3 files changed, 9 insertions, 4 deletions
@@ -13,6 +13,7 @@ ver 0.18 (2012/??/??) 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; } diff --git a/test/dump_playlist.c b/test/dump_playlist.c index 28237a799..566872664 100644 --- a/test/dump_playlist.c +++ b/test/dump_playlist.c @@ -159,7 +159,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; } |