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

decoder/Thread: use ScopeLock in decoder_run_stream()

Browse Source
This commit is contained in:
Max Kellermann 2015-12-31 13:01:49 +01:00
parent 00626b1633
commit 09157c3130
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/decoder/DecoderThread.cxx
View File

@ -281,20 +281,16 @@ decoder_run_stream(Decoder &decoder, const char *uri)
if (input_stream == nullptr) if (input_stream == nullptr)
return false; return false;
dc.Lock(); const ScopeLock protect(dc.mutex);
bool tried = false; bool tried = false;
const bool success = dc.command == DecoderCommand::STOP || return dc.command == DecoderCommand::STOP ||
decoder_run_stream_locked(decoder, *input_stream, uri, decoder_run_stream_locked(decoder, *input_stream, uri,
tried) || tried) ||
/* fallback to mp3: this is needed for bastard streams /* fallback to mp3: this is needed for bastard streams
that don't have a suffix or set the mimeType */ that don't have a suffix or set the mimeType */
(!tried && (!tried &&
decoder_run_stream_fallback(decoder, *input_stream)); decoder_run_stream_fallback(decoder, *input_stream));
dc.Unlock();
return success;
} }
/** /**