From 07b93dcf8084bcae92fa1f33652723ca9c990db2 Mon Sep 17 00:00:00 2001
From: Max Kellermann <max@duempel.org>
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/decoder/plugins/FlacIOHandle.cxx | 25 ++++++++++++++++++++++---
 1 file changed, 22 insertions(+), 3 deletions(-)

(limited to 'src/decoder/plugins/FlacIOHandle.cxx')

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
-- 
cgit v1.2.3