decoder/Control: caller must lock mutex for Start()

src/decoder/DecoderControl.cxx

@@ -94,8 +94,6 @@ DecoderControl::Start(std::unique_ptr<DetachedSong> _song,
 		      SongTime _start_time, SongTime _end_time,
 		      MusicBuffer &_buffer, MusicPipe &_pipe) noexcept
 {
-	const std::lock_guard<Mutex> protect(mutex);
-
 	assert(_song != nullptr);
 	assert(_pipe.IsEmpty());
 

src/decoder/DecoderControl.hxx

@@ -372,6 +372,8 @@ public:
 	/**
 	 * Start the decoder.
 	 *
+	 * Caller must lock the object.
+	 *
 	 * @param song the song to be decoded; the given instance will be
 	 * owned and freed by the decoder
 	 * @param start_time see #DecoderControl

src/player/Thread.cxx

@@ -361,11 +361,10 @@ Player::StartDecoder(MusicPipe &_pipe) noexcept
 	assert(queued || pc.command == PlayerCommand::SEEK);
 	assert(pc.next_song != nullptr);
 
-	{
-		/* copy ReplayGain parameters to the decoder */
-		const std::lock_guard<Mutex> protect(pc.mutex);
-		dc.replay_gain_mode = pc.replay_gain_mode;
-	}
+	const std::lock_guard<Mutex> protect(pc.mutex);
+
+	/* copy ReplayGain parameters to the decoder */
+	dc.replay_gain_mode = pc.replay_gain_mode;
 
 	SongTime start_time = pc.next_song->GetStartTime() + pc.seek_time;