From 62f6179abe24339c2e5b7350528afbcad4c52067 Mon Sep 17 00:00:00 2001
From: ailurux <ailuruxx@gmail.com>
Date: Thu, 15 Feb 2024 16:12:07 +1100
Subject: Added offset for track seeking, wav impl. only rn

---
 src/codecs/vorbis.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/codecs/vorbis.cpp')

diff --git a/src/codecs/vorbis.cpp b/src/codecs/vorbis.cpp
index 3b3798cb..66237c28 100644
--- a/src/codecs/vorbis.cpp
+++ b/src/codecs/vorbis.cpp
@@ -84,7 +84,7 @@ TremorVorbisDecoder::~TremorVorbisDecoder() {
   ov_clear(&vorbis_);
 }
 
-auto TremorVorbisDecoder::OpenStream(std::shared_ptr<IStream> input)
+auto TremorVorbisDecoder::OpenStream(std::shared_ptr<IStream> input,uint32_t offset)
     -> cpp::result<OutputFormat, Error> {
   int res = ov_open_callbacks(input.get(), &vorbis_, NULL, 0, kCallbacks);
   if (res < 0) {
-- 
cgit v1.2.3


From 0baad11b188e7bac6b968017716186d9da0e492f Mon Sep 17 00:00:00 2001
From: ailurux <ailuruxx@gmail.com>
Date: Fri, 16 Feb 2024 17:01:22 +1100
Subject: WIP: Vorbis seeking

---
 src/codecs/vorbis.cpp | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'src/codecs/vorbis.cpp')

diff --git a/src/codecs/vorbis.cpp b/src/codecs/vorbis.cpp
index 66237c28..65783dac 100644
--- a/src/codecs/vorbis.cpp
+++ b/src/codecs/vorbis.cpp
@@ -124,6 +124,10 @@ auto TremorVorbisDecoder::OpenStream(std::shared_ptr<IStream> input,uint32_t off
     length = l * info->channels;
   }
 
+  if (offset) {
+    ov_time_seek(&vorbis_, offset*1000);
+  }
+
   return OutputFormat{
       .num_channels = static_cast<uint8_t>(info->channels),
       .sample_rate_hz = static_cast<uint32_t>(info->rate),
-- 
cgit v1.2.3


From 912060de1b31721103efc0ee321dfb1f80f8ccc4 Mon Sep 17 00:00:00 2001
From: ailurux <ailuruxx@gmail.com>
Date: Fri, 16 Feb 2024 17:08:45 +1100
Subject: Vorbis seeking impl

---
 src/codecs/vorbis.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/codecs/vorbis.cpp')

diff --git a/src/codecs/vorbis.cpp b/src/codecs/vorbis.cpp
index e51c6bca..ada92fb6 100644
--- a/src/codecs/vorbis.cpp
+++ b/src/codecs/vorbis.cpp
@@ -118,7 +118,7 @@ auto TremorVorbisDecoder::OpenStream(std::shared_ptr<IStream> input,uint32_t off
   }
 
   if (offset) {
-    ov_time_seek(&vorbis_, offset*1000);
+    ov_time_seek(vorbis_.get(), offset*1000);
   }
 
   return OutputFormat{
-- 
cgit v1.2.3


From e7e6c70fb31d33ae1e79f9841f5b6fe227f6ebf3 Mon Sep 17 00:00:00 2001
From: jacqueline <me@jacqueline.id.au>
Date: Thu, 29 Feb 2024 12:18:17 +1100
Subject: Remove unused 'SeekTo' method on codecs

---
 src/codecs/vorbis.cpp | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

(limited to 'src/codecs/vorbis.cpp')

diff --git a/src/codecs/vorbis.cpp b/src/codecs/vorbis.cpp
index ada92fb6..9131451b 100644
--- a/src/codecs/vorbis.cpp
+++ b/src/codecs/vorbis.cpp
@@ -77,7 +77,8 @@ TremorVorbisDecoder::~TremorVorbisDecoder() {
   ov_clear(vorbis_.get());
 }
 
-auto TremorVorbisDecoder::OpenStream(std::shared_ptr<IStream> input,uint32_t offset)
+auto TremorVorbisDecoder::OpenStream(std::shared_ptr<IStream> input,
+                                     uint32_t offset)
     -> cpp::result<OutputFormat, Error> {
   int res = ov_open_callbacks(input.get(), vorbis_.get(), NULL, 0, kCallbacks);
   if (res < 0) {
@@ -117,8 +118,8 @@ auto TremorVorbisDecoder::OpenStream(std::shared_ptr<IStream> input,uint32_t off
     length = l * info->channels;
   }
 
-  if (offset) {
-    ov_time_seek(vorbis_.get(), offset*1000);
+  if (offset && ov_time_seek(vorbis_.get(), offset * 1000) != 0) {
+    return cpp::fail(Error::kInternalError);
   }
 
   return OutputFormat{
@@ -149,11 +150,4 @@ auto TremorVorbisDecoder::DecodeTo(cpp::span<sample::Sample> output)
   };
 }
 
-auto TremorVorbisDecoder::SeekTo(size_t target) -> cpp::result<void, Error> {
-  if (ov_pcm_seek(vorbis_.get(), target) != 0) {
-    return cpp::fail(Error::kInternalError);
-  }
-  return {};
-}
-
 }  // namespace codecs
-- 
cgit v1.2.3