Skip to content

M
mpd
Commit 08b4a7aa authored by Max Kellermann's avatar Max Kellermann
Browse files
Options

player/Thread: eliminate LockWaitDecoderStartup()

parent 1f0770ca
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 6 deletions
src/player/Thread.cxx
View file @ 08b4a7aa
...@@ -231,11 +231,6 @@ private: ...@@ -231,11 +231,6 @@ private:
return true; return true;
} }
bool LockWaitDecoderStartup() noexcept {
const std::lock_guard<Mutex> lock(pc.mutex);
return WaitDecoderStartup();
}
/** /**
* Stop the decoder and clears (and frees) its music pipe. * Stop the decoder and clears (and frees) its music pipe.
* *
...@@ -641,7 +636,8 @@ Player::SeekDecoder() noexcept ...@@ -641,7 +636,8 @@ Player::SeekDecoder() noexcept
StartDecoder(*pipe); StartDecoder(*pipe);
ActivateDecoder(); ActivateDecoder();
if (!LockWaitDecoderStartup()) const std::lock_guard<Mutex> lock(pc.mutex);
if (!WaitDecoderStartup())
return false; return false;
} else { } else {
if (!IsDecoderAtCurrentSong()) { if (!IsDecoderAtCurrentSong()) {
......
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