Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

remove zero pad in mono VocFile #279

Merged
merged 4 commits into from
Nov 11, 2023
Merged

remove zero pad in mono VocFile #279

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3cabca7
remove zero pad in mono VocFile
Raffaello Nov 11, 2023
f1130ad
update version
Raffaello Nov 11, 2023
4b15a71
fix tests
Raffaello Nov 11, 2023
18324c5
update ci sonarcloud
Raffaello Nov 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions .github/workflows/sonarcloud.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
3 changes: 0 additions & 3 deletions sdl2-hyper-sonic-drivers/src/HyperSonicDrivers/files/VOCFile.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
4 changes: 2 additions & 2 deletions sdl2-hyper-sonic-drivers/test/HyperSonicDrivers/files/TestVOCFile.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
)
);

Expand Down
Loading