pcmDriver forward functionality

Raffaello · Nov 12, 2023 · 9c89311 · 9c89311
1 parent 88ff32e
commit 9c89311
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 0 deletions.
diff --git a/sdl2-hyper-sonic-drivers/src/HyperSonicDrivers/audio/IAudioStream.hpp b/sdl2-hyper-sonic-drivers/src/HyperSonicDrivers/audio/IAudioStream.hpp
@@ -23,5 +23,6 @@ namespace HyperSonicDrivers::audio
         virtual uint32_t getRate() const = 0;
         virtual bool endOfData() const = 0;
         virtual bool isEnded() const { return endOfData(); }
+        //virtual void forward(const uint32_t ms) = 0;
     };
 }
diff --git a/sdl2-hyper-sonic-drivers/src/HyperSonicDrivers/audio/streams/PCMStream.cpp b/sdl2-hyper-sonic-drivers/src/HyperSonicDrivers/audio/streams/PCMStream.cpp
@@ -38,6 +38,12 @@ namespace HyperSonicDrivers::audio::streams
         return m_curPos == m_sound->dataSize;
     }
 
+    void PCMStream::forward(const uint32_t bytes) noexcept
+    {
+        m_curPos += bytes;
+        m_curPos = std::min(m_curPos, m_sound->dataSize);
+    }
+
     std::shared_ptr<PCMSound> PCMStream::getSound() const noexcept
     {
         return m_sound;

diff --git a/sdl2-hyper-sonic-drivers/src/HyperSonicDrivers/audio/streams/PCMStream.hpp b/sdl2-hyper-sonic-drivers/src/HyperSonicDrivers/audio/streams/PCMStream.hpp
@@ -18,6 +18,7 @@ namespace HyperSonicDrivers::audio::streams
         uint32_t getRate() const override;
         bool endOfData() const override;
 
+        void forward(const uint32_t bytes) noexcept;
         std::shared_ptr<PCMSound>  getSound() const noexcept;
     private:
         std::shared_ptr<PCMSound> m_sound;

diff --git a/sdl2-hyper-sonic-drivers/src/HyperSonicDrivers/drivers/PCMDriver.cpp b/sdl2-hyper-sonic-drivers/src/HyperSonicDrivers/drivers/PCMDriver.cpp
@@ -1,5 +1,6 @@
 #include <algorithm>
 #include <HyperSonicDrivers/drivers/PCMDriver.hpp>
+#include <HyperSonicDrivers/utils/sound.hpp>
 
 namespace HyperSonicDrivers::drivers
 {
@@ -98,6 +99,12 @@ namespace HyperSonicDrivers::drivers
         releaseStreams_();
     }
 
+    void PCMDriver::forward(const uint32_t ms) noexcept
+    {
+        for (const auto& [stream, _] : m_PCMStreams_channels)
+            stream->forward(utils::ms_toPos(ms, stream->getSound()));
+    }
+
     void PCMDriver::releaseEndedStreams_() noexcept
     {
         for (auto it = m_PCMStreams_channels.begin(); it != m_PCMStreams_channels.end();)

diff --git a/sdl2-hyper-sonic-drivers/src/HyperSonicDrivers/drivers/PCMDriver.hpp b/sdl2-hyper-sonic-drivers/src/HyperSonicDrivers/drivers/PCMDriver.hpp
@@ -34,6 +34,8 @@ namespace HyperSonicDrivers::drivers
         void stop(const std::shared_ptr<audio::PCMSound>& sound, const bool releaseEndedStreams = true);
         void stop() noexcept;
 
+        void forward(const uint32_t ms) noexcept;
+
         const uint8_t max_streams;
     private:
         std::shared_ptr<audio::IMixer> m_mixer;