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

output: protect audio_output.open with the mutex

Browse Source 
There was a deadlock between the output thread and the player thread:
when the output thread failed (and closed itself) while the player
thread worked with the audio_output object, MPD could crash.
This commit is contained in:
Max Kellermann
2009-03-25 17:07:15 +01:00
parent 71cd24954a
commit 4dbf73d88b
3 changed files with 33 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/output_thread.c
View File

@@ -48,11 +48,11 @@ ao_close(struct audio_output *ao)
g_mutex_lock(ao->mutex);
ao->chunk = NULL;
ao->open = false;
g_mutex_unlock(ao->mutex);
ao_plugin_close(ao->plugin, ao->data);
pcm_convert_deinit(&ao->convert_state);
ao->open = false;
g_debug("closed plugin=%s name=\"%s\"", ao->plugin->name, ao->name);
}
@@ -198,8 +198,10 @@ static gpointer audio_output_task(gpointer arg)
assert(!ao->open);
if (ret) {
pcm_convert_init(&ao->convert_state);
ao->open = true;
g_mutex_lock(ao->mutex);
ao->open = true;
g_mutex_unlock(ao->mutex);
g_debug("opened plugin=%s name=\"%s\" "
"audio_format=%u:%u:%u",