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

output: join the output thread after sending the KILL command 

Be sure that the output thread has quite before we start destructing
the output object.
This commit is contained in:
Max Kellermann 2009-01-07 23:55:13 +01:00
parent 405c102c17
commit bf058f978a
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/output_control.c
View File

@ -134,8 +134,12 @@ void audio_output_close(struct audio_output *audioOutput)
void audio_output_finish(struct audio_output *audioOutput)
{
audio_output_close(audioOutput);
if (audioOutput->thread != NULL)
if (audioOutput->thread != NULL) {
ao_command(audioOutput, AO_COMMAND_KILL);
g_thread_join(audioOutput->thread);
}
if (audioOutput->plugin->finish)
audioOutput->plugin->finish(audioOutput->data);
if (audioOutput->convBuffer)

2
src/output_thread.c
View File

@ -175,6 +175,6 @@ void audio_output_thread_start(struct audio_output *ao)
assert(ao->command == AO_COMMAND_NONE);
if (!(ao->thread = g_thread_create(audio_output_task, ao, FALSE, &e)))
if (!(ao->thread = g_thread_create(audio_output_task, ao, true, &e)))
g_error("Failed to spawn output task: %s\n", e->message);
}