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

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

Browse Source
This commit is contained in:
Max Kellermann
2017-12-22 00:59:50 +01:00
parent 739e1da279
commit 910496cea9
3 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/decoder/DecoderControl.cxx
View File

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

2
src/decoder/DecoderControl.hxx
View File

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

5
src/player/Thread.cxx
View File

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