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/input/InputStream.cxx | |
| 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/input/InputStream.cxx')
| -rw-r--r-- | src/input/InputStream.cxx | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/src/input/InputStream.cxx b/src/input/InputStream.cxx index d54eca643..2e0df6856 100644 --- a/src/input/InputStream.cxx +++ b/src/input/InputStream.cxx @@ -31,6 +31,10 @@ static constexpr Domain input_domain("input"); +InputStream::~InputStream() +{ +} + InputStream * InputStream::Open(const char *url, Mutex &mutex, Cond &cond, @@ -41,7 +45,6 @@ InputStream::Open(const char *url, is = plugin->open(url, mutex, cond, error); if (is != nullptr) { - assert(is->plugin.close != nullptr); assert(is->plugin.read != nullptr); assert(is->plugin.eof != nullptr); assert(!is->seekable || is->plugin.seek != nullptr); @@ -72,7 +75,7 @@ InputStream::OpenReady(const char *uri, mutex.unlock(); if (!success) { - is->Close(); + delete is; is = nullptr; } @@ -202,12 +205,6 @@ InputStream::LockRead(void *ptr, size_t _size, Error &error) return Read(ptr, _size, error); } -void -InputStream::Close() -{ - plugin.close(this); -} - bool InputStream::IsEOF() { |