dosbox generateSamples improvements (#280)

* dosbox generateSamples improvements * update version
Raffaello · Nov 12, 2023 · 1ceb2a6 · 1ceb2a6
1 parent a133242
commit 1ceb2a6
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 16 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -5,7 +5,7 @@ if(DEFINED ENV{VCPKG_ROOT} AND NOT DEFINED CMAKE_TOOLCHAIN_FILE)
 endif()
 
 
-project ("sdl2-hyper-sonic-drivers" VERSION 0.15.3 DESCRIPTION "SDL2 based Hyper-Sonic Drivers for emulating old soundcards")
+project ("sdl2-hyper-sonic-drivers" VERSION 0.15.4 DESCRIPTION "SDL2 based Hyper-Sonic Drivers for emulating old soundcards")
 include (TestBigEndian)
 TEST_BIG_ENDIAN(IS_BIG_ENDIAN)
 if(IS_BIG_ENDIAN)

diff --git a/sdl2-hyper-sonic-drivers/src/HyperSonicDrivers/hardware/opl/scummvm/dosbox/DosBoxOPL.cpp b/sdl2-hyper-sonic-drivers/src/HyperSonicDrivers/hardware/opl/scummvm/dosbox/DosBoxOPL.cpp
@@ -214,37 +214,42 @@ namespace HyperSonicDrivers::hardware::opl::scummvm::dosbox
 
         if(isStereo())
         {
-            while (length_ > 0)
+            if (m_emulator->opl3Active) // DUAL_OPL2 or OPL3 in OPL3 mode
             {
-                const unsigned int readSamples = std::min<unsigned int>(length_, bufferLength);
-                const unsigned int readSamples2 = (readSamples << 1);
-                if (m_emulator->opl3Active)
+                while (length_ > 0)
                 {
+                    const unsigned int readSamples = std::min<unsigned int>(length_, bufferLength);
+                    const unsigned int readSamples2 = (readSamples << 1);
                     m_emulator->GenerateBlock3(readSamples, tempBuffer.data());
                     for (unsigned int i = 0; i < readSamples2; ++i)
                         buffer[i] = static_cast<int16_t>(tempBuffer[i]);
+
+                    buffer += static_cast<int16_t>(readSamples2);
+                    length_ -= readSamples;
                 }
-                else
+            }
+            else // OPL3 in OPL2 compatibility mode
+            {
+                while (length_ > 0)
                 {
+                    const unsigned int readSamples = std::min<unsigned int>(length_, bufferLength);
+                    const unsigned int readSamples2 = (readSamples << 1);
                     m_emulator->GenerateBlock2(readSamples, tempBuffer.data());
-                    for (unsigned int i = 0, j =0; i < readSamples; ++i, j+=2)
-                    {
-                        buffer[j] = buffer[j+1] = static_cast<int16_t>(tempBuffer[i]);
-                    }
-                }
+                    for (unsigned int i = 0, j = 0; i < readSamples; ++i, j += 2)
+                        buffer[j] = buffer[j + 1] = static_cast<int16_t>(tempBuffer[i]);
 
-                buffer += static_cast<int16_t>(readSamples2);
-                length_ -= readSamples;
+
+                    buffer += static_cast<int16_t>(readSamples2);
+                    length_ -= readSamples;
+                }
             }
         }
-        else
+        else // OPL2
         {
             while (length_ > 0)
             {
                 const unsigned int readSamples = std::min<unsigned int>(length_, bufferLength << 1);
-
                 m_emulator->GenerateBlock2(readSamples, tempBuffer.data());
-
                 for (unsigned int i = 0; i < readSamples; ++i)
                     buffer[i] = static_cast<int16_t>(tempBuffer[i]);