Skip to content

M
mpd
Commit 451b142e authored by Max Kellermann's avatar Max Kellermann
Browse files
Options

player/Thread: finish decoder startup before checking the buffer

This fixes a valgrind warning because `buffer_before_play` initialization needs to know the audio format from the decoder.
parent 28336252
Show whitespace changes
Inline Side-by-side
Showing with 9 additions and 9 deletions
src/player/Thread.cxx
View file @ 451b142e
...@@ -970,6 +970,15 @@ Player::Run() noexcept ...@@ -970,6 +970,15 @@ Player::Run() noexcept
pc.CommandFinished(); pc.CommandFinished();
while (ProcessCommand()) { while (ProcessCommand()) {
if (decoder_starting) {
/* wait until the decoder is initialized completely */
if (!CheckDecoderStartup())
break;
continue;
}
if (buffering) { if (buffering) {
/* buffering at the start of the song - wait /* buffering at the start of the song - wait
until the buffer is large enough, to until the buffer is large enough, to
...@@ -987,15 +996,6 @@ Player::Run() noexcept ...@@ -987,15 +996,6 @@ Player::Run() noexcept
} }
} }
if (decoder_starting) {
/* wait until the decoder is initialized completely */
if (!CheckDecoderStartup())
break;
continue;
}
if (dc.IsIdle() && queued && dc.pipe == pipe) { if (dc.IsIdle() && queued && dc.pipe == pipe) {
/* the decoder has finished the current song; /* the decoder has finished the current song;
make it decode the next song */ make it decode the next song */
......
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