diff options
author | Max Kellermann <max@duempel.org> | 2014-05-22 10:10:16 +0200 |
---|---|---|
committer | Max Kellermann <max@duempel.org> | 2014-05-22 13:52:00 +0200 |
commit | 07b93dcf8084bcae92fa1f33652723ca9c990db2 (patch) | |
tree | 5cfa3d13c14d68b70d54ade24169b84a7f614b8e /src/input/plugins/CdioParanoiaInputPlugin.cxx | |
parent | 374c6a27db790eb637feaeb9bd27ed82897d7953 (diff) | |
download | mpd-07b93dcf8084bcae92fa1f33652723ca9c990db2.tar.gz mpd-07b93dcf8084bcae92fa1f33652723ca9c990db2.tar.xz mpd-07b93dcf8084bcae92fa1f33652723ca9c990db2.zip |
InputStream: make Seek() always absolute
Remove the "whence" parameter that is not actually necessary, and only
complicates the InputStream implementations.
Diffstat (limited to 'src/input/plugins/CdioParanoiaInputPlugin.cxx')
-rw-r--r-- | src/input/plugins/CdioParanoiaInputPlugin.cxx | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/src/input/plugins/CdioParanoiaInputPlugin.cxx b/src/input/plugins/CdioParanoiaInputPlugin.cxx index 534084e0d..6f1ea976a 100644 --- a/src/input/plugins/CdioParanoiaInputPlugin.cxx +++ b/src/input/plugins/CdioParanoiaInputPlugin.cxx @@ -99,7 +99,7 @@ class CdioParanoiaInputStream final : public InputStream { /* virtual methods from InputStream */ bool IsEOF() override; 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; }; static constexpr Domain cdio_domain("cdio"); @@ -272,21 +272,8 @@ input_cdio_open(const char *uri, } bool -CdioParanoiaInputStream::Seek(InputPlugin::offset_type new_offset, - int whence, Error &error) +CdioParanoiaInputStream::Seek(offset_type new_offset, Error &error) { - /* calculate absolute offset */ - switch (whence) { - case SEEK_SET: - break; - case SEEK_CUR: - new_offset += offset; - break; - case SEEK_END: - new_offset += size; - break; - } - if (new_offset < 0 || new_offset > size) { error.Format(cdio_domain, "Invalid offset to seek %ld (%ld)", (long int)new_offset, (long int)size); |