player/Thread: eliminate ClearAndReplacePipe()

Since commit e81b0896, this is the same code as in ReplacePipe().

player/Thread: eliminate ClearAndReplacePipe()
82954d1d · Max Kellermann · 5a02324c · 82954d1d
Commit 82954d1d authored Jun 23, 2018 by Max Kellermann
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 7 deletions

Thread.cxx src/player/Thread.cxx +1 -7

No files found.
--- a/src/player/Thread.cxx
+++ b/src/player/Thread.cxx
@@ -169,12 +169,6 @@ private:
 		xfade_state = CrossFadeState::UNKNOWN;
 	}

-	void ClearAndReplacePipe(MusicPipe *_pipe) noexcept {
-		ResetCrossFade();
-		delete pipe;
-		pipe = _pipe;
-	}
-
 	void ReplacePipe(MusicPipe *_pipe) noexcept {
 		ResetCrossFade();
 		delete pipe;
@@ -596,7 +590,7 @@ Player::SeekDecoder() noexcept
 		if (!IsDecoderAtCurrentSong()) {
 			/* the decoder is already decoding the "next" song,
 			   but it is the same song file; exchange the pipe */
-			ClearAndReplacePipe(dc.pipe);
+			ReplacePipe(dc.pipe);
 		}

 		pc.next_song.reset();