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

output/pulse: simplify _wait_stream()

Browse Source 
One large loop and only one pa_stream_get_state() call.
This commit is contained in:
Max Kellermann 2012-08-14 22:22:55 +02:00
parent 249dcd967e
commit 51d793bec1
1 changed files with 16 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
src/output/pulse_output_plugin.c
View File

@ -681,35 +681,6 @@ pulse_output_close(struct audio_output *ao)
pa_threaded_mainloop_unlock(po->mainloop); pa_threaded_mainloop_unlock(po->mainloop);
} }
/**
* Check if the stream is (already) connected, and waits for a signal
* if not. The mainloop must be locked before calling this function.
*
* @return the current stream state
*/
static pa_stream_state_t
pulse_output_check_stream(struct pulse_output *po)
{
pa_stream_state_t state = pa_stream_get_state(po->stream);
assert(po->mainloop != NULL);
switch (state) {
case PA_STREAM_READY:
case PA_STREAM_FAILED:
case PA_STREAM_TERMINATED:
case PA_STREAM_UNCONNECTED:
break;
case PA_STREAM_CREATING:
pa_threaded_mainloop_wait(po->mainloop);
state = pa_stream_get_state(po->stream);
break;
}
return state;
}
/** /**
* Check if the stream is (already) connected, and waits if not. The * Check if the stream is (already) connected, and waits if not. The
* mainloop must be locked before calling this function. * mainloop must be locked before calling this function.
@ -719,35 +690,25 @@ pulse_output_check_stream(struct pulse_output *po)
static bool static bool
pulse_output_wait_stream(struct pulse_output *po, GError **error_r) pulse_output_wait_stream(struct pulse_output *po, GError **error_r)
{ {
pa_stream_state_t state = pa_stream_get_state(po->stream); while (true) {
switch (pa_stream_get_state(po->stream)) {
case PA_STREAM_READY:
return true;
switch (state) { case PA_STREAM_FAILED:
case PA_STREAM_READY: case PA_STREAM_TERMINATED:
return true; case PA_STREAM_UNCONNECTED:
g_set_error(error_r, pulse_output_quark(),
pa_context_errno(po->context),
"failed to connect the stream: %s",
pa_strerror(pa_context_errno(po->context)));
return false;
case PA_STREAM_FAILED: case PA_STREAM_CREATING:
case PA_STREAM_TERMINATED: pa_threaded_mainloop_wait(po->mainloop);
case PA_STREAM_UNCONNECTED: break;
g_set_error(error_r, pulse_output_quark(), 0, }
"disconnected");
return false;
case PA_STREAM_CREATING:
break;
} }
do {
state = pulse_output_check_stream(po);
} while (state == PA_STREAM_CREATING);
if (state != PA_STREAM_READY) {
g_set_error(error_r, pulse_output_quark(), 0,
"failed to connect the stream: %s",
pa_strerror(pa_context_errno(po->context)));
return false;
}
return true;
} }
/** /**