output_control: ao_command() calls ao_command_async()

Merge some code.

output_control: ao_command() calls ao_command_async()
319ba94a · Max Kellermann · 1025f0be · 319ba94a
Commit 319ba94a authored Jan 10, 2011 by Max Kellermann
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 7 deletions

output_control.c src/output_control.c +6 -7

No files found.
--- a/src/output_control.c
+++ b/src/output_control.c
@@ -47,20 +47,19 @@ static void ao_command_wait(struct audio_output *ao)
 	}
 }

-static void ao_command(struct audio_output *ao, enum audio_output_command cmd)
+static void ao_command_async(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,
-			     enum audio_output_command cmd)
+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_async(ao, cmd);
+	ao_command_wait(ao);
 }

 void