codeRabbit rev

Raffaello · Nov 15, 2023 · 046f2f4 · 046f2f4
1 parent 4f4412f
commit 046f2f4
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 14 deletions.
diff --git a/sdl2-hyper-sonic-drivers/src/HyperSonicDrivers/audio/IRenderer.hpp b/sdl2-hyper-sonic-drivers/src/HyperSonicDrivers/audio/IRenderer.hpp
@@ -26,11 +26,11 @@ namespace HyperSonicDrivers::audio
 
         virtual void renderBuffer(IAudioStream* stream) = 0;
         inline void renderBuffer(const std::shared_ptr<devices::IDevice>& device) { renderBuffer(device->getHardware()->getAudioStream().get()); };
-        virtual void renderFlush(IAudioStream* stream) = 0;
-        inline void renderFlush(const std::shared_ptr<devices::IDevice>& device) { renderFlush(device->getHardware()->getAudioStream().get()); };
+        virtual bool renderFlush(IAudioStream* stream) = 0;
+        inline bool renderFlush(const std::shared_ptr<devices::IDevice>& device) { return renderFlush(device->getHardware()->getAudioStream().get()); };
 
-        virtual void renderBuffer(IAudioStream* stream, drivers::IAudioDriver& drv, const int track) = 0;
-        inline void renderBuffer(const std::shared_ptr<devices::IDevice>& device, drivers::IAudioDriver& drv, const int track) { renderBuffer(device->getHardware()->getAudioStream().get(), drv, track); };
+        virtual bool renderBuffer(IAudioStream* stream, drivers::IAudioDriver& drv, const int track) = 0;
+        inline bool renderBuffer(const std::shared_ptr<devices::IDevice>& device, drivers::IAudioDriver& drv, const int track) { return renderBuffer(device->getHardware()->getAudioStream().get(), drv, track); };
     protected:
         std::shared_ptr<IMixer> m_mixer;
         std::unique_ptr<files::WAVFile> m_out;

diff --git a/sdl2-hyper-sonic-drivers/src/HyperSonicDrivers/audio/sdl2/Renderer.cpp b/sdl2-hyper-sonic-drivers/src/HyperSonicDrivers/audio/sdl2/Renderer.cpp
@@ -7,6 +7,8 @@
 
 namespace HyperSonicDrivers::audio::sdl2
 {
+    constexpr int MaxRendererFlushIterations = 1000;
+
     Renderer::Renderer(const uint32_t freq, const uint16_t buffer_size, const uint8_t max_channels)
     {
         m_mixer = make_mixer<Mixer>(max_channels, freq, buffer_size);
@@ -35,7 +37,7 @@ namespace HyperSonicDrivers::audio::sdl2
         m_out->save_streaming(m_buf.data(), read);
     }
 
-    void Renderer::renderFlush(IAudioStream* stream)
+    bool Renderer::renderFlush(IAudioStream* stream)
     {
         // safety check
         if (m_buf.empty())
@@ -44,24 +46,28 @@ namespace HyperSonicDrivers::audio::sdl2
             m_buf.resize(m_mixer->buffer_size);
         }
 
-        while (true)
+        for(int i = 0; i < MaxRendererFlushIterations; i++)
         {
             const size_t read = stream->readBuffer(m_buf.data(), m_buf.size());
+            if (read == 0)
+                return true;
+
             const bool silenced = std::ranges::all_of(m_buf, [](const auto i) { return i == 0; });
             if (silenced)
-                return;
+                return true;
 
             m_out->save_streaming(m_buf.data(), read);
         }
+
+        return false;
     }
 
-    void Renderer::renderBuffer(IAudioStream* stream, drivers::IAudioDriver& drv, const int track)
+    bool Renderer::renderBuffer(IAudioStream* stream, drivers::IAudioDriver& drv, const int track)
     {
         drv.play(track);
         while (drv.isPlaying())
             renderBuffer(stream);
 
-        renderFlush(stream);
-        closeOutputFile();
+        return renderFlush(stream);
     }
 }
diff --git a/sdl2-hyper-sonic-drivers/src/HyperSonicDrivers/audio/sdl2/Renderer.hpp b/sdl2-hyper-sonic-drivers/src/HyperSonicDrivers/audio/sdl2/Renderer.hpp
@@ -18,9 +18,9 @@ namespace HyperSonicDrivers::audio::sdl2
 
         void renderBuffer(IAudioStream* stream) override;
         using IRenderer::renderBuffer;
-        void renderFlush(IAudioStream* stream) override;
+        bool renderFlush(IAudioStream* stream) override;
         using IRenderer::renderFlush;
 
-        void renderBuffer(IAudioStream* stream, drivers::IAudioDriver& drv, const int track) override;
+        bool renderBuffer(IAudioStream* stream, drivers::IAudioDriver& drv, const int track) override;
     };
 }
diff --git a/sdl2-hyper-sonic-drivers/test/HyperSonicDrivers/audio/sdl2/TestRenderer.cpp b/sdl2-hyper-sonic-drivers/test/HyperSonicDrivers/audio/sdl2/TestRenderer.cpp
@@ -65,7 +65,7 @@ namespace HyperSonicDrivers::audio::sdl2
             while (drv1.isPlaying())
                 r.renderBuffer(opl);
 
-            r.renderFlush(opl);
+            ASSERT_TRUE(r.renderFlush(opl));
             r.closeOutputFile();
         }
 
@@ -102,7 +102,8 @@ namespace HyperSonicDrivers::audio::sdl2
             auto af = std::make_shared<files::westwood::ADLFile>("../fixtures/DUNE0.ADL");
             drv1.setADLFile(af);
 
-            r.renderBuffer(opl, drv1, 4);
+            ASSERT_TRUE(r.renderBuffer(opl, drv1, 4));
+            r.closeOutputFile();
         }
 
         files::WAVFile w(rfile);