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

input: wrap InputStream in std::unique_ptr

Browse Source
This commit is contained in:
Max Kellermann
2016-02-21 08:03:32 +01:00
parent 054e9ecaae
commit cadc67ea40
19 changed files with 107 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/decoder/DecoderAPI.cxx
View File

@@ -256,7 +256,7 @@ void decoder_seek_error(Decoder & decoder)
decoder_command_finished(decoder);
}
InputStream *
InputStreamPtr
decoder_open_uri(Decoder &decoder, const char *uri, Error &error)
{
assert(decoder.dc.state == DecoderState::START ||
@@ -266,8 +266,8 @@ decoder_open_uri(Decoder &decoder, const char *uri, Error &error)
Mutex &mutex = dc.mutex;
Cond &cond = dc.cond;
InputStream *is = InputStream::Open(uri, mutex, cond, error);
if (is == nullptr)
auto is = InputStream::Open(uri, mutex, cond, error);
if (!is)
return nullptr;
mutex.lock();
@@ -280,7 +280,6 @@ decoder_open_uri(Decoder &decoder, const char *uri, Error &error)
if (dc.command == DecoderCommand::STOP) {
mutex.unlock();
delete is;
return nullptr;
}