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/decoder/plugins/FlacIOHandle.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/decoder/plugins/FlacIOHandle.cxx')
| -rw-r--r-- | src/decoder/plugins/FlacIOHandle.cxx | 25 |
1 files changed, 22 insertions, 3 deletions
diff --git a/src/decoder/plugins/FlacIOHandle.cxx b/src/decoder/plugins/FlacIOHandle.cxx index 6444e02cf..b5f9f5ec0 100644 --- a/src/decoder/plugins/FlacIOHandle.cxx +++ b/src/decoder/plugins/FlacIOHandle.cxx @@ -62,12 +62,31 @@ FlacIORead(void *ptr, size_t size, size_t nmemb, FLAC__IOHandle handle) } static int -FlacIOSeek(FLAC__IOHandle handle, FLAC__int64 offset, int whence) +FlacIOSeek(FLAC__IOHandle handle, FLAC__int64 _offset, int whence) { InputStream *is = (InputStream *)handle; - Error error; - return is->LockSeek(offset, whence, error) ? 0 : -1; + InputStream::offset_type offset = _offset; + switch (whence) { + case SEEK_SET: + break; + + case SEEK_CUR: + offset += is->GetOffset(); + break; + + case SEEK_END: + if (!is->KnownSize()) + return -1; + + offset += is->GetSize(); + break; + + default: + return -1; + } + + return is->LockSeek(offset, IgnoreError()) ? 0 : -1; } static FLAC__int64 |