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

output_control: fixed deadlock in audio_output_update() 

Call a version of audio_output_close() which doesn't lock recursively.
This commit is contained in:
Max Kellermann 2009-10-29 22:39:42 +01:00
parent bb5acc939f
commit 975143ab47
1 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/output_control.c
View File

@ -157,6 +157,26 @@ audio_output_open(struct audio_output *ao,
return open; return open;
} }
/**
* Same as audio_output_close(), but expects the lock to be held by
* the caller.
*/
static void
audio_output_close_locked(struct audio_output *ao)
{
if (ao->mixer != NULL)
mixer_auto_close(ao->mixer);
assert(!ao->open || ao->fail_timer == NULL);
if (ao->open)
ao_command(ao, AO_COMMAND_CLOSE);
else if (ao->fail_timer != NULL) {
g_timer_destroy(ao->fail_timer);
ao->fail_timer = NULL;
}
}
bool bool
audio_output_update(struct audio_output *ao, audio_output_update(struct audio_output *ao,
const struct audio_format *audio_format, const struct audio_format *audio_format,
@ -174,7 +194,7 @@ audio_output_update(struct audio_output *ao,
return success; return success;
} }
} else if (audio_output_is_open(ao)) } else if (audio_output_is_open(ao))
audio_output_close(ao); audio_output_close_locked(ao);
g_mutex_unlock(ao->mutex); g_mutex_unlock(ao->mutex);
return false; return false;