oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

Merge branch 'v0.17.x'

Browse Source
This commit is contained in:
Max Kellermann 2012-10-02 17:34:03 +02:00
commit ade0483641
3 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
NEWS
View File

@ -13,6 +13,7 @@ ver 0.18 (2012/??/??)
ver 0.17.3 (2012/??/??) ver 0.17.3 (2012/??/??)
* output: * output:
- osx: fix pops during playback
- recorder: fix I/O error check - recorder: fix I/O error check
- shout: fix memory leak in error handler - shout: fix memory leak in error handler
- recorder, shout: support Ogg packets that span more than one page - recorder, shout: support Ogg packets that span more than one page

10
src/output/osx_output_plugin.c
View File

@ -228,9 +228,13 @@ osx_render(void *vdata,
g_cond_signal(od->condition); g_cond_signal(od->condition);
g_mutex_unlock(od->mutex); g_mutex_unlock(od->mutex);
if (nbytes < buffer_size) buffer->mDataByteSize = nbytes;
memset((unsigned char*)buffer->mData + nbytes, 0,
buffer_size - nbytes); unsigned i;
for (i = 1; i < buffer_list->mNumberBuffers; ++i) {
buffer = &buffer_list->mBuffers[i];
buffer->mDataByteSize = 0;
}
return 0; return 0;
} }

2
test/dump_playlist.c
View File

@ -159,7 +159,7 @@ int main(int argc, char **argv)
config_global_init(); config_global_init();
success = config_read_file(argv[1], &error); success = config_read_file(argv[1], &error);
if (!success) { if (!success) {
g_printerr("%s:", error->message); g_printerr("%s\n", error->message);
g_error_free(error); g_error_free(error);
return 1; return 1;
} }