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

decoder/Thread: use ScopeLock in TryDecoderFile()

Browse Source
This commit is contained in:
Max Kellermann 2015-12-31 12:52:28 +01:00
parent fad0e834d5
commit ca08902d71
1 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/decoder/DecoderThread.cxx
View File

@ -324,25 +324,20 @@ TryDecoderFile(Decoder &decoder, Path path_fs, const char *suffix,
DecoderControl &dc = decoder.dc; DecoderControl &dc = decoder.dc;
if (plugin.file_decode != nullptr) { if (plugin.file_decode != nullptr) {
dc.Lock(); const ScopeLock protect(dc.mutex);
return decoder_file_decode(plugin, decoder, path_fs);
bool success = decoder_file_decode(plugin, decoder, path_fs);
dc.Unlock();
return success;
} else if (plugin.stream_decode != nullptr) { } else if (plugin.stream_decode != nullptr) {
InputStream *input_stream = InputStream *input_stream =
decoder_input_stream_open(dc, path_fs); decoder_input_stream_open(dc, path_fs);
if (input_stream == nullptr) if (input_stream == nullptr)
return false; return false;
dc.Lock(); bool success;
{
bool success = decoder_stream_decode(plugin, decoder, const ScopeLock protect(dc.mutex);
success = decoder_stream_decode(plugin, decoder,
*input_stream); *input_stream);
}
dc.Unlock();
delete input_stream; delete input_stream;