diff options
| author | Max Kellermann <max@duempel.org> | 2014-05-11 16:59:19 +0200 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2014-05-11 17:12:50 +0200 |
| commit | 82337dec44347017ca04fe975e85e6d9e4edb635 (patch) | |
| tree | 308036d4a7abbd2bb04ed472dc1fbacdc2587871 /src/playlist | |
| parent | f1d07002521a4a98acf130127cf42aef20a5e258 (diff) | |
| download | mpd-82337dec44347017ca04fe975e85e6d9e4edb635.tar.gz mpd-82337dec44347017ca04fe975e85e6d9e4edb635.tar.xz mpd-82337dec44347017ca04fe975e85e6d9e4edb635.zip | |
InputStream: add virtual destructor
Replaces the method Close().
Diffstat (limited to 'src/playlist')
| -rw-r--r-- | src/playlist/CloseSongEnumerator.cxx | 2 | ||||
| -rw-r--r-- | src/playlist/PlaylistStream.cxx | 4 | ||||
| -rw-r--r-- | src/playlist/plugins/SoundCloudPlaylistPlugin.cxx | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/playlist/CloseSongEnumerator.cxx b/src/playlist/CloseSongEnumerator.cxx index 6a4042395..2dddef823 100644 --- a/src/playlist/CloseSongEnumerator.cxx +++ b/src/playlist/CloseSongEnumerator.cxx @@ -24,7 +24,7 @@ CloseSongEnumerator::~CloseSongEnumerator() { delete other; - is->Close(); + delete is; } DetachedSong * diff --git a/src/playlist/PlaylistStream.cxx b/src/playlist/PlaylistStream.cxx index 6222a768d..5855c598b 100644 --- a/src/playlist/PlaylistStream.cxx +++ b/src/playlist/PlaylistStream.cxx @@ -50,7 +50,7 @@ playlist_open_path_suffix(const char *path_fs, Mutex &mutex, Cond &cond) if (playlist != nullptr) playlist = new CloseSongEnumerator(playlist, is); else - is->Close(); + delete is; return playlist; } @@ -85,7 +85,7 @@ playlist_open_remote(const char *uri, Mutex &mutex, Cond &cond) playlist = playlist_list_open_stream(*is, uri); if (playlist == nullptr) { - is->Close(); + delete is; return nullptr; } diff --git a/src/playlist/plugins/SoundCloudPlaylistPlugin.cxx b/src/playlist/plugins/SoundCloudPlaylistPlugin.cxx index 8f378ac9d..d9f62300b 100644 --- a/src/playlist/plugins/SoundCloudPlaylistPlugin.cxx +++ b/src/playlist/plugins/SoundCloudPlaylistPlugin.cxx @@ -276,7 +276,7 @@ soundcloud_parse_json(const char *url, yajl_handle hand, done = true; } else { mutex.unlock(); - input_stream->Close(); + delete input_stream; return -1; } } @@ -304,7 +304,7 @@ soundcloud_parse_json(const char *url, yajl_handle hand, } mutex.unlock(); - input_stream->Close(); + delete input_stream; return 0; } |