From 07b93dcf8084bcae92fa1f33652723ca9c990db2 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Thu, 22 May 2014 10:10:16 +0200 Subject: InputStream: make Seek() always absolute Remove the "whence" parameter that is not actually necessary, and only complicates the InputStream implementations. --- src/input/plugins/RewindInputPlugin.cxx | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'src/input/plugins/RewindInputPlugin.cxx') diff --git a/src/input/plugins/RewindInputPlugin.cxx b/src/input/plugins/RewindInputPlugin.cxx index c18799c64..95f604044 100644 --- a/src/input/plugins/RewindInputPlugin.cxx +++ b/src/input/plugins/RewindInputPlugin.cxx @@ -64,7 +64,7 @@ public: } size_t Read(void *ptr, size_t size, Error &error) override; - bool Seek(offset_type offset, int whence, Error &error) override; + bool Seek(offset_type offset, Error &error) override; private: /** @@ -117,13 +117,12 @@ RewindInputStream::Read(void *ptr, size_t read_size, Error &error) } bool -RewindInputStream::Seek(offset_type new_offset, int whence, +RewindInputStream::Seek(offset_type new_offset, Error &error) { assert(IsReady()); - if (whence == SEEK_SET && tail > 0 && - new_offset <= (offset_type)tail) { + if (tail > 0 && new_offset <= (offset_type)tail) { /* buffered seek */ assert(!ReadingFromBuffer() || @@ -139,7 +138,7 @@ RewindInputStream::Seek(offset_type new_offset, int whence, buffered range now */ tail = 0; - return ProxyInputStream::Seek(new_offset, whence, error); + return ProxyInputStream::Seek(new_offset, error); } } -- cgit v1.2.3