From 578c3737f8c07e543b90f964da0e89db1c18bb9a Mon Sep 17 00:00:00 2001
From: jacqueline <me@jacqueline.id.au>
Date: Wed, 9 Aug 2023 11:22:08 +1000
Subject: Add vorbis support whilst we're here

---
 src/codecs/include/ogg.hpp | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

(limited to 'src/codecs/include/ogg.hpp')

diff --git a/src/codecs/include/ogg.hpp b/src/codecs/include/ogg.hpp
index 2d6ea8c5..a27e961e 100644
--- a/src/codecs/include/ogg.hpp
+++ b/src/codecs/include/ogg.hpp
@@ -21,16 +21,23 @@ class OggContainer {
   OggContainer();
   ~OggContainer();
 
-  auto AddBytes(cpp::span<const std::byte>) -> void;
-  auto HasNextPacket() -> bool;
-  auto NextPacket() -> cpp::span<uint8_t>;
-  auto PeekPacket() -> cpp::span<uint8_t>;
+  auto AddBytes(cpp::span<const std::byte>) -> bool;
+
+  auto Next() -> bool;
+  auto Current() -> cpp::span<uint8_t>;
+  auto HasPacket() -> bool;
 
  private:
+  auto AdvancePage() -> bool;
+  auto AdvancePacket() -> bool;
+
   ogg_sync_state sync_;
   ogg_stream_state stream_;
   ogg_page page_;
   ogg_packet packet_;
+
+  bool has_stream_;
+  bool has_packet_;
 };
 
 }  // namespace codecs
\ No newline at end of file
-- 
cgit v1.2.3