From 92c85bd20dc4f55b53cc18887d4a6b9b165447ca Mon Sep 17 00:00:00 2001
From: Max Kellermann <max@duempel.org>
Date: Thu, 24 Oct 2013 20:33:12 +0200
Subject: decoder/opus: move SeekFindEOS() to OggFind.cxx

---
 src/decoder/OpusDecoderPlugin.cxx | 20 +-------------------
 1 file changed, 1 insertion(+), 19 deletions(-)

(limited to 'src/decoder/OpusDecoderPlugin.cxx')

diff --git a/src/decoder/OpusDecoderPlugin.cxx b/src/decoder/OpusDecoderPlugin.cxx
index 10a3d0b83..c90e31232 100644
--- a/src/decoder/OpusDecoderPlugin.cxx
+++ b/src/decoder/OpusDecoderPlugin.cxx
@@ -291,24 +291,6 @@ mpd_opus_stream_decode(Decoder &decoder,
 	}
 }
 
-static bool
-SeekFindEOS(OggSyncState &oy, ogg_stream_state &os, ogg_packet &packet,
-	    InputStream &is)
-{
-	if (is.size > 0 && is.size - is.offset < 65536)
-		return OggFindEOS(oy, os, packet);
-
-	if (!is.CheapSeeking())
-		return false;
-
-	oy.Reset();
-
-	Error error;
-	return is.LockSeek(-65536, SEEK_END, error) &&
-		oy.ExpectPageSeekIn(os) &&
-		OggFindEOS(oy, os, packet);
-}
-
 static bool
 mpd_opus_scan_stream(InputStream &is,
 		     const struct tag_handler *handler, void *handler_ctx)
@@ -367,7 +349,7 @@ mpd_opus_scan_stream(InputStream &is,
 		}
 	}
 
-	if (packet.e_o_s || SeekFindEOS(oy, os, packet, is))
+	if (packet.e_o_s || OggSeekFindEOS(oy, os, packet, is))
 		tag_handler_invoke_duration(handler, handler_ctx,
 					    packet.granulepos / opus_sample_rate);
 
-- 
cgit v1.2.3