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

output_control: ao_command() calls ao_command_async() 

Merge some code.
This commit is contained in:
Max Kellermann 2011-01-10 21:52:38 +01:00
parent 1025f0be91
commit 319ba94a52
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/output_control.c
View File

@ -47,14 +47,6 @@ static void ao_command_wait(struct audio_output *ao)
} }
} }
static void ao_command(struct audio_output *ao, enum audio_output_command cmd)
{
assert(ao->command == AO_COMMAND_NONE);
ao->command = cmd;
g_cond_signal(ao->cond);
ao_command_wait(ao);
}
static void ao_command_async(struct audio_output *ao, static void ao_command_async(struct audio_output *ao,
enum audio_output_command cmd) enum audio_output_command cmd)
{ {
@ -63,6 +55,13 @@ static void ao_command_async(struct audio_output *ao,
g_cond_signal(ao->cond); g_cond_signal(ao->cond);
} }
static void
ao_command(struct audio_output *ao, enum audio_output_command cmd)
{
ao_command_async(ao, cmd);
ao_command_wait(ao);
}
void void
audio_output_enable(struct audio_output *ao) audio_output_enable(struct audio_output *ao)
{ {