Commit 71c72ed0 authored by Max Kellermann's avatar Max Kellermann

output/Control: use Command::OPEN to unpause, remove special case

parent a8d343e0
...@@ -115,20 +115,10 @@ AudioOutput::Open(const AudioFormat audio_format, const MusicPipe &mp) ...@@ -115,20 +115,10 @@ AudioOutput::Open(const AudioFormat audio_format, const MusicPipe &mp)
if (open && audio_format == request.audio_format) { if (open && audio_format == request.audio_format) {
assert(&pipe.GetPipe() == &mp || (always_on && pause)); assert(&pipe.GetPipe() == &mp || (always_on && pause));
if (pause) { if (!pause)
pipe.Init(mp); /* already open, already the right parameters
- nothing needs to be done */
/* unpause with the CANCEL command; this is a return true;
hack, but suits well for forcing the thread
to leave the ao_pause() thread, and we need
to flush the device buffer anyway */
/* we're not using audio_output_cancel() here,
because that function is asynchronous */
CommandWait(Command::CANCEL);
}
return true;
} }
request.audio_format = audio_format; request.audio_format = audio_format;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment