player/Thread: eliminate LockWaitDecoderStartup()

08b4a7aa · Max Kellermann · 1f0770ca · 08b4a7aa
Commit 08b4a7aa authored Dec 22, 2017 by Max Kellermann
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 6 deletions

Thread.cxx src/player/Thread.cxx +2 -6

No files found.
--- a/src/player/Thread.cxx
+++ b/src/player/Thread.cxx
@@ -231,11 +231,6 @@ private:
 		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.
 	 *
@@ -641,7 +636,8 @@ Player::SeekDecoder() noexcept
 		StartDecoder(*pipe);
 		ActivateDecoder();

-		if (!LockWaitDecoderStartup())
+		const std::lock_guard<Mutex> lock(pc.mutex);
+		if (!WaitDecoderStartup())
 			return false;
 	} else {
 		if (!IsDecoderAtCurrentSong()) {