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

Merge branch 'v0.16.x'

Browse Source 
Conflicts:
	src/player_thread.c
	src/playlist_control.c
This commit is contained in:
Max Kellermann
2011-07-20 21:46:05 +02:00
parent 57936a1374 838f7cd210
commit 0ea4c970d7
13 changed files with 101 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/output_thread.c
View File

@@ -641,8 +641,13 @@ static gpointer audio_output_task(gpointer arg)
case AO_COMMAND_CANCEL:
ao->chunk = NULL;
if (ao->open)
if (ao->open) {
g_mutex_unlock(ao->mutex);
ao_plugin_cancel(ao->plugin, ao->data);
g_mutex_lock(ao->mutex);
}
ao_command_finished(ao);
/* the player thread will now clear our music