From 223c129b6b710b60d885a4d26d036c2a314d10fc Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Fri, 5 Sep 2014 11:16:09 +0200 Subject: [PATCH] output/pulse: simplify _wait_for_operation() Eliminate the duplicate pa_operation_get_state() call. --- src/output/plugins/PulseOutputPlugin.cxx | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/output/plugins/PulseOutputPlugin.cxx b/src/output/plugins/PulseOutputPlugin.cxx index ec3725a71..120bad090 100644 --- a/src/output/plugins/PulseOutputPlugin.cxx +++ b/src/output/plugins/PulseOutputPlugin.cxx @@ -148,16 +148,13 @@ static bool pulse_wait_for_operation(struct pa_threaded_mainloop *mainloop, struct pa_operation *operation) { - pa_operation_state_t state; - assert(mainloop != nullptr); assert(operation != nullptr); - state = pa_operation_get_state(operation); - while (state == PA_OPERATION_RUNNING) { + pa_operation_state_t state; + while ((state = pa_operation_get_state(operation)) + == PA_OPERATION_RUNNING) pa_threaded_mainloop_wait(mainloop); - state = pa_operation_get_state(operation); - } pa_operation_unref(operation);