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

decoder/Thread: use std::unique_ptr<InputStream>

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

15
src/decoder/DecoderThread.cxx
View File

@ -307,21 +307,12 @@ TryDecoderFile(Decoder &decoder, Path path_fs, const char *suffix,
const ScopeLock protect(dc.mutex); const ScopeLock protect(dc.mutex);
return decoder_file_decode(plugin, decoder, path_fs); return decoder_file_decode(plugin, decoder, path_fs);
} else if (plugin.stream_decode != nullptr) { } else if (plugin.stream_decode != nullptr) {
InputStream *input_stream = std::unique_ptr<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;
bool success; const ScopeLock protect(dc.mutex);
{ return decoder_stream_decode(plugin, decoder, *input_stream);
const ScopeLock protect(dc.mutex);
success = decoder_stream_decode(plugin, decoder,
*input_stream);
}
delete input_stream;
return success;
} else } else
return false; return false;
} }