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

output/Thread: move code to BeginPause(), IteratePause()

Browse Source
This commit is contained in:
Max Kellermann 2017-04-28 22:01:20 +02:00
parent 2a831fa547
commit 59181ac5fb
2 changed files with 31 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/output/Internal.hxx
View File

@ -516,6 +516,9 @@ private:
*/ */
bool Play(); bool Play();
void BeginPause();
bool IteratePause();
void Pause(); void Pause();
/** /**

30
src/output/Thread.cxx
View File

@ -365,7 +365,7 @@ AudioOutput::Play()
} }
inline void inline void
AudioOutput::Pause() AudioOutput::BeginPause()
{ {
{ {
const ScopeUnlock unlock(mutex); const ScopeUnlock unlock(mutex);
@ -373,13 +373,13 @@ AudioOutput::Pause()
} }
pause = true; pause = true;
CommandFinished(); }
do {
if (!WaitForDelay())
break;
inline bool
AudioOutput::IteratePause()
{
bool success; bool success;
try { try {
const ScopeUnlock unlock(mutex); const ScopeUnlock unlock(mutex);
success = ao_plugin_pause(*this); success = ao_plugin_pause(*this);
@ -389,10 +389,24 @@ AudioOutput::Pause()
success = false; success = false;
} }
if (!success) { if (!success)
Close(false); Close(false);
return success;
}
inline void
AudioOutput::Pause()
{
BeginPause();
CommandFinished();
do {
if (!WaitForDelay())
break;
if (!IteratePause())
break; break;
}
} while (command == Command::NONE); } while (command == Command::NONE);
pause = false; pause = false;