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

14
src/playlist/PlaylistStream.cxx
View File

@@ -44,7 +44,7 @@ try {
return nullptr;
Error error;
InputStream *is = OpenLocalInputStream(path, mutex, cond, error);
auto is = OpenLocalInputStream(path, mutex, cond, error);
if (is == nullptr) {
LogError(error);
return nullptr;
@@ -53,9 +53,7 @@ try {
auto playlist = playlist_list_open_stream_suffix(*is,
suffix_utf8.c_str());
if (playlist != nullptr)
playlist = new CloseSongEnumerator(playlist, is);
else
delete is;
playlist = new CloseSongEnumerator(playlist, is.release());
return playlist;
} catch (const std::runtime_error &e) {
@@ -91,7 +89,7 @@ try {
return playlist;
Error error;
InputStream *is = InputStream::OpenReady(uri, mutex, cond, error);
auto is = InputStream::OpenReady(uri, mutex, cond, error);
if (is == nullptr) {
if (error.IsDefined())
FormatError(error, "Failed to open %s", uri);
@@ -100,12 +98,10 @@ try {
}
playlist = playlist_list_open_stream(*is, uri);
if (playlist == nullptr) {
delete is;
if (playlist == nullptr)
return nullptr;
}
return new CloseSongEnumerator(playlist, is);
return new CloseSongEnumerator(playlist, is.release());
} catch (const std::runtime_error &e) {
LogError(e);
return nullptr;

6
src/playlist/plugins/SoundCloudPlaylistPlugin.cxx
View File

@@ -234,8 +234,8 @@ soundcloud_parse_json(const char *url, yajl_handle hand,
Mutex &mutex, Cond &cond)
{
Error error;
InputStream *input_stream = InputStream::OpenReady(url, mutex, cond,
error);
auto input_stream = InputStream::OpenReady(url, mutex, cond,
error);
if (input_stream == nullptr) {
if (error.IsDefined())
LogError(error);
@@ -260,7 +260,6 @@ soundcloud_parse_json(const char *url, yajl_handle hand,
done = true;
} else {
mutex.unlock();
delete input_stream;
return -1;
}
}
@@ -279,7 +278,6 @@ soundcloud_parse_json(const char *url, yajl_handle hand,
}
mutex.unlock();
delete input_stream;
return 0;
}