remove zero pad in mono VocFile (#279)

* remove zero pad in mono VocFile * update version * fix tests * update ci sonarcloud
Raffaello · Nov 11, 2023 · a133242 · a133242
1 parent 692501f
commit a133242
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 15 deletions.
diff --git a/.github/workflows/sonarcloud.yml b/.github/workflows/sonarcloud.yml
@@ -18,15 +18,15 @@ on:
     #branches:
     #  - master
 
-  pull_request:
-  #  branches: [ master ]
-    paths-ignore:
-      - 'doc/**'
-      - '.gitignore'
-      - '.gitattributes'
-      - 'README.md'
-      - 'LICENSE'
-      - 'wave_generators.r'
+  #pull_request:
+  ##  branches: [ master ]
+  #  paths-ignore:
+  #    - 'doc/**'
+  #    - '.gitignore'
+  #    - '.gitattributes'
+  #    - 'README.md'
+  #    - 'LICENSE'
+  #    - 'wave_generators.r'
 
 #permissions: read-all
 

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.2 DESCRIPTION "SDL2 based Hyper-Sonic Drivers for emulating old soundcards")
+project ("sdl2-hyper-sonic-drivers" VERSION 0.15.3 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/files/VOCFile.cpp b/sdl2-hyper-sonic-drivers/src/HyperSonicDrivers/files/VOCFile.cpp
@@ -190,9 +190,6 @@ namespace HyperSonicDrivers::files
         for (int i = 0; i < d; i++)
             buf.push_back(0);
 
-        if (buf.size() % 2 == 1)
-            buf.push_back(0);
-
         m_dataSize = static_cast<uint32_t>(buf.size());
         m_data = std::make_shared<uint8_t[]>(m_dataSize);
         std::memcpy(m_data.get(), buf.data(), sizeof(uint8_t)* m_dataSize);

diff --git a/sdl2-hyper-sonic-drivers/test/HyperSonicDrivers/files/TestVOCFile.cpp b/sdl2-hyper-sonic-drivers/test/HyperSonicDrivers/files/TestVOCFile.cpp
@@ -46,8 +46,8 @@ namespace HyperSonicDrivers::files
         VOCFile,
         VocFileTest,
         ::testing::Values(
-            std::make_tuple("../fixtures/VSCREAM1.VOC", audio::mixer::eChannelGroup::Sfx, 8000, 5818, 0x80),
-            std::make_tuple("../fixtures/DUNE.VOC", audio::mixer::eChannelGroup::Speech, 14705, 15234, 0x83)
+            std::make_tuple("../fixtures/VSCREAM1.VOC", audio::mixer::eChannelGroup::Sfx, 8000, 5817, 0x80),
+            std::make_tuple("../fixtures/DUNE.VOC", audio::mixer::eChannelGroup::Speech, 14705, 15233, 0x83)
         )
     );