Menu
▾
▴
modplug-svn-commit — OpenMPT subversion commit notifications
You can subscribe to this list here.
| 2006 |
Jan
|
Feb
|
Mar
(1) |
Apr
(1) |
May
|
Jun
(1) |
Jul
|
Aug
(10) |
Sep
|
Oct
|
Nov
|
Dec
(3) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2007 |
Jan
(1) |
Feb
(2) |
Mar
(3) |
Apr
(2) |
May
(10) |
Jun
(2) |
Jul
(1) |
Aug
|
Sep
|
Oct
|
Nov
(3) |
Dec
|
| 2008 |
Jan
(6) |
Feb
(4) |
Mar
(5) |
Apr
(2) |
May
(1) |
Jun
(1) |
Jul
(4) |
Aug
(6) |
Sep
(2) |
Oct
(9) |
Nov
(1) |
Dec
(4) |
| 2009 |
Jan
(9) |
Feb
(2) |
Mar
(2) |
Apr
(2) |
May
(6) |
Jun
(18) |
Jul
(33) |
Aug
(39) |
Sep
(33) |
Oct
(24) |
Nov
(23) |
Dec
(22) |
| 2010 |
Jan
(29) |
Feb
(32) |
Mar
(51) |
Apr
(17) |
May
(31) |
Jun
(21) |
Jul
(32) |
Aug
(28) |
Sep
(35) |
Oct
(27) |
Nov
(11) |
Dec
(13) |
| 2011 |
Jan
(14) |
Feb
(13) |
Mar
(27) |
Apr
(27) |
May
(28) |
Jun
(20) |
Jul
(43) |
Aug
(52) |
Sep
(66) |
Oct
(61) |
Nov
(11) |
Dec
(8) |
| 2012 |
Jan
(20) |
Feb
(30) |
Mar
(38) |
Apr
(21) |
May
(33) |
Jun
(21) |
Jul
(25) |
Aug
(9) |
Sep
(24) |
Oct
(42) |
Nov
(27) |
Dec
(41) |
| 2013 |
Jan
(20) |
Feb
(35) |
Mar
(156) |
Apr
(298) |
May
(258) |
Jun
(201) |
Jul
(105) |
Aug
(60) |
Sep
(193) |
Oct
(245) |
Nov
(280) |
Dec
(194) |
| 2014 |
Jan
(63) |
Feb
(202) |
Mar
(200) |
Apr
(23) |
May
(53) |
Jun
(105) |
Jul
(18) |
Aug
(26) |
Sep
(110) |
Oct
(187) |
Nov
(97) |
Dec
(74) |
| 2015 |
Jan
(45) |
Feb
(55) |
Mar
(116) |
Apr
(116) |
May
(193) |
Jun
(164) |
Jul
(50) |
Aug
(111) |
Sep
(98) |
Oct
(71) |
Nov
(103) |
Dec
(63) |
| 2016 |
Jan
(33) |
Feb
(101) |
Mar
(182) |
Apr
(139) |
May
(140) |
Jun
(103) |
Jul
(165) |
Aug
(286) |
Sep
(208) |
Oct
(127) |
Nov
(97) |
Dec
(54) |
| 2017 |
Jan
(64) |
Feb
(335) |
Mar
(202) |
Apr
(212) |
May
(139) |
Jun
(127) |
Jul
(294) |
Aug
(154) |
Sep
(170) |
Oct
(152) |
Nov
(156) |
Dec
(62) |
| 2018 |
Jan
(168) |
Feb
(237) |
Mar
(196) |
Apr
(174) |
May
(174) |
Jun
(161) |
Jul
(127) |
Aug
(88) |
Sep
(149) |
Oct
(66) |
Nov
(52) |
Dec
(135) |
| 2019 |
Jan
(146) |
Feb
(126) |
Mar
(104) |
Apr
(58) |
May
(60) |
Jun
(28) |
Jul
(197) |
Aug
(129) |
Sep
(141) |
Oct
(148) |
Nov
(63) |
Dec
(100) |
| 2020 |
Jan
(74) |
Feb
(37) |
Mar
(59) |
Apr
(154) |
May
(194) |
Jun
(133) |
Jul
(313) |
Aug
(197) |
Sep
(49) |
Oct
(162) |
Nov
(143) |
Dec
(57) |
| 2021 |
Jan
(120) |
Feb
(107) |
Mar
(314) |
Apr
(157) |
May
(524) |
Jun
(169) |
Jul
(72) |
Aug
(133) |
Sep
(135) |
Oct
(146) |
Nov
(198) |
Dec
(325) |
| 2022 |
Jan
(409) |
Feb
(249) |
Mar
(138) |
Apr
(95) |
May
(102) |
Jun
(221) |
Jul
(66) |
Aug
(120) |
Sep
(192) |
Oct
(131) |
Nov
(53) |
Dec
(171) |
| 2023 |
Jan
(357) |
Feb
(82) |
Mar
(168) |
Apr
(218) |
May
(196) |
Jun
(86) |
Jul
(115) |
Aug
(49) |
Sep
(190) |
Oct
(102) |
Nov
(45) |
Dec
(76) |
| 2024 |
Jan
(86) |
Feb
(50) |
Mar
(324) |
Apr
(209) |
May
(197) |
Jun
(232) |
Jul
(194) |
Aug
(247) |
Sep
(219) |
Oct
(266) |
Nov
(328) |
Dec
(304) |
| 2025 |
Jan
(191) |
Feb
(115) |
Mar
(137) |
Apr
(32) |
May
(126) |
Jun
(403) |
Jul
(213) |
Aug
(184) |
Sep
|
Oct
|
Nov
|
Dec
|
Author: sagamusix Date: Sat May 4 19:37:55 2024 New Revision: 20705 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20705 Log: [Fix] libopenmpt test builds also need the gzip unarchiver. Modified: trunk/OpenMPT/build/premake/mpt-libopenmpt_test.lua trunk/OpenMPT/build/vs2017winxp/libopenmpt_test.vcxproj trunk/OpenMPT/build/vs2017winxp/libopenmpt_test.vcxproj.filters trunk/OpenMPT/build/vs2017winxpansi/libopenmpt_test.vcxproj trunk/OpenMPT/build/vs2017winxpansi/libopenmpt_test.vcxproj.filters trunk/OpenMPT/build/vs2019win10/libopenmpt_test.vcxproj trunk/OpenMPT/build/vs2019win10/libopenmpt_test.vcxproj.filters trunk/OpenMPT/build/vs2019win7/libopenmpt_test.vcxproj trunk/OpenMPT/build/vs2019win7/libopenmpt_test.vcxproj.filters trunk/OpenMPT/build/vs2019win81/libopenmpt_test.vcxproj trunk/OpenMPT/build/vs2019win81/libopenmpt_test.vcxproj.filters trunk/OpenMPT/build/vs2022win10/libopenmpt_test.vcxproj trunk/OpenMPT/build/vs2022win10/libopenmpt_test.vcxproj.filters trunk/OpenMPT/build/vs2022win10clang/libopenmpt_test.vcxproj trunk/OpenMPT/build/vs2022win10clang/libopenmpt_test.vcxproj.filters trunk/OpenMPT/build/vs2022win7/libopenmpt_test.vcxproj trunk/OpenMPT/build/vs2022win7/libopenmpt_test.vcxproj.filters trunk/OpenMPT/build/vs2022win81/libopenmpt_test.vcxproj trunk/OpenMPT/build/vs2022win81/libopenmpt_test.vcxproj.filters Modified: trunk/OpenMPT/build/premake/mpt-libopenmpt_test.lua ============================================================================== --- trunk/OpenMPT/build/premake/mpt-libopenmpt_test.lua Sat May 4 15:08:16 2024 (r20704) +++ trunk/OpenMPT/build/premake/mpt-libopenmpt_test.lua Sat May 4 19:37:55 2024 (r20705) @@ -44,6 +44,9 @@ "../../sounddsp/*.h", "../../test/*.cpp", "../../test/*.h", + "../../unarchiver/archive.h", + "../../unarchiver/ungzip.cpp", + "../../unarchiver/ungzip.h", "../../libopenmpt/libopenmpt.h", "../../libopenmpt/libopenmpt.hpp", "../../libopenmpt/libopenmpt_config.h", Modified: trunk/OpenMPT/build/vs2017winxp/libopenmpt_test.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2017winxp/libopenmpt_test.vcxproj Sat May 4 15:08:16 2024 (r20704) +++ trunk/OpenMPT/build/vs2017winxp/libopenmpt_test.vcxproj Sat May 4 19:37:55 2024 (r20705) @@ -979,6 +979,8 @@ <ClInclude Include="..\..\test\TestToolsLib.h" /> <ClInclude Include="..\..\test\TestToolsTracker.h" /> <ClInclude Include="..\..\test\test.h" /> + <ClInclude Include="..\..\unarchiver\archive.h" /> + <ClInclude Include="..\..\unarchiver\ungzip.h" /> </ItemGroup> <ItemGroup> <ClCompile Include="..\..\common\ComponentManager.cpp" /> @@ -1131,6 +1133,7 @@ <ClCompile Include="..\..\test\mpt_tests_string_transcode.cpp" /> <ClCompile Include="..\..\test\mpt_tests_uuid.cpp" /> <ClCompile Include="..\..\test\test.cpp" /> + <ClCompile Include="..\..\unarchiver\ungzip.cpp" /> </ItemGroup> <ItemGroup> <None Include="..\..\test\libopenmpt_test.manifest" /> Modified: trunk/OpenMPT/build/vs2017winxp/libopenmpt_test.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2017winxp/libopenmpt_test.vcxproj.filters Sat May 4 15:08:16 2024 (r20704) +++ trunk/OpenMPT/build/vs2017winxp/libopenmpt_test.vcxproj.filters Sat May 4 19:37:55 2024 (r20705) @@ -166,6 +166,9 @@ <Filter Include="test"> <UniqueIdentifier>{65689E7C-519F-9F0D-FA8B-8510E6A11B0F}</UniqueIdentifier> </Filter> + <Filter Include="unarchiver"> + <UniqueIdentifier>{DCBADFD6-C872-2124-317A-FA7F1D51BC14}</UniqueIdentifier> + </Filter> </ItemGroup> <ItemGroup> <ClInclude Include="..\..\common\BuildSettings.h"> @@ -1086,6 +1089,12 @@ <ClInclude Include="..\..\test\test.h"> <Filter>test</Filter> </ClInclude> + <ClInclude Include="..\..\unarchiver\archive.h"> + <Filter>unarchiver</Filter> + </ClInclude> + <ClInclude Include="..\..\unarchiver\ungzip.h"> + <Filter>unarchiver</Filter> + </ClInclude> </ItemGroup> <ItemGroup> <ClCompile Include="..\..\common\ComponentManager.cpp"> @@ -1538,6 +1547,9 @@ <ClCompile Include="..\..\test\test.cpp"> <Filter>test</Filter> </ClCompile> + <ClCompile Include="..\..\unarchiver\ungzip.cpp"> + <Filter>unarchiver</Filter> + </ClCompile> </ItemGroup> <ItemGroup> <None Include="..\..\test\libopenmpt_test.manifest"> Modified: trunk/OpenMPT/build/vs2017winxpansi/libopenmpt_test.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2017winxpansi/libopenmpt_test.vcxproj Sat May 4 15:08:16 2024 (r20704) +++ trunk/OpenMPT/build/vs2017winxpansi/libopenmpt_test.vcxproj Sat May 4 19:37:55 2024 (r20705) @@ -979,6 +979,8 @@ <ClInclude Include="..\..\test\TestToolsLib.h" /> <ClInclude Include="..\..\test\TestToolsTracker.h" /> <ClInclude Include="..\..\test\test.h" /> + <ClInclude Include="..\..\unarchiver\archive.h" /> + <ClInclude Include="..\..\unarchiver\ungzip.h" /> </ItemGroup> <ItemGroup> <ClCompile Include="..\..\common\ComponentManager.cpp" /> @@ -1131,6 +1133,7 @@ <ClCompile Include="..\..\test\mpt_tests_string_transcode.cpp" /> <ClCompile Include="..\..\test\mpt_tests_uuid.cpp" /> <ClCompile Include="..\..\test\test.cpp" /> + <ClCompile Include="..\..\unarchiver\ungzip.cpp" /> </ItemGroup> <ItemGroup> <None Include="..\..\test\libopenmpt_test.manifest" /> Modified: trunk/OpenMPT/build/vs2017winxpansi/libopenmpt_test.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2017winxpansi/libopenmpt_test.vcxproj.filters Sat May 4 15:08:16 2024 (r20704) +++ trunk/OpenMPT/build/vs2017winxpansi/libopenmpt_test.vcxproj.filters Sat May 4 19:37:55 2024 (r20705) @@ -166,6 +166,9 @@ <Filter Include="test"> <UniqueIdentifier>{65689E7C-519F-9F0D-FA8B-8510E6A11B0F}</UniqueIdentifier> </Filter> + <Filter Include="unarchiver"> + <UniqueIdentifier>{DCBADFD6-C872-2124-317A-FA7F1D51BC14}</UniqueIdentifier> + </Filter> </ItemGroup> <ItemGroup> <ClInclude Include="..\..\common\BuildSettings.h"> @@ -1086,6 +1089,12 @@ <ClInclude Include="..\..\test\test.h"> <Filter>test</Filter> </ClInclude> + <ClInclude Include="..\..\unarchiver\archive.h"> + <Filter>unarchiver</Filter> + </ClInclude> + <ClInclude Include="..\..\unarchiver\ungzip.h"> + <Filter>unarchiver</Filter> + </ClInclude> </ItemGroup> <ItemGroup> <ClCompile Include="..\..\common\ComponentManager.cpp"> @@ -1538,6 +1547,9 @@ <ClCompile Include="..\..\test\test.cpp"> <Filter>test</Filter> </ClCompile> + <ClCompile Include="..\..\unarchiver\ungzip.cpp"> + <Filter>unarchiver</Filter> + </ClCompile> </ItemGroup> <ItemGroup> <None Include="..\..\test\libopenmpt_test.manifest"> Modified: trunk/OpenMPT/build/vs2019win10/libopenmpt_test.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2019win10/libopenmpt_test.vcxproj Sat May 4 15:08:16 2024 (r20704) +++ trunk/OpenMPT/build/vs2019win10/libopenmpt_test.vcxproj Sat May 4 19:37:55 2024 (r20705) @@ -1636,6 +1636,8 @@ <ClInclude Include="..\..\test\TestToolsLib.h" /> <ClInclude Include="..\..\test\TestToolsTracker.h" /> <ClInclude Include="..\..\test\test.h" /> + <ClInclude Include="..\..\unarchiver\archive.h" /> + <ClInclude Include="..\..\unarchiver\ungzip.h" /> </ItemGroup> <ItemGroup> <ClCompile Include="..\..\common\ComponentManager.cpp" /> @@ -1788,6 +1790,7 @@ <ClCompile Include="..\..\test\mpt_tests_string_transcode.cpp" /> <ClCompile Include="..\..\test\mpt_tests_uuid.cpp" /> <ClCompile Include="..\..\test\test.cpp" /> + <ClCompile Include="..\..\unarchiver\ungzip.cpp" /> </ItemGroup> <ItemGroup> <None Include="..\..\test\libopenmpt_test.manifest" /> Modified: trunk/OpenMPT/build/vs2019win10/libopenmpt_test.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2019win10/libopenmpt_test.vcxproj.filters Sat May 4 15:08:16 2024 (r20704) +++ trunk/OpenMPT/build/vs2019win10/libopenmpt_test.vcxproj.filters Sat May 4 19:37:55 2024 (r20705) @@ -172,6 +172,9 @@ <Filter Include="test"> <UniqueIdentifier>{65689E7C-519F-9F0D-FA8B-8510E6A11B0F}</UniqueIdentifier> </Filter> + <Filter Include="unarchiver"> + <UniqueIdentifier>{DCBADFD6-C872-2124-317A-FA7F1D51BC14}</UniqueIdentifier> + </Filter> </ItemGroup> <ItemGroup> <ClInclude Include="..\..\common\BuildSettings.h"> @@ -1092,6 +1095,12 @@ <ClInclude Include="..\..\test\test.h"> <Filter>test</Filter> </ClInclude> + <ClInclude Include="..\..\unarchiver\archive.h"> + <Filter>unarchiver</Filter> + </ClInclude> + <ClInclude Include="..\..\unarchiver\ungzip.h"> + <Filter>unarchiver</Filter> + </ClInclude> </ItemGroup> <ItemGroup> <ClCompile Include="..\..\common\ComponentManager.cpp"> @@ -1544,6 +1553,9 @@ <ClCompile Include="..\..\test\test.cpp"> <Filter>test</Filter> </ClCompile> + <ClCompile Include="..\..\unarchiver\ungzip.cpp"> + <Filter>unarchiver</Filter> + </ClCompile> </ItemGroup> <ItemGroup> <None Include="..\..\test\libopenmpt_test.manifest"> Modified: trunk/OpenMPT/build/vs2019win7/libopenmpt_test.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2019win7/libopenmpt_test.vcxproj Sat May 4 15:08:16 2024 (r20704) +++ trunk/OpenMPT/build/vs2019win7/libopenmpt_test.vcxproj Sat May 4 19:37:55 2024 (r20705) @@ -976,6 +976,8 @@ <ClInclude Include="..\..\test\TestToolsLib.h" /> <ClInclude Include="..\..\test\TestToolsTracker.h" /> <ClInclude Include="..\..\test\test.h" /> + <ClInclude Include="..\..\unarchiver\archive.h" /> + <ClInclude Include="..\..\unarchiver\ungzip.h" /> </ItemGroup> <ItemGroup> <ClCompile Include="..\..\common\ComponentManager.cpp" /> @@ -1128,6 +1130,7 @@ <ClCompile Include="..\..\test\mpt_tests_string_transcode.cpp" /> <ClCompile Include="..\..\test\mpt_tests_uuid.cpp" /> <ClCompile Include="..\..\test\test.cpp" /> + <ClCompile Include="..\..\unarchiver\ungzip.cpp" /> </ItemGroup> <ItemGroup> <None Include="..\..\test\libopenmpt_test.manifest" /> Modified: trunk/OpenMPT/build/vs2019win7/libopenmpt_test.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2019win7/libopenmpt_test.vcxproj.filters Sat May 4 15:08:16 2024 (r20704) +++ trunk/OpenMPT/build/vs2019win7/libopenmpt_test.vcxproj.filters Sat May 4 19:37:55 2024 (r20705) @@ -172,6 +172,9 @@ <Filter Include="test"> <UniqueIdentifier>{65689E7C-519F-9F0D-FA8B-8510E6A11B0F}</UniqueIdentifier> </Filter> + <Filter Include="unarchiver"> + <UniqueIdentifier>{DCBADFD6-C872-2124-317A-FA7F1D51BC14}</UniqueIdentifier> + </Filter> </ItemGroup> <ItemGroup> <ClInclude Include="..\..\common\BuildSettings.h"> @@ -1092,6 +1095,12 @@ <ClInclude Include="..\..\test\test.h"> <Filter>test</Filter> </ClInclude> + <ClInclude Include="..\..\unarchiver\archive.h"> + <Filter>unarchiver</Filter> + </ClInclude> + <ClInclude Include="..\..\unarchiver\ungzip.h"> + <Filter>unarchiver</Filter> + </ClInclude> </ItemGroup> <ItemGroup> <ClCompile Include="..\..\common\ComponentManager.cpp"> @@ -1544,6 +1553,9 @@ <ClCompile Include="..\..\test\test.cpp"> <Filter>test</Filter> </ClCompile> + <ClCompile Include="..\..\unarchiver\ungzip.cpp"> + <Filter>unarchiver</Filter> + </ClCompile> </ItemGroup> <ItemGroup> <None Include="..\..\test\libopenmpt_test.manifest"> Modified: trunk/OpenMPT/build/vs2019win81/libopenmpt_test.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2019win81/libopenmpt_test.vcxproj Sat May 4 15:08:16 2024 (r20704) +++ trunk/OpenMPT/build/vs2019win81/libopenmpt_test.vcxproj Sat May 4 19:37:55 2024 (r20705) @@ -976,6 +976,8 @@ <ClInclude Include="..\..\test\TestToolsLib.h" /> <ClInclude Include="..\..\test\TestToolsTracker.h" /> <ClInclude Include="..\..\test\test.h" /> + <ClInclude Include="..\..\unarchiver\archive.h" /> + <ClInclude Include="..\..\unarchiver\ungzip.h" /> </ItemGroup> <ItemGroup> <ClCompile Include="..\..\common\ComponentManager.cpp" /> @@ -1128,6 +1130,7 @@ <ClCompile Include="..\..\test\mpt_tests_string_transcode.cpp" /> <ClCompile Include="..\..\test\mpt_tests_uuid.cpp" /> <ClCompile Include="..\..\test\test.cpp" /> + <ClCompile Include="..\..\unarchiver\ungzip.cpp" /> </ItemGroup> <ItemGroup> <None Include="..\..\test\libopenmpt_test.manifest" /> Modified: trunk/OpenMPT/build/vs2019win81/libopenmpt_test.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2019win81/libopenmpt_test.vcxproj.filters Sat May 4 15:08:16 2024 (r20704) +++ trunk/OpenMPT/build/vs2019win81/libopenmpt_test.vcxproj.filters Sat May 4 19:37:55 2024 (r20705) @@ -172,6 +172,9 @@ <Filter Include="test"> <UniqueIdentifier>{65689E7C-519F-9F0D-FA8B-8510E6A11B0F}</UniqueIdentifier> </Filter> + <Filter Include="unarchiver"> + <UniqueIdentifier>{DCBADFD6-C872-2124-317A-FA7F1D51BC14}</UniqueIdentifier> + </Filter> </ItemGroup> <ItemGroup> <ClInclude Include="..\..\common\BuildSettings.h"> @@ -1092,6 +1095,12 @@ <ClInclude Include="..\..\test\test.h"> <Filter>test</Filter> </ClInclude> + <ClInclude Include="..\..\unarchiver\archive.h"> + <Filter>unarchiver</Filter> + </ClInclude> + <ClInclude Include="..\..\unarchiver\ungzip.h"> + <Filter>unarchiver</Filter> + </ClInclude> </ItemGroup> <ItemGroup> <ClCompile Include="..\..\common\ComponentManager.cpp"> @@ -1544,6 +1553,9 @@ <ClCompile Include="..\..\test\test.cpp"> <Filter>test</Filter> </ClCompile> + <ClCompile Include="..\..\unarchiver\ungzip.cpp"> + <Filter>unarchiver</Filter> + </ClCompile> </ItemGroup> <ItemGroup> <None Include="..\..\test\libopenmpt_test.manifest"> Modified: trunk/OpenMPT/build/vs2022win10/libopenmpt_test.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2022win10/libopenmpt_test.vcxproj Sat May 4 15:08:16 2024 (r20704) +++ trunk/OpenMPT/build/vs2022win10/libopenmpt_test.vcxproj Sat May 4 19:37:55 2024 (r20705) @@ -1676,6 +1676,8 @@ <ClInclude Include="..\..\test\TestToolsLib.h" /> <ClInclude Include="..\..\test\TestToolsTracker.h" /> <ClInclude Include="..\..\test\test.h" /> + <ClInclude Include="..\..\unarchiver\archive.h" /> + <ClInclude Include="..\..\unarchiver\ungzip.h" /> </ItemGroup> <ItemGroup> <ClCompile Include="..\..\common\ComponentManager.cpp" /> @@ -1828,6 +1830,7 @@ <ClCompile Include="..\..\test\mpt_tests_string_transcode.cpp" /> <ClCompile Include="..\..\test\mpt_tests_uuid.cpp" /> <ClCompile Include="..\..\test\test.cpp" /> + <ClCompile Include="..\..\unarchiver\ungzip.cpp" /> </ItemGroup> <ItemGroup> <None Include="..\..\test\libopenmpt_test.manifest" /> Modified: trunk/OpenMPT/build/vs2022win10/libopenmpt_test.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2022win10/libopenmpt_test.vcxproj.filters Sat May 4 15:08:16 2024 (r20704) +++ trunk/OpenMPT/build/vs2022win10/libopenmpt_test.vcxproj.filters Sat May 4 19:37:55 2024 (r20705) @@ -172,6 +172,9 @@ <Filter Include="test"> <UniqueIdentifier>{65689E7C-519F-9F0D-FA8B-8510E6A11B0F}</UniqueIdentifier> </Filter> + <Filter Include="unarchiver"> + <UniqueIdentifier>{DCBADFD6-C872-2124-317A-FA7F1D51BC14}</UniqueIdentifier> + </Filter> </ItemGroup> <ItemGroup> <ClInclude Include="..\..\common\BuildSettings.h"> @@ -1092,6 +1095,12 @@ <ClInclude Include="..\..\test\test.h"> <Filter>test</Filter> </ClInclude> + <ClInclude Include="..\..\unarchiver\archive.h"> + <Filter>unarchiver</Filter> + </ClInclude> + <ClInclude Include="..\..\unarchiver\ungzip.h"> + <Filter>unarchiver</Filter> + </ClInclude> </ItemGroup> <ItemGroup> <ClCompile Include="..\..\common\ComponentManager.cpp"> @@ -1544,6 +1553,9 @@ <ClCompile Include="..\..\test\test.cpp"> <Filter>test</Filter> </ClCompile> + <ClCompile Include="..\..\unarchiver\ungzip.cpp"> + <Filter>unarchiver</Filter> + </ClCompile> </ItemGroup> <ItemGroup> <None Include="..\..\test\libopenmpt_test.manifest"> Modified: trunk/OpenMPT/build/vs2022win10clang/libopenmpt_test.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2022win10clang/libopenmpt_test.vcxproj Sat May 4 15:08:16 2024 (r20704) +++ trunk/OpenMPT/build/vs2022win10clang/libopenmpt_test.vcxproj Sat May 4 19:37:55 2024 (r20705) @@ -1594,6 +1594,8 @@ <ClInclude Include="..\..\test\TestToolsLib.h" /> <ClInclude Include="..\..\test\TestToolsTracker.h" /> <ClInclude Include="..\..\test\test.h" /> + <ClInclude Include="..\..\unarchiver\archive.h" /> + <ClInclude Include="..\..\unarchiver\ungzip.h" /> </ItemGroup> <ItemGroup> <ClCompile Include="..\..\common\ComponentManager.cpp" /> @@ -1746,6 +1748,7 @@ <ClCompile Include="..\..\test\mpt_tests_string_transcode.cpp" /> <ClCompile Include="..\..\test\mpt_tests_uuid.cpp" /> <ClCompile Include="..\..\test\test.cpp" /> + <ClCompile Include="..\..\unarchiver\ungzip.cpp" /> </ItemGroup> <ItemGroup> <None Include="..\..\test\libopenmpt_test.manifest" /> Modified: trunk/OpenMPT/build/vs2022win10clang/libopenmpt_test.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2022win10clang/libopenmpt_test.vcxproj.filters Sat May 4 15:08:16 2024 (r20704) +++ trunk/OpenMPT/build/vs2022win10clang/libopenmpt_test.vcxproj.filters Sat May 4 19:37:55 2024 (r20705) @@ -172,6 +172,9 @@ <Filter Include="test"> <UniqueIdentifier>{65689E7C-519F-9F0D-FA8B-8510E6A11B0F}</UniqueIdentifier> </Filter> + <Filter Include="unarchiver"> + <UniqueIdentifier>{DCBADFD6-C872-2124-317A-FA7F1D51BC14}</UniqueIdentifier> + </Filter> </ItemGroup> <ItemGroup> <ClInclude Include="..\..\common\BuildSettings.h"> @@ -1092,6 +1095,12 @@ <ClInclude Include="..\..\test\test.h"> <Filter>test</Filter> </ClInclude> + <ClInclude Include="..\..\unarchiver\archive.h"> + <Filter>unarchiver</Filter> + </ClInclude> + <ClInclude Include="..\..\unarchiver\ungzip.h"> + <Filter>unarchiver</Filter> + </ClInclude> </ItemGroup> <ItemGroup> <ClCompile Include="..\..\common\ComponentManager.cpp"> @@ -1544,6 +1553,9 @@ <ClCompile Include="..\..\test\test.cpp"> <Filter>test</Filter> </ClCompile> + <ClCompile Include="..\..\unarchiver\ungzip.cpp"> + <Filter>unarchiver</Filter> + </ClCompile> </ItemGroup> <ItemGroup> <None Include="..\..\test\libopenmpt_test.manifest"> Modified: trunk/OpenMPT/build/vs2022win7/libopenmpt_test.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2022win7/libopenmpt_test.vcxproj Sat May 4 15:08:16 2024 (r20704) +++ trunk/OpenMPT/build/vs2022win7/libopenmpt_test.vcxproj Sat May 4 19:37:55 2024 (r20705) @@ -996,6 +996,8 @@ <ClInclude Include="..\..\test\TestToolsLib.h" /> <ClInclude Include="..\..\test\TestToolsTracker.h" /> <ClInclude Include="..\..\test\test.h" /> + <ClInclude Include="..\..\unarchiver\archive.h" /> + <ClInclude Include="..\..\unarchiver\ungzip.h" /> </ItemGroup> <ItemGroup> <ClCompile Include="..\..\common\ComponentManager.cpp" /> @@ -1148,6 +1150,7 @@ <ClCompile Include="..\..\test\mpt_tests_string_transcode.cpp" /> <ClCompile Include="..\..\test\mpt_tests_uuid.cpp" /> <ClCompile Include="..\..\test\test.cpp" /> + <ClCompile Include="..\..\unarchiver\ungzip.cpp" /> </ItemGroup> <ItemGroup> <None Include="..\..\test\libopenmpt_test.manifest" /> Modified: trunk/OpenMPT/build/vs2022win7/libopenmpt_test.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2022win7/libopenmpt_test.vcxproj.filters Sat May 4 15:08:16 2024 (r20704) +++ trunk/OpenMPT/build/vs2022win7/libopenmpt_test.vcxproj.filters Sat May 4 19:37:55 2024 (r20705) @@ -172,6 +172,9 @@ <Filter Include="test"> <UniqueIdentifier>{65689E7C-519F-9F0D-FA8B-8510E6A11B0F}</UniqueIdentifier> </Filter> + <Filter Include="unarchiver"> + <UniqueIdentifier>{DCBADFD6-C872-2124-317A-FA7F1D51BC14}</UniqueIdentifier> + </Filter> </ItemGroup> <ItemGroup> <ClInclude Include="..\..\common\BuildSettings.h"> @@ -1092,6 +1095,12 @@ <ClInclude Include="..\..\test\test.h"> <Filter>test</Filter> </ClInclude> + <ClInclude Include="..\..\unarchiver\archive.h"> + <Filter>unarchiver</Filter> + </ClInclude> + <ClInclude Include="..\..\unarchiver\ungzip.h"> + <Filter>unarchiver</Filter> + </ClInclude> </ItemGroup> <ItemGroup> <ClCompile Include="..\..\common\ComponentManager.cpp"> @@ -1544,6 +1553,9 @@ <ClCompile Include="..\..\test\test.cpp"> <Filter>test</Filter> </ClCompile> + <ClCompile Include="..\..\unarchiver\ungzip.cpp"> + <Filter>unarchiver</Filter> + </ClCompile> </ItemGroup> <ItemGroup> <None Include="..\..\test\libopenmpt_test.manifest"> Modified: trunk/OpenMPT/build/vs2022win81/libopenmpt_test.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2022win81/libopenmpt_test.vcxproj Sat May 4 15:08:16 2024 (r20704) +++ trunk/OpenMPT/build/vs2022win81/libopenmpt_test.vcxproj Sat May 4 19:37:55 2024 (r20705) @@ -996,6 +996,8 @@ <ClInclude Include="..\..\test\TestToolsLib.h" /> <ClInclude Include="..\..\test\TestToolsTracker.h" /> <ClInclude Include="..\..\test\test.h" /> + <ClInclude Include="..\..\unarchiver\archive.h" /> + <ClInclude Include="..\..\unarchiver\ungzip.h" /> </ItemGroup> <ItemGroup> <ClCompile Include="..\..\common\ComponentManager.cpp" /> @@ -1148,6 +1150,7 @@ <ClCompile Include="..\..\test\mpt_tests_string_transcode.cpp" /> <ClCompile Include="..\..\test\mpt_tests_uuid.cpp" /> <ClCompile Include="..\..\test\test.cpp" /> + <ClCompile Include="..\..\unarchiver\ungzip.cpp" /> </ItemGroup> <ItemGroup> <None Include="..\..\test\libopenmpt_test.manifest" /> Modified: trunk/OpenMPT/build/vs2022win81/libopenmpt_test.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2022win81/libopenmpt_test.vcxproj.filters Sat May 4 15:08:16 2024 (r20704) +++ trunk/OpenMPT/build/vs2022win81/libopenmpt_test.vcxproj.filters Sat May 4 19:37:55 2024 (r20705) @@ -172,6 +172,9 @@ <Filter Include="test"> <UniqueIdentifier>{65689E7C-519F-9F0D-FA8B-8510E6A11B0F}</UniqueIdentifier> </Filter> + <Filter Include="unarchiver"> + <UniqueIdentifier>{DCBADFD6-C872-2124-317A-FA7F1D51BC14}</UniqueIdentifier> + </Filter> </ItemGroup> <ItemGroup> <ClInclude Include="..\..\common\BuildSettings.h"> @@ -1092,6 +1095,12 @@ <ClInclude Include="..\..\test\test.h"> <Filter>test</Filter> </ClInclude> + <ClInclude Include="..\..\unarchiver\archive.h"> + <Filter>unarchiver</Filter> + </ClInclude> + <ClInclude Include="..\..\unarchiver\ungzip.h"> + <Filter>unarchiver</Filter> + </ClInclude> </ItemGroup> <ItemGroup> <ClCompile Include="..\..\common\ComponentManager.cpp"> @@ -1544,6 +1553,9 @@ <ClCompile Include="..\..\test\test.cpp"> <Filter>test</Filter> </ClCompile> + <ClCompile Include="..\..\unarchiver\ungzip.cpp"> + <Filter>unarchiver</Filter> + </ClCompile> </ItemGroup> <ItemGroup> <None Include="..\..\test\libopenmpt_test.manifest"> |
|
From: <sv...@op...> - 2024-05-04 13:08:23
|
Author: sagamusix Date: Sat May 4 15:08:16 2024 New Revision: 20704 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20704 Log: [Fix] mpt/crypto is not available in library builds. Use CRC64 for sample data hashes instead. [Ref] Silence more warnings. Modified: trunk/OpenMPT/soundlib/OPL.cpp trunk/OpenMPT/test/PlaybackTest.cpp Modified: trunk/OpenMPT/soundlib/OPL.cpp ============================================================================== --- trunk/OpenMPT/soundlib/OPL.cpp Sat May 4 11:56:28 2024 (r20703) +++ trunk/OpenMPT/soundlib/OPL.cpp Sat May 4 15:08:16 2024 (r20704) @@ -370,7 +370,7 @@ if(regLo >= FNUM_LOW && regLo <= FEEDBACK_CONNECTION) return baseCh + static_cast<uint8>(reg & 0x0F); if(regLo >= AM_VIB && regLo <= WAVE_SELECT) - return baseCh + static_cast<uint8>((reg & 0x07) % 3u + ((reg & 0x1F) >> 3) * 3); + return static_cast<uint8>(baseCh + (reg & 0x07) % 3u + ((reg & 0x1F) >> 3) * 3); return 0xFF; } @@ -383,7 +383,7 @@ if(regLo >= FNUM_LOW && regLo <= FEEDBACK_CONNECTION) return (reg & 0xF0); if(regLo >= AM_VIB && regLo <= WAVE_SELECT) - return regLo + static_cast<OPL::Register>((reg & 0x07) >= 3 ? 3 : 0); + return static_cast<OPL::Register>(regLo + ((reg & 0x07) >= 3 ? 3 : 0)); return reg; } Modified: trunk/OpenMPT/test/PlaybackTest.cpp ============================================================================== --- trunk/OpenMPT/test/PlaybackTest.cpp Sat May 4 11:56:28 2024 (r20703) +++ trunk/OpenMPT/test/PlaybackTest.cpp Sat May 4 15:08:16 2024 (r20704) @@ -18,7 +18,7 @@ #include "mpt/base/bit.hpp" #include "mpt/binary/hex.hpp" -#include "mpt/crypto/hash.hpp" +#include "mpt/crc/crc.hpp" #include "mpt/io/io.hpp" #include "mpt/io/io_stdstream.hpp" #include "openmpt/base/Endian.hpp" @@ -105,8 +105,8 @@ MPT_BINARY_STRUCT(TestDataChannel, 44) -using SampleDataHashAlgorithm = mpt::crypto::hash::SHA256; -using SampleDataHash = decltype(SampleDataHashAlgorithm{}.result()); +using SampleDataHashAlgorithm = mpt::crc64_jones; +using SampleDataHash = mpt::packed<decltype(SampleDataHashAlgorithm{}.result()), mpt::endian::little>; struct PlaybackTestData @@ -411,7 +411,7 @@ "\nSample data hashes:\n"; for(SAMPLEINDEX smp = 1; smp <= header.numSamples; smp++) - output << mpt::ToCharset(mpt::Charset::UTF8, mpt::encode_hex(mpt::as_span(m_testData->sampleDataHashes[smp - 1]))) << "\t" << smp << "\n"; + output << mpt::ToCharset(mpt::Charset::UTF8, mpt::encode_hex(mpt::as_raw_memory(m_testData->sampleDataHashes[smp - 1]))) << "\t" << smp << "\n"; output << "\nChannel data:\n" "index\torder\trow\ttick\tglobalVolume\ttickLength\tchannel\tsample\tleftVol\trightVol\tsurround\tspeed\tposition\tfilterType\tfilterA0\tfilterB0\tfilterB1\tsrcMode\toplRegisters\n"; @@ -525,7 +525,7 @@ for(size_t smp = 0; smp < std::min(m_testData->sampleDataHashes.size(), other.sampleDataHashes.size()); smp++) { if(m_testData->sampleDataHashes[smp] != other.sampleDataHashes[smp]) - errors.push_back(MPT_UFORMAT("Sample hash in slot {} differs: {} vs {}")(smp + 1, mpt::encode_hex(mpt::as_span(m_testData->sampleDataHashes[smp])), mpt::encode_hex(mpt::as_span(other.sampleDataHashes[smp])))); + errors.push_back(MPT_UFORMAT("Sample hash in slot {} differs: {} vs {}")(smp + 1, mpt::encode_hex(mpt::as_raw_memory(m_testData->sampleDataHashes[smp])), mpt::encode_hex(mpt::as_raw_memory(other.sampleDataHashes[smp])))); } uint64 lDuration = 0, rDuration = 0; @@ -675,7 +675,9 @@ const auto s = std::move(ss).str(); hasher.process(mpt::byte_cast<mpt::const_byte_span>(mpt::as_span(s))); } - testData.sampleDataHashes.push_back(hasher.result()); + SampleDataHash result; + result.set(hasher.result()); + testData.sampleDataHashes.push_back(result); } for(const auto &song : GetAllSubSongs()) |
|
From: <sv...@op...> - 2024-05-04 09:56:40
|
Author: sagamusix Date: Sat May 4 11:56:28 2024 New Revision: 20703 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20703 Log: [Fix] Fix warnings and compile errors. Modified: trunk/OpenMPT/common/GzipWriter.h trunk/OpenMPT/mptrack/MainFrm.cpp trunk/OpenMPT/soundlib/OPL.cpp trunk/OpenMPT/test/PlaybackTest.cpp Modified: trunk/OpenMPT/common/GzipWriter.h ============================================================================== --- trunk/OpenMPT/common/GzipWriter.h Sat May 4 00:32:17 2024 (r20702) +++ trunk/OpenMPT/common/GzipWriter.h Sat May 4 11:56:28 2024 (r20703) @@ -14,6 +14,7 @@ #include "mptString.h" #include "mpt/io/io.hpp" +#include "mpt/io/io_stdstream.hpp" #ifdef MPT_WITH_ZLIB Modified: trunk/OpenMPT/mptrack/MainFrm.cpp ============================================================================== --- trunk/OpenMPT/mptrack/MainFrm.cpp Sat May 4 00:32:17 2024 (r20702) +++ trunk/OpenMPT/mptrack/MainFrm.cpp Sat May 4 11:56:28 2024 (r20703) @@ -66,6 +66,9 @@ #define MPTTIMER_PERIOD 200 +#if defined(MPT_BUILD_DEBUG) +#define MPT_ENABLE_PLAYBACK_TEST_MENU +#endif ///////////////////////////////////////////////////////////////////////////// // CMainFrame @@ -126,11 +129,11 @@ #endif // MPT_ENABLE_UPDATE ON_COMMAND(ID_HELPSHOW, &CMainFrame::OnHelp) -#ifdef MPT_BUILD_DEBUG +#ifdef MPT_ENABLE_PLAYBACK_TEST_MENU ON_COMMAND(ID_CREATE_MIXERDUMP, &CMainFrame::OnCreateMixerDump) ON_COMMAND(ID_VERIFY_MIXERDUMP, &CMainFrame::OnVerifyMixerDump) ON_COMMAND(ID_CONVERT_MIXERDUMP, &CMainFrame::OnConvertMixerDumpToText) -#endif // MPT_BUILD_DEBUG +#endif // ENABLE_PLAYBACK_TEST_MENU ON_COMMAND_RANGE(ID_MRU_LIST_FIRST, ID_MRU_LIST_LAST, &CMainFrame::OnOpenMRUItem) ON_UPDATE_COMMAND_UI(ID_MRU_LIST_FIRST, &CMainFrame::OnUpdateMRUItem) @@ -237,14 +240,14 @@ CreateTemplateModulesMenu(); UpdateMRUList(); -#ifdef MPT_BUILD_DEBUG +#ifdef MPT_ENABLE_PLAYBACK_TEST_MENU CMenu debugMenu; debugMenu.CreatePopupMenu(); debugMenu.AppendMenu(MF_STRING, ID_CREATE_MIXERDUMP, _T("Create Mixer Dump for &File(s)...")); debugMenu.AppendMenu(MF_STRING, ID_VERIFY_MIXERDUMP, _T("&Verify File(s)...")); debugMenu.AppendMenu(MF_STRING, ID_CONVERT_MIXERDUMP, _T("Convert Mixer Dump to &TSV...")); GetMenu()->AppendMenu(MF_STRING | MF_POPUP, reinterpret_cast<UINT_PTR>(debugMenu.Detach()), _T("Debug")); -#endif // MPT_BUILD_DEBUG +#endif // ENABLE_PLAYBACK_TEST_MENU } @@ -3176,7 +3179,7 @@ } -#ifdef MPT_BUILD_DEBUG +#ifdef MPT_ENABLE_PLAYBACK_TEST_MENU void CMainFrame::OnCreateMixerDump() { std::string exts; @@ -3283,7 +3286,7 @@ } } -#endif // MPT_BUILD_DEBUG +#endif // ENABLE_PLAYBACK_TEST_MENU void CMainFrame::NotifyAccessibilityUpdate(CWnd &source) Modified: trunk/OpenMPT/soundlib/OPL.cpp ============================================================================== --- trunk/OpenMPT/soundlib/OPL.cpp Sat May 4 00:32:17 2024 (r20702) +++ trunk/OpenMPT/soundlib/OPL.cpp Sat May 4 11:56:28 2024 (r20703) @@ -383,7 +383,7 @@ if(regLo >= FNUM_LOW && regLo <= FEEDBACK_CONNECTION) return (reg & 0xF0); if(regLo >= AM_VIB && regLo <= WAVE_SELECT) - return (reg & 0xE0) + ((reg & 0x07) >= 3 ? 3 : 0); + return regLo + static_cast<OPL::Register>((reg & 0x07) >= 3 ? 3 : 0); return reg; } Modified: trunk/OpenMPT/test/PlaybackTest.cpp ============================================================================== --- trunk/OpenMPT/test/PlaybackTest.cpp Sat May 4 00:32:17 2024 (r20702) +++ trunk/OpenMPT/test/PlaybackTest.cpp Sat May 4 11:56:28 2024 (r20703) @@ -20,6 +20,7 @@ #include "mpt/binary/hex.hpp" #include "mpt/crypto/hash.hpp" #include "mpt/io/io.hpp" +#include "mpt/io/io_stdstream.hpp" #include "openmpt/base/Endian.hpp" #include <sstream> @@ -380,7 +381,7 @@ } #ifdef MPT_WITH_ZLIB - std::string outData = std::move(outStream.str()); + std::string outData = std::move(outStream).str(); WriteGzip(output, outData, filename); #else // miniz doesn't have gzip convenience functions |
|
From: <sv...@op...> - 2024-05-03 22:32:29
|
Author: sagamusix Date: Sat May 4 00:32:17 2024 New Revision: 20702 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20702 Log: [Mod] MDL: Command 9 is not Set Envelope Position, it select a different envelope instead. As we only have one envelope per type per instrument, instead do the only thing we can do for now: Assume that the instrument envelope was disabled and enable it. Modified: trunk/OpenMPT/soundlib/Load_mdl.cpp Modified: trunk/OpenMPT/soundlib/Load_mdl.cpp ============================================================================== --- trunk/OpenMPT/soundlib/Load_mdl.cpp Sat May 4 00:06:21 2024 (r20701) +++ trunk/OpenMPT/soundlib/Load_mdl.cpp Sat May 4 00:32:17 2024 (r20702) @@ -168,7 +168,7 @@ /* Either column */ /* 7 */ CMD_TEMPO, /* 8 */ CMD_PANNING8, - /* 9 */ CMD_SETENVPOSITION, + /* 9 */ CMD_S3MCMDEX, /* A */ CMD_NONE, /* B */ CMD_POSITIONJUMP, /* C */ CMD_GLOBALVOLUME, @@ -203,6 +203,16 @@ case 0x08: // Panning param = (param & 0x7F) * 2u; break; + case 0x09: // Set Envelope (we can only have one envelope per type...) + if(param < 0x40) + param = 0x78; // Enable the one volume envelope we have + else if (param < 0x80) + param = 0x7A; // Enable the one panning envelope we have + else if(param < 0xC0) + param = 0x7C; // Enable the one pitch envelope we have + else + cmd = CMD_NONE; + break; case 0x0C: // Global volume param = static_cast<uint8>((param + 1) / 2u); break; |
Author: sagamusix Date: Sat May 4 00:06:21 2024 New Revision: 20701 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20701 Log: [New] Added a mechanism for creating dumps of all relevant mixer and OPL data for finding regressions in the playback engine. This is just a first step in automating this process; right now the new functionality can only be invoked via a debug menu in OpenMPT that is only visible in DEBUG builds. Automation of this process shall follow in a second step (https://bugs.openmpt.org/view.php?id=1507). Added: trunk/OpenMPT/common/GzipWriter.h (contents, props changed) trunk/OpenMPT/test/PlaybackTest.cpp (contents, props changed) trunk/OpenMPT/test/PlaybackTest.h (contents, props changed) Modified: trunk/OpenMPT/build/autotools/Makefile.am trunk/OpenMPT/build/vs2017winxp/OpenMPT-ANSI.vcxproj trunk/OpenMPT/build/vs2017winxp/OpenMPT-ANSI.vcxproj.filters trunk/OpenMPT/build/vs2017winxp/OpenMPT-NativeSupport.vcxproj trunk/OpenMPT/build/vs2017winxp/OpenMPT-NativeSupport.vcxproj.filters trunk/OpenMPT/build/vs2017winxp/OpenMPT-UTF8.vcxproj trunk/OpenMPT/build/vs2017winxp/OpenMPT-UTF8.vcxproj.filters trunk/OpenMPT/build/vs2017winxp/OpenMPT.vcxproj trunk/OpenMPT/build/vs2017winxp/OpenMPT.vcxproj.filters trunk/OpenMPT/build/vs2017winxp/libopenmpt-small.vcxproj trunk/OpenMPT/build/vs2017winxp/libopenmpt-small.vcxproj.filters trunk/OpenMPT/build/vs2017winxp/libopenmpt.vcxproj trunk/OpenMPT/build/vs2017winxp/libopenmpt.vcxproj.filters trunk/OpenMPT/build/vs2017winxp/libopenmpt_test.vcxproj trunk/OpenMPT/build/vs2017winxp/libopenmpt_test.vcxproj.filters trunk/OpenMPT/build/vs2017winxp/updatesigntool.vcxproj trunk/OpenMPT/build/vs2017winxp/updatesigntool.vcxproj.filters trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-ANSI.vcxproj trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-ANSI.vcxproj.filters trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-NativeSupport.vcxproj trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-NativeSupport.vcxproj.filters trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-UTF8.vcxproj trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-UTF8.vcxproj.filters trunk/OpenMPT/build/vs2017winxpansi/OpenMPT.vcxproj trunk/OpenMPT/build/vs2017winxpansi/OpenMPT.vcxproj.filters trunk/OpenMPT/build/vs2017winxpansi/libopenmpt-small.vcxproj trunk/OpenMPT/build/vs2017winxpansi/libopenmpt-small.vcxproj.filters trunk/OpenMPT/build/vs2017winxpansi/libopenmpt.vcxproj trunk/OpenMPT/build/vs2017winxpansi/libopenmpt.vcxproj.filters trunk/OpenMPT/build/vs2017winxpansi/libopenmpt_test.vcxproj trunk/OpenMPT/build/vs2017winxpansi/libopenmpt_test.vcxproj.filters trunk/OpenMPT/build/vs2017winxpansi/updatesigntool.vcxproj trunk/OpenMPT/build/vs2017winxpansi/updatesigntool.vcxproj.filters trunk/OpenMPT/build/vs2019win10/OpenMPT-ANSI.vcxproj trunk/OpenMPT/build/vs2019win10/OpenMPT-ANSI.vcxproj.filters trunk/OpenMPT/build/vs2019win10/OpenMPT-NativeSupport.vcxproj trunk/OpenMPT/build/vs2019win10/OpenMPT-NativeSupport.vcxproj.filters trunk/OpenMPT/build/vs2019win10/OpenMPT-UTF8.vcxproj trunk/OpenMPT/build/vs2019win10/OpenMPT-UTF8.vcxproj.filters trunk/OpenMPT/build/vs2019win10/OpenMPT.vcxproj trunk/OpenMPT/build/vs2019win10/OpenMPT.vcxproj.filters trunk/OpenMPT/build/vs2019win10/libopenmpt-small.vcxproj trunk/OpenMPT/build/vs2019win10/libopenmpt-small.vcxproj.filters trunk/OpenMPT/build/vs2019win10/libopenmpt.vcxproj trunk/OpenMPT/build/vs2019win10/libopenmpt.vcxproj.filters trunk/OpenMPT/build/vs2019win10/libopenmpt_test.vcxproj trunk/OpenMPT/build/vs2019win10/libopenmpt_test.vcxproj.filters trunk/OpenMPT/build/vs2019win10/updatesigntool.vcxproj trunk/OpenMPT/build/vs2019win10/updatesigntool.vcxproj.filters trunk/OpenMPT/build/vs2019win10uwp/libopenmpt-small.vcxproj trunk/OpenMPT/build/vs2019win10uwp/libopenmpt-small.vcxproj.filters trunk/OpenMPT/build/vs2019win10uwp/libopenmpt.vcxproj trunk/OpenMPT/build/vs2019win10uwp/libopenmpt.vcxproj.filters trunk/OpenMPT/build/vs2019win7/OpenMPT-ANSI.vcxproj trunk/OpenMPT/build/vs2019win7/OpenMPT-ANSI.vcxproj.filters trunk/OpenMPT/build/vs2019win7/OpenMPT-NativeSupport.vcxproj trunk/OpenMPT/build/vs2019win7/OpenMPT-NativeSupport.vcxproj.filters trunk/OpenMPT/build/vs2019win7/OpenMPT-UTF8.vcxproj trunk/OpenMPT/build/vs2019win7/OpenMPT-UTF8.vcxproj.filters trunk/OpenMPT/build/vs2019win7/OpenMPT.vcxproj trunk/OpenMPT/build/vs2019win7/OpenMPT.vcxproj.filters trunk/OpenMPT/build/vs2019win7/libopenmpt-small.vcxproj trunk/OpenMPT/build/vs2019win7/libopenmpt-small.vcxproj.filters trunk/OpenMPT/build/vs2019win7/libopenmpt.vcxproj trunk/OpenMPT/build/vs2019win7/libopenmpt.vcxproj.filters trunk/OpenMPT/build/vs2019win7/libopenmpt_test.vcxproj trunk/OpenMPT/build/vs2019win7/libopenmpt_test.vcxproj.filters trunk/OpenMPT/build/vs2019win7/updatesigntool.vcxproj trunk/OpenMPT/build/vs2019win7/updatesigntool.vcxproj.filters trunk/OpenMPT/build/vs2019win81/OpenMPT-ANSI.vcxproj trunk/OpenMPT/build/vs2019win81/OpenMPT-ANSI.vcxproj.filters trunk/OpenMPT/build/vs2019win81/OpenMPT-NativeSupport.vcxproj trunk/OpenMPT/build/vs2019win81/OpenMPT-NativeSupport.vcxproj.filters trunk/OpenMPT/build/vs2019win81/OpenMPT-UTF8.vcxproj trunk/OpenMPT/build/vs2019win81/OpenMPT-UTF8.vcxproj.filters trunk/OpenMPT/build/vs2019win81/OpenMPT.vcxproj trunk/OpenMPT/build/vs2019win81/OpenMPT.vcxproj.filters trunk/OpenMPT/build/vs2019win81/libopenmpt-small.vcxproj trunk/OpenMPT/build/vs2019win81/libopenmpt-small.vcxproj.filters trunk/OpenMPT/build/vs2019win81/libopenmpt.vcxproj trunk/OpenMPT/build/vs2019win81/libopenmpt.vcxproj.filters trunk/OpenMPT/build/vs2019win81/libopenmpt_test.vcxproj trunk/OpenMPT/build/vs2019win81/libopenmpt_test.vcxproj.filters trunk/OpenMPT/build/vs2019win81/updatesigntool.vcxproj trunk/OpenMPT/build/vs2019win81/updatesigntool.vcxproj.filters trunk/OpenMPT/build/vs2022win10/OpenMPT-ANSI.vcxproj trunk/OpenMPT/build/vs2022win10/OpenMPT-ANSI.vcxproj.filters trunk/OpenMPT/build/vs2022win10/OpenMPT-NativeSupport.vcxproj trunk/OpenMPT/build/vs2022win10/OpenMPT-NativeSupport.vcxproj.filters trunk/OpenMPT/build/vs2022win10/OpenMPT-UTF8.vcxproj trunk/OpenMPT/build/vs2022win10/OpenMPT-UTF8.vcxproj.filters trunk/OpenMPT/build/vs2022win10/OpenMPT.vcxproj trunk/OpenMPT/build/vs2022win10/OpenMPT.vcxproj.filters trunk/OpenMPT/build/vs2022win10/libopenmpt-small.vcxproj trunk/OpenMPT/build/vs2022win10/libopenmpt-small.vcxproj.filters trunk/OpenMPT/build/vs2022win10/libopenmpt.vcxproj trunk/OpenMPT/build/vs2022win10/libopenmpt.vcxproj.filters trunk/OpenMPT/build/vs2022win10/libopenmpt_test.vcxproj trunk/OpenMPT/build/vs2022win10/libopenmpt_test.vcxproj.filters trunk/OpenMPT/build/vs2022win10/updatesigntool.vcxproj trunk/OpenMPT/build/vs2022win10/updatesigntool.vcxproj.filters trunk/OpenMPT/build/vs2022win10clang/OpenMPT-ANSI.vcxproj trunk/OpenMPT/build/vs2022win10clang/OpenMPT-ANSI.vcxproj.filters trunk/OpenMPT/build/vs2022win10clang/OpenMPT-NativeSupport.vcxproj trunk/OpenMPT/build/vs2022win10clang/OpenMPT-NativeSupport.vcxproj.filters trunk/OpenMPT/build/vs2022win10clang/OpenMPT-UTF8.vcxproj trunk/OpenMPT/build/vs2022win10clang/OpenMPT-UTF8.vcxproj.filters trunk/OpenMPT/build/vs2022win10clang/OpenMPT.vcxproj trunk/OpenMPT/build/vs2022win10clang/OpenMPT.vcxproj.filters trunk/OpenMPT/build/vs2022win10clang/libopenmpt-small.vcxproj trunk/OpenMPT/build/vs2022win10clang/libopenmpt-small.vcxproj.filters trunk/OpenMPT/build/vs2022win10clang/libopenmpt.vcxproj trunk/OpenMPT/build/vs2022win10clang/libopenmpt.vcxproj.filters trunk/OpenMPT/build/vs2022win10clang/libopenmpt_test.vcxproj trunk/OpenMPT/build/vs2022win10clang/libopenmpt_test.vcxproj.filters trunk/OpenMPT/build/vs2022win10clang/updatesigntool.vcxproj trunk/OpenMPT/build/vs2022win10clang/updatesigntool.vcxproj.filters trunk/OpenMPT/build/vs2022win10uwp/libopenmpt-small.vcxproj trunk/OpenMPT/build/vs2022win10uwp/libopenmpt-small.vcxproj.filters trunk/OpenMPT/build/vs2022win10uwp/libopenmpt.vcxproj trunk/OpenMPT/build/vs2022win10uwp/libopenmpt.vcxproj.filters trunk/OpenMPT/build/vs2022win7/OpenMPT-ANSI.vcxproj trunk/OpenMPT/build/vs2022win7/OpenMPT-ANSI.vcxproj.filters trunk/OpenMPT/build/vs2022win7/OpenMPT-NativeSupport.vcxproj trunk/OpenMPT/build/vs2022win7/OpenMPT-NativeSupport.vcxproj.filters trunk/OpenMPT/build/vs2022win7/OpenMPT-UTF8.vcxproj trunk/OpenMPT/build/vs2022win7/OpenMPT-UTF8.vcxproj.filters trunk/OpenMPT/build/vs2022win7/OpenMPT.vcxproj trunk/OpenMPT/build/vs2022win7/OpenMPT.vcxproj.filters trunk/OpenMPT/build/vs2022win7/libopenmpt-small.vcxproj trunk/OpenMPT/build/vs2022win7/libopenmpt-small.vcxproj.filters trunk/OpenMPT/build/vs2022win7/libopenmpt.vcxproj trunk/OpenMPT/build/vs2022win7/libopenmpt.vcxproj.filters trunk/OpenMPT/build/vs2022win7/libopenmpt_test.vcxproj trunk/OpenMPT/build/vs2022win7/libopenmpt_test.vcxproj.filters trunk/OpenMPT/build/vs2022win7/updatesigntool.vcxproj trunk/OpenMPT/build/vs2022win7/updatesigntool.vcxproj.filters trunk/OpenMPT/build/vs2022win81/OpenMPT-ANSI.vcxproj trunk/OpenMPT/build/vs2022win81/OpenMPT-ANSI.vcxproj.filters trunk/OpenMPT/build/vs2022win81/OpenMPT-NativeSupport.vcxproj trunk/OpenMPT/build/vs2022win81/OpenMPT-NativeSupport.vcxproj.filters trunk/OpenMPT/build/vs2022win81/OpenMPT-UTF8.vcxproj trunk/OpenMPT/build/vs2022win81/OpenMPT-UTF8.vcxproj.filters trunk/OpenMPT/build/vs2022win81/OpenMPT.vcxproj trunk/OpenMPT/build/vs2022win81/OpenMPT.vcxproj.filters trunk/OpenMPT/build/vs2022win81/libopenmpt-small.vcxproj trunk/OpenMPT/build/vs2022win81/libopenmpt-small.vcxproj.filters trunk/OpenMPT/build/vs2022win81/libopenmpt.vcxproj trunk/OpenMPT/build/vs2022win81/libopenmpt.vcxproj.filters trunk/OpenMPT/build/vs2022win81/libopenmpt_test.vcxproj trunk/OpenMPT/build/vs2022win81/libopenmpt_test.vcxproj.filters trunk/OpenMPT/build/vs2022win81/updatesigntool.vcxproj trunk/OpenMPT/build/vs2022win81/updatesigntool.vcxproj.filters trunk/OpenMPT/build/xcode-ios/libopenmpt.xcodeproj/project.pbxproj trunk/OpenMPT/build/xcode-macosx/libopenmpt.xcodeproj/project.pbxproj trunk/OpenMPT/mptrack/MainFrm.cpp trunk/OpenMPT/mptrack/Mainfrm.h trunk/OpenMPT/mptrack/OPLExport.cpp trunk/OpenMPT/mptrack/resource.h trunk/OpenMPT/soundlib/ModChannel.cpp trunk/OpenMPT/soundlib/ModChannel.h trunk/OpenMPT/soundlib/OPL.cpp trunk/OpenMPT/soundlib/OPL.h trunk/OpenMPT/soundlib/Snd_fx.cpp trunk/OpenMPT/soundlib/Sndfile.h Modified: trunk/OpenMPT/build/autotools/Makefile.am ============================================================================== --- trunk/OpenMPT/build/autotools/Makefile.am Fri May 3 23:25:33 2024 (r20700) +++ trunk/OpenMPT/build/autotools/Makefile.am Sat May 4 00:06:21 2024 (r20701) @@ -321,6 +321,7 @@ MPT_FILES_COMMON += common/Dither.h MPT_FILES_COMMON += common/FileReader.h MPT_FILES_COMMON += common/FileReaderFwd.h +MPT_FILES_COMMON += common/GzipWriter.h MPT_FILES_COMMON += common/Logging.cpp MPT_FILES_COMMON += common/Logging.h MPT_FILES_COMMON += common/misc_util.h Modified: trunk/OpenMPT/build/vs2017winxp/OpenMPT-ANSI.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2017winxp/OpenMPT-ANSI.vcxproj Fri May 3 23:25:33 2024 (r20700) +++ trunk/OpenMPT/build/vs2017winxp/OpenMPT-ANSI.vcxproj Sat May 4 00:06:21 2024 (r20701) @@ -762,6 +762,7 @@ <ClInclude Include="..\..\common\Dither.h" /> <ClInclude Include="..\..\common\FileReader.h" /> <ClInclude Include="..\..\common\FileReaderFwd.h" /> + <ClInclude Include="..\..\common\GzipWriter.h" /> <ClInclude Include="..\..\common\Logging.h" /> <ClInclude Include="..\..\common\Profiler.h" /> <ClInclude Include="..\..\common\misc_util.h" /> @@ -1187,6 +1188,7 @@ <ClInclude Include="..\..\src\openmpt\sounddevice\SoundDeviceRtAudio.hpp" /> <ClInclude Include="..\..\src\openmpt\sounddevice\SoundDeviceUtilities.hpp" /> <ClInclude Include="..\..\src\openmpt\sounddevice\SoundDeviceWaveout.hpp" /> + <ClInclude Include="..\..\test\PlaybackTest.h" /> <ClInclude Include="..\..\test\TestTools.h" /> <ClInclude Include="..\..\test\TestToolsLib.h" /> <ClInclude Include="..\..\test\TestToolsTracker.h" /> @@ -1461,6 +1463,7 @@ <ClCompile Include="..\..\src\openmpt\sounddevice\SoundDeviceRtAudio.cpp" /> <ClCompile Include="..\..\src\openmpt\sounddevice\SoundDeviceUtilities.cpp" /> <ClCompile Include="..\..\src\openmpt\sounddevice\SoundDeviceWaveout.cpp" /> + <ClCompile Include="..\..\test\PlaybackTest.cpp" /> <ClCompile Include="..\..\test\TestToolsLib.cpp" /> <ClCompile Include="..\..\test\libopenmpt_test.cpp" /> <ClCompile Include="..\..\test\mpt_tests_base.cpp" /> Modified: trunk/OpenMPT/build/vs2017winxp/OpenMPT-ANSI.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2017winxp/OpenMPT-ANSI.vcxproj.filters Fri May 3 23:25:33 2024 (r20700) +++ trunk/OpenMPT/build/vs2017winxp/OpenMPT-ANSI.vcxproj.filters Sat May 4 00:06:21 2024 (r20701) @@ -237,6 +237,9 @@ <ClInclude Include="..\..\common\FileReaderFwd.h"> <Filter>common</Filter> </ClInclude> + <ClInclude Include="..\..\common\GzipWriter.h"> + <Filter>common</Filter> + </ClInclude> <ClInclude Include="..\..\common\Logging.h"> <Filter>common</Filter> </ClInclude> @@ -1512,6 +1515,9 @@ <ClInclude Include="..\..\src\openmpt\sounddevice\SoundDeviceWaveout.hpp"> <Filter>src\openmpt\sounddevice</Filter> </ClInclude> + <ClInclude Include="..\..\test\PlaybackTest.h"> + <Filter>test</Filter> + </ClInclude> <ClInclude Include="..\..\test\TestTools.h"> <Filter>test</Filter> </ClInclude> @@ -2330,6 +2336,9 @@ <ClCompile Include="..\..\src\openmpt\sounddevice\SoundDeviceWaveout.cpp"> <Filter>src\openmpt\sounddevice</Filter> </ClCompile> + <ClCompile Include="..\..\test\PlaybackTest.cpp"> + <Filter>test</Filter> + </ClCompile> <ClCompile Include="..\..\test\TestToolsLib.cpp"> <Filter>test</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2017winxp/OpenMPT-NativeSupport.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2017winxp/OpenMPT-NativeSupport.vcxproj Fri May 3 23:25:33 2024 (r20700) +++ trunk/OpenMPT/build/vs2017winxp/OpenMPT-NativeSupport.vcxproj Sat May 4 00:06:21 2024 (r20701) @@ -642,6 +642,7 @@ <ClInclude Include="..\..\common\Dither.h" /> <ClInclude Include="..\..\common\FileReader.h" /> <ClInclude Include="..\..\common\FileReaderFwd.h" /> + <ClInclude Include="..\..\common\GzipWriter.h" /> <ClInclude Include="..\..\common\Logging.h" /> <ClInclude Include="..\..\common\Profiler.h" /> <ClInclude Include="..\..\common\misc_util.h" /> Modified: trunk/OpenMPT/build/vs2017winxp/OpenMPT-NativeSupport.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2017winxp/OpenMPT-NativeSupport.vcxproj.filters Fri May 3 23:25:33 2024 (r20700) +++ trunk/OpenMPT/build/vs2017winxp/OpenMPT-NativeSupport.vcxproj.filters Sat May 4 00:06:21 2024 (r20701) @@ -198,6 +198,9 @@ <ClInclude Include="..\..\common\FileReaderFwd.h"> <Filter>common</Filter> </ClInclude> + <ClInclude Include="..\..\common\GzipWriter.h"> + <Filter>common</Filter> + </ClInclude> <ClInclude Include="..\..\common\Logging.h"> <Filter>common</Filter> </ClInclude> Modified: trunk/OpenMPT/build/vs2017winxp/OpenMPT-UTF8.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2017winxp/OpenMPT-UTF8.vcxproj Fri May 3 23:25:33 2024 (r20700) +++ trunk/OpenMPT/build/vs2017winxp/OpenMPT-UTF8.vcxproj Sat May 4 00:06:21 2024 (r20701) @@ -762,6 +762,7 @@ <ClInclude Include="..\..\common\Dither.h" /> <ClInclude Include="..\..\common\FileReader.h" /> <ClInclude Include="..\..\common\FileReaderFwd.h" /> + <ClInclude Include="..\..\common\GzipWriter.h" /> <ClInclude Include="..\..\common\Logging.h" /> <ClInclude Include="..\..\common\Profiler.h" /> <ClInclude Include="..\..\common\misc_util.h" /> @@ -1187,6 +1188,7 @@ <ClInclude Include="..\..\src\openmpt\sounddevice\SoundDeviceRtAudio.hpp" /> <ClInclude Include="..\..\src\openmpt\sounddevice\SoundDeviceUtilities.hpp" /> <ClInclude Include="..\..\src\openmpt\sounddevice\SoundDeviceWaveout.hpp" /> + <ClInclude Include="..\..\test\PlaybackTest.h" /> <ClInclude Include="..\..\test\TestTools.h" /> <ClInclude Include="..\..\test\TestToolsLib.h" /> <ClInclude Include="..\..\test\TestToolsTracker.h" /> @@ -1461,6 +1463,7 @@ <ClCompile Include="..\..\src\openmpt\sounddevice\SoundDeviceRtAudio.cpp" /> <ClCompile Include="..\..\src\openmpt\sounddevice\SoundDeviceUtilities.cpp" /> <ClCompile Include="..\..\src\openmpt\sounddevice\SoundDeviceWaveout.cpp" /> + <ClCompile Include="..\..\test\PlaybackTest.cpp" /> <ClCompile Include="..\..\test\TestToolsLib.cpp" /> <ClCompile Include="..\..\test\libopenmpt_test.cpp" /> <ClCompile Include="..\..\test\mpt_tests_base.cpp" /> Modified: trunk/OpenMPT/build/vs2017winxp/OpenMPT-UTF8.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2017winxp/OpenMPT-UTF8.vcxproj.filters Fri May 3 23:25:33 2024 (r20700) +++ trunk/OpenMPT/build/vs2017winxp/OpenMPT-UTF8.vcxproj.filters Sat May 4 00:06:21 2024 (r20701) @@ -237,6 +237,9 @@ <ClInclude Include="..\..\common\FileReaderFwd.h"> <Filter>common</Filter> </ClInclude> + <ClInclude Include="..\..\common\GzipWriter.h"> + <Filter>common</Filter> + </ClInclude> <ClInclude Include="..\..\common\Logging.h"> <Filter>common</Filter> </ClInclude> @@ -1512,6 +1515,9 @@ <ClInclude Include="..\..\src\openmpt\sounddevice\SoundDeviceWaveout.hpp"> <Filter>src\openmpt\sounddevice</Filter> </ClInclude> + <ClInclude Include="..\..\test\PlaybackTest.h"> + <Filter>test</Filter> + </ClInclude> <ClInclude Include="..\..\test\TestTools.h"> <Filter>test</Filter> </ClInclude> @@ -2330,6 +2336,9 @@ <ClCompile Include="..\..\src\openmpt\sounddevice\SoundDeviceWaveout.cpp"> <Filter>src\openmpt\sounddevice</Filter> </ClCompile> + <ClCompile Include="..\..\test\PlaybackTest.cpp"> + <Filter>test</Filter> + </ClCompile> <ClCompile Include="..\..\test\TestToolsLib.cpp"> <Filter>test</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2017winxp/OpenMPT.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2017winxp/OpenMPT.vcxproj Fri May 3 23:25:33 2024 (r20700) +++ trunk/OpenMPT/build/vs2017winxp/OpenMPT.vcxproj Sat May 4 00:06:21 2024 (r20701) @@ -762,6 +762,7 @@ <ClInclude Include="..\..\common\Dither.h" /> <ClInclude Include="..\..\common\FileReader.h" /> <ClInclude Include="..\..\common\FileReaderFwd.h" /> + <ClInclude Include="..\..\common\GzipWriter.h" /> <ClInclude Include="..\..\common\Logging.h" /> <ClInclude Include="..\..\common\Profiler.h" /> <ClInclude Include="..\..\common\misc_util.h" /> @@ -1187,6 +1188,7 @@ <ClInclude Include="..\..\src\openmpt\sounddevice\SoundDeviceRtAudio.hpp" /> <ClInclude Include="..\..\src\openmpt\sounddevice\SoundDeviceUtilities.hpp" /> <ClInclude Include="..\..\src\openmpt\sounddevice\SoundDeviceWaveout.hpp" /> + <ClInclude Include="..\..\test\PlaybackTest.h" /> <ClInclude Include="..\..\test\TestTools.h" /> <ClInclude Include="..\..\test\TestToolsLib.h" /> <ClInclude Include="..\..\test\TestToolsTracker.h" /> @@ -1461,6 +1463,7 @@ <ClCompile Include="..\..\src\openmpt\sounddevice\SoundDeviceRtAudio.cpp" /> <ClCompile Include="..\..\src\openmpt\sounddevice\SoundDeviceUtilities.cpp" /> <ClCompile Include="..\..\src\openmpt\sounddevice\SoundDeviceWaveout.cpp" /> + <ClCompile Include="..\..\test\PlaybackTest.cpp" /> <ClCompile Include="..\..\test\TestToolsLib.cpp" /> <ClCompile Include="..\..\test\libopenmpt_test.cpp" /> <ClCompile Include="..\..\test\mpt_tests_base.cpp" /> Modified: trunk/OpenMPT/build/vs2017winxp/OpenMPT.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2017winxp/OpenMPT.vcxproj.filters Fri May 3 23:25:33 2024 (r20700) +++ trunk/OpenMPT/build/vs2017winxp/OpenMPT.vcxproj.filters Sat May 4 00:06:21 2024 (r20701) @@ -237,6 +237,9 @@ <ClInclude Include="..\..\common\FileReaderFwd.h"> <Filter>common</Filter> </ClInclude> + <ClInclude Include="..\..\common\GzipWriter.h"> + <Filter>common</Filter> + </ClInclude> <ClInclude Include="..\..\common\Logging.h"> <Filter>common</Filter> </ClInclude> @@ -1512,6 +1515,9 @@ <ClInclude Include="..\..\src\openmpt\sounddevice\SoundDeviceWaveout.hpp"> <Filter>src\openmpt\sounddevice</Filter> </ClInclude> + <ClInclude Include="..\..\test\PlaybackTest.h"> + <Filter>test</Filter> + </ClInclude> <ClInclude Include="..\..\test\TestTools.h"> <Filter>test</Filter> </ClInclude> @@ -2330,6 +2336,9 @@ <ClCompile Include="..\..\src\openmpt\sounddevice\SoundDeviceWaveout.cpp"> <Filter>src\openmpt\sounddevice</Filter> </ClCompile> + <ClCompile Include="..\..\test\PlaybackTest.cpp"> + <Filter>test</Filter> + </ClCompile> <ClCompile Include="..\..\test\TestToolsLib.cpp"> <Filter>test</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2017winxp/libopenmpt-small.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2017winxp/libopenmpt-small.vcxproj Fri May 3 23:25:33 2024 (r20700) +++ trunk/OpenMPT/build/vs2017winxp/libopenmpt-small.vcxproj Sat May 4 00:06:21 2024 (r20701) @@ -648,6 +648,7 @@ <ClInclude Include="..\..\common\Dither.h" /> <ClInclude Include="..\..\common\FileReader.h" /> <ClInclude Include="..\..\common\FileReaderFwd.h" /> + <ClInclude Include="..\..\common\GzipWriter.h" /> <ClInclude Include="..\..\common\Logging.h" /> <ClInclude Include="..\..\common\Profiler.h" /> <ClInclude Include="..\..\common\misc_util.h" /> Modified: trunk/OpenMPT/build/vs2017winxp/libopenmpt-small.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2017winxp/libopenmpt-small.vcxproj.filters Fri May 3 23:25:33 2024 (r20700) +++ trunk/OpenMPT/build/vs2017winxp/libopenmpt-small.vcxproj.filters Sat May 4 00:06:21 2024 (r20701) @@ -177,6 +177,9 @@ <ClInclude Include="..\..\common\FileReaderFwd.h"> <Filter>common</Filter> </ClInclude> + <ClInclude Include="..\..\common\GzipWriter.h"> + <Filter>common</Filter> + </ClInclude> <ClInclude Include="..\..\common\Logging.h"> <Filter>common</Filter> </ClInclude> Modified: trunk/OpenMPT/build/vs2017winxp/libopenmpt.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2017winxp/libopenmpt.vcxproj Fri May 3 23:25:33 2024 (r20700) +++ trunk/OpenMPT/build/vs2017winxp/libopenmpt.vcxproj Sat May 4 00:06:21 2024 (r20701) @@ -648,6 +648,7 @@ <ClInclude Include="..\..\common\Dither.h" /> <ClInclude Include="..\..\common\FileReader.h" /> <ClInclude Include="..\..\common\FileReaderFwd.h" /> + <ClInclude Include="..\..\common\GzipWriter.h" /> <ClInclude Include="..\..\common\Logging.h" /> <ClInclude Include="..\..\common\Profiler.h" /> <ClInclude Include="..\..\common\misc_util.h" /> Modified: trunk/OpenMPT/build/vs2017winxp/libopenmpt.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2017winxp/libopenmpt.vcxproj.filters Fri May 3 23:25:33 2024 (r20700) +++ trunk/OpenMPT/build/vs2017winxp/libopenmpt.vcxproj.filters Sat May 4 00:06:21 2024 (r20701) @@ -177,6 +177,9 @@ <ClInclude Include="..\..\common\FileReaderFwd.h"> <Filter>common</Filter> </ClInclude> + <ClInclude Include="..\..\common\GzipWriter.h"> + <Filter>common</Filter> + </ClInclude> <ClInclude Include="..\..\common\Logging.h"> <Filter>common</Filter> </ClInclude> Modified: trunk/OpenMPT/build/vs2017winxp/libopenmpt_test.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2017winxp/libopenmpt_test.vcxproj Fri May 3 23:25:33 2024 (r20700) +++ trunk/OpenMPT/build/vs2017winxp/libopenmpt_test.vcxproj Sat May 4 00:06:21 2024 (r20701) @@ -678,6 +678,7 @@ <ClInclude Include="..\..\common\Dither.h" /> <ClInclude Include="..\..\common\FileReader.h" /> <ClInclude Include="..\..\common\FileReaderFwd.h" /> + <ClInclude Include="..\..\common\GzipWriter.h" /> <ClInclude Include="..\..\common\Logging.h" /> <ClInclude Include="..\..\common\Profiler.h" /> <ClInclude Include="..\..\common\misc_util.h" /> @@ -973,6 +974,7 @@ <ClInclude Include="..\..\src\openmpt\soundbase\SampleDecode.hpp" /> <ClInclude Include="..\..\src\openmpt\soundbase\SampleEncode.hpp" /> <ClInclude Include="..\..\src\openmpt\soundbase\SampleFormat.hpp" /> + <ClInclude Include="..\..\test\PlaybackTest.h" /> <ClInclude Include="..\..\test\TestTools.h" /> <ClInclude Include="..\..\test\TestToolsLib.h" /> <ClInclude Include="..\..\test\TestToolsTracker.h" /> @@ -1114,6 +1116,7 @@ <ClCompile Include="..\..\soundlib\plugins\dmo\WavesReverb.cpp" /> <ClCompile Include="..\..\soundlib\tuning.cpp" /> <ClCompile Include="..\..\soundlib\tuningCollection.cpp" /> + <ClCompile Include="..\..\test\PlaybackTest.cpp" /> <ClCompile Include="..\..\test\TestToolsLib.cpp" /> <ClCompile Include="..\..\test\libopenmpt_test.cpp" /> <ClCompile Include="..\..\test\mpt_tests_base.cpp" /> Modified: trunk/OpenMPT/build/vs2017winxp/libopenmpt_test.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2017winxp/libopenmpt_test.vcxproj.filters Fri May 3 23:25:33 2024 (r20700) +++ trunk/OpenMPT/build/vs2017winxp/libopenmpt_test.vcxproj.filters Sat May 4 00:06:21 2024 (r20701) @@ -183,6 +183,9 @@ <ClInclude Include="..\..\common\FileReaderFwd.h"> <Filter>common</Filter> </ClInclude> + <ClInclude Include="..\..\common\GzipWriter.h"> + <Filter>common</Filter> + </ClInclude> <ClInclude Include="..\..\common\Logging.h"> <Filter>common</Filter> </ClInclude> @@ -1068,6 +1071,9 @@ <ClInclude Include="..\..\src\openmpt\soundbase\SampleFormat.hpp"> <Filter>src\openmpt\soundbase</Filter> </ClInclude> + <ClInclude Include="..\..\test\PlaybackTest.h"> + <Filter>test</Filter> + </ClInclude> <ClInclude Include="..\..\test\TestTools.h"> <Filter>test</Filter> </ClInclude> @@ -1487,6 +1493,9 @@ <ClCompile Include="..\..\soundlib\tuningCollection.cpp"> <Filter>soundlib</Filter> </ClCompile> + <ClCompile Include="..\..\test\PlaybackTest.cpp"> + <Filter>test</Filter> + </ClCompile> <ClCompile Include="..\..\test\TestToolsLib.cpp"> <Filter>test</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2017winxp/updatesigntool.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2017winxp/updatesigntool.vcxproj Fri May 3 23:25:33 2024 (r20700) +++ trunk/OpenMPT/build/vs2017winxp/updatesigntool.vcxproj Sat May 4 00:06:21 2024 (r20701) @@ -630,6 +630,7 @@ <ClInclude Include="..\..\common\Dither.h" /> <ClInclude Include="..\..\common\FileReader.h" /> <ClInclude Include="..\..\common\FileReaderFwd.h" /> + <ClInclude Include="..\..\common\GzipWriter.h" /> <ClInclude Include="..\..\common\Logging.h" /> <ClInclude Include="..\..\common\Profiler.h" /> <ClInclude Include="..\..\common\misc_util.h" /> Modified: trunk/OpenMPT/build/vs2017winxp/updatesigntool.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2017winxp/updatesigntool.vcxproj.filters Fri May 3 23:25:33 2024 (r20700) +++ trunk/OpenMPT/build/vs2017winxp/updatesigntool.vcxproj.filters Sat May 4 00:06:21 2024 (r20701) @@ -195,6 +195,9 @@ <ClInclude Include="..\..\common\FileReaderFwd.h"> <Filter>common</Filter> </ClInclude> + <ClInclude Include="..\..\common\GzipWriter.h"> + <Filter>common</Filter> + </ClInclude> <ClInclude Include="..\..\common\Logging.h"> <Filter>common</Filter> </ClInclude> Modified: trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-ANSI.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-ANSI.vcxproj Fri May 3 23:25:33 2024 (r20700) +++ trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-ANSI.vcxproj Sat May 4 00:06:21 2024 (r20701) @@ -762,6 +762,7 @@ <ClInclude Include="..\..\common\Dither.h" /> <ClInclude Include="..\..\common\FileReader.h" /> <ClInclude Include="..\..\common\FileReaderFwd.h" /> + <ClInclude Include="..\..\common\GzipWriter.h" /> <ClInclude Include="..\..\common\Logging.h" /> <ClInclude Include="..\..\common\Profiler.h" /> <ClInclude Include="..\..\common\misc_util.h" /> @@ -1187,6 +1188,7 @@ <ClInclude Include="..\..\src\openmpt\sounddevice\SoundDeviceRtAudio.hpp" /> <ClInclude Include="..\..\src\openmpt\sounddevice\SoundDeviceUtilities.hpp" /> <ClInclude Include="..\..\src\openmpt\sounddevice\SoundDeviceWaveout.hpp" /> + <ClInclude Include="..\..\test\PlaybackTest.h" /> <ClInclude Include="..\..\test\TestTools.h" /> <ClInclude Include="..\..\test\TestToolsLib.h" /> <ClInclude Include="..\..\test\TestToolsTracker.h" /> @@ -1461,6 +1463,7 @@ <ClCompile Include="..\..\src\openmpt\sounddevice\SoundDeviceRtAudio.cpp" /> <ClCompile Include="..\..\src\openmpt\sounddevice\SoundDeviceUtilities.cpp" /> <ClCompile Include="..\..\src\openmpt\sounddevice\SoundDeviceWaveout.cpp" /> + <ClCompile Include="..\..\test\PlaybackTest.cpp" /> <ClCompile Include="..\..\test\TestToolsLib.cpp" /> <ClCompile Include="..\..\test\libopenmpt_test.cpp" /> <ClCompile Include="..\..\test\mpt_tests_base.cpp" /> Modified: trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-ANSI.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-ANSI.vcxproj.filters Fri May 3 23:25:33 2024 (r20700) +++ trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-ANSI.vcxproj.filters Sat May 4 00:06:21 2024 (r20701) @@ -237,6 +237,9 @@ <ClInclude Include="..\..\common\FileReaderFwd.h"> <Filter>common</Filter> </ClInclude> + <ClInclude Include="..\..\common\GzipWriter.h"> + <Filter>common</Filter> + </ClInclude> <ClInclude Include="..\..\common\Logging.h"> <Filter>common</Filter> </ClInclude> @@ -1512,6 +1515,9 @@ <ClInclude Include="..\..\src\openmpt\sounddevice\SoundDeviceWaveout.hpp"> <Filter>src\openmpt\sounddevice</Filter> </ClInclude> + <ClInclude Include="..\..\test\PlaybackTest.h"> + <Filter>test</Filter> + </ClInclude> <ClInclude Include="..\..\test\TestTools.h"> <Filter>test</Filter> </ClInclude> @@ -2330,6 +2336,9 @@ <ClCompile Include="..\..\src\openmpt\sounddevice\SoundDeviceWaveout.cpp"> <Filter>src\openmpt\sounddevice</Filter> </ClCompile> + <ClCompile Include="..\..\test\PlaybackTest.cpp"> + <Filter>test</Filter> + </ClCompile> <ClCompile Include="..\..\test\TestToolsLib.cpp"> <Filter>test</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-NativeSupport.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-NativeSupport.vcxproj Fri May 3 23:25:33 2024 (r20700) +++ trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-NativeSupport.vcxproj Sat May 4 00:06:21 2024 (r20701) @@ -642,6 +642,7 @@ <ClInclude Include="..\..\common\Dither.h" /> <ClInclude Include="..\..\common\FileReader.h" /> <ClInclude Include="..\..\common\FileReaderFwd.h" /> + <ClInclude Include="..\..\common\GzipWriter.h" /> <ClInclude Include="..\..\common\Logging.h" /> <ClInclude Include="..\..\common\Profiler.h" /> <ClInclude Include="..\..\common\misc_util.h" /> Modified: trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-NativeSupport.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-NativeSupport.vcxproj.filters Fri May 3 23:25:33 2024 (r20700) +++ trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-NativeSupport.vcxproj.filters Sat May 4 00:06:21 2024 (r20701) @@ -198,6 +198,9 @@ <ClInclude Include="..\..\common\FileReaderFwd.h"> <Filter>common</Filter> </ClInclude> + <ClInclude Include="..\..\common\GzipWriter.h"> + <Filter>common</Filter> + </ClInclude> <ClInclude Include="..\..\common\Logging.h"> <Filter>common</Filter> </ClInclude> Modified: trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-UTF8.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-UTF8.vcxproj Fri May 3 23:25:33 2024 (r20700) +++ trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-UTF8.vcxproj Sat May 4 00:06:21 2024 (r20701) @@ -762,6 +762,7 @@ <ClInclude Include="..\..\common\Dither.h" /> <ClInclude Include="..\..\common\FileReader.h" /> <ClInclude Include="..\..\common\FileReaderFwd.h" /> + <ClInclude Include="..\..\common\GzipWriter.h" /> <ClInclude Include="..\..\common\Logging.h" /> <ClInclude Include="..\..\common\Profiler.h" /> <ClInclude Include="..\..\common\misc_util.h" /> @@ -1187,6 +1188,7 @@ <ClInclude Include="..\..\src\openmpt\sounddevice\SoundDeviceRtAudio.hpp" /> <ClInclude Include="..\..\src\openmpt\sounddevice\SoundDeviceUtilities.hpp" /> <ClInclude Include="..\..\src\openmpt\sounddevice\SoundDeviceWaveout.hpp" /> + <ClInclude Include="..\..\test\PlaybackTest.h" /> <ClInclude Include="..\..\test\TestTools.h" /> <ClInclude Include="..\..\test\TestToolsLib.h" /> <ClInclude Include="..\..\test\TestToolsTracker.h" /> @@ -1461,6 +1463,7 @@ <ClCompile Include="..\..\src\openmpt\sounddevice\SoundDeviceRtAudio.cpp" /> <ClCompile Include="..\..\src\openmpt\sounddevice\SoundDeviceUtilities.cpp" /> <ClCompile Include="..\..\src\openmpt\sounddevice\SoundDeviceWaveout.cpp" /> + <ClCompile Include="..\..\test\PlaybackTest.cpp" /> <ClCompile Include="..\..\test\TestToolsLib.cpp" /> <ClCompile Include="..\..\test\libopenmpt_test.cpp" /> <ClCompile Include="..\..\test\mpt_tests_base.cpp" /> Modified: trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-UTF8.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-UTF8.vcxproj.filters Fri May 3 23:25:33 2024 (r20700) +++ trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-UTF8.vcxproj.filters Sat May 4 00:06:21 2024 (r20701) @@ -237,6 +237,9 @@ <ClInclude Include="..\..\common\FileReaderFwd.h"> <Filter>common</Filter> </ClInclude> + <ClInclude Include="..\..\common\GzipWriter.h"> + <Filter>common</Filter> + </ClInclude> <ClInclude Include="..\..\common\Logging.h"> <Filter>common</Filter> </ClInclude> @@ -1512,6 +1515,9 @@ <ClInclude Include="..\..\src\openmpt\sounddevice\SoundDeviceWaveout.hpp"> <Filter>src\openmpt\sounddevice</Filter> </ClInclude> + <ClInclude Include="..\..\test\PlaybackTest.h"> + <Filter>test</Filter> + </ClInclude> <ClInclude Include="..\..\test\TestTools.h"> <Filter>test</Filter> </ClInclude> @@ -2330,6 +2336,9 @@ <ClCompile Include="..\..\src\openmpt\sounddevice\SoundDeviceWaveout.cpp"> <Filter>src\openmpt\sounddevice</Filter> </ClCompile> + <ClCompile Include="..\..\test\PlaybackTest.cpp"> + <Filter>test</Filter> + </ClCompile> <ClCompile Include="..\..\test\TestToolsLib.cpp"> <Filter>test</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2017winxpansi/OpenMPT.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2017winxpansi/OpenMPT.vcxproj Fri May 3 23:25:33 2024 (r20700) +++ trunk/OpenMPT/build/vs2017winxpansi/OpenMPT.vcxproj Sat May 4 00:06:21 2024 (r20701) @@ -762,6 +762,7 @@ <ClInclude Include="..\..\common\Dither.h" /> <ClInclude Include="..\..\common\FileReader.h" /> <ClInclude Include="..\..\common\FileReaderFwd.h" /> + <ClInclude Include="..\..\common\GzipWriter.h" /> <ClInclude Include="..\..\common\Logging.h" /> <ClInclude Include="..\..\common\Profiler.h" /> <ClInclude Include="..\..\common\misc_util.h" /> @@ -1187,6 +1188,7 @@ <ClInclude Include="..\..\src\openmpt\sounddevice\SoundDeviceRtAudio.hpp" /> <ClInclude Include="..\..\src\openmpt\sounddevice\SoundDeviceUtilities.hpp" /> <ClInclude Include="..\..\src\openmpt\sounddevice\SoundDeviceWaveout.hpp" /> + <ClInclude Include="..\..\test\PlaybackTest.h" /> <ClInclude Include="..\..\test\TestTools.h" /> <ClInclude Include="..\..\test\TestToolsLib.h" /> <ClInclude Include="..\..\test\TestToolsTracker.h" /> @@ -1461,6 +1463,7 @@ <ClCompile Include="..\..\src\openmpt\sounddevice\SoundDeviceRtAudio.cpp" /> <ClCompile Include="..\..\src\openmpt\sounddevice\SoundDeviceUtilities.cpp" /> <ClCompile Include="..\..\src\openmpt\sounddevice\SoundDeviceWaveout.cpp" /> + <ClCompile Include="..\..\test\PlaybackTest.cpp" /> <ClCompile Include="..\..\test\TestToolsLib.cpp" /> <ClCompile Include="..\..\test\libopenmpt_test.cpp" /> <ClCompile Include="..\..\test\mpt_tests_base.cpp" /> Modified: trunk/OpenMPT/build/vs2017winxpansi/OpenMPT.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2017winxpansi/OpenMPT.vcxproj.filters Fri May 3 23:25:33 2024 (r20700) +++ trunk/OpenMPT/build/vs2017winxpansi/OpenMPT.vcxproj.filters Sat May 4 00:06:21 2024 (r20701) @@ -237,6 +237,9 @@ <ClInclude Include="..\..\common\FileReaderFwd.h"> <Filter>common</Filter> </ClInclude> + <ClInclude Include="..\..\common\GzipWriter.h"> + <Filter>common</Filter> + </ClInclude> <ClInclude Include="..\..\common\Logging.h"> <Filter>common</Filter> </ClInclude> @@ -1512,6 +1515,9 @@ <ClInclude Include="..\..\src\openmpt\sounddevice\SoundDeviceWaveout.hpp"> <Filter>src\openmpt\sounddevice</Filter> </ClInclude> + <ClInclude Include="..\..\test\PlaybackTest.h"> + <Filter>test</Filter> + </ClInclude> <ClInclude Include="..\..\test\TestTools.h"> <Filter>test</Filter> </ClInclude> @@ -2330,6 +2336,9 @@ <ClCompile Include="..\..\src\openmpt\sounddevice\SoundDeviceWaveout.cpp"> <Filter>src\openmpt\sounddevice</Filter> </ClCompile> + <ClCompile Include="..\..\test\PlaybackTest.cpp"> + <Filter>test</Filter> + </ClCompile> <ClCompile Include="..\..\test\TestToolsLib.cpp"> <Filter>test</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2017winxpansi/libopenmpt-small.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2017winxpansi/libopenmpt-small.vcxproj Fri May 3 23:25:33 2024 (r20700) +++ trunk/OpenMPT/build/vs2017winxpansi/libopenmpt-small.vcxproj Sat May 4 00:06:21 2024 (r20701) @@ -648,6 +648,7 @@ <ClInclude Include="..\..\common\Dither.h" /> <ClInclude Include="..\..\common\FileReader.h" /> <ClInclude Include="..\..\common\FileReaderFwd.h" /> + <ClInclude Include="..\..\common\GzipWriter.h" /> <ClInclude Include="..\..\common\Logging.h" /> <ClInclude Include="..\..\common\Profiler.h" /> <ClInclude Include="..\..\common\misc_util.h" /> Modified: trunk/OpenMPT/build/vs2017winxpansi/libopenmpt-small.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2017winxpansi/libopenmpt-small.vcxproj.filters Fri May 3 23:25:33 2024 (r20700) +++ trunk/OpenMPT/build/vs2017winxpansi/libopenmpt-small.vcxproj.filters Sat May 4 00:06:21 2024 (r20701) @@ -177,6 +177,9 @@ <ClInclude Include="..\..\common\FileReaderFwd.h"> <Filter>common</Filter> </ClInclude> + <ClInclude Include="..\..\common\GzipWriter.h"> + <Filter>common</Filter> + </ClInclude> <ClInclude Include="..\..\common\Logging.h"> <Filter>common</Filter> </ClInclude> Modified: trunk/OpenMPT/build/vs2017winxpansi/libopenmpt.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2017winxpansi/libopenmpt.vcxproj Fri May 3 23:25:33 2024 (r20700) +++ trunk/OpenMPT/build/vs2017winxpansi/libopenmpt.vcxproj Sat May 4 00:06:21 2024 (r20701) @@ -648,6 +648,7 @@ <ClInclude Include="..\..\common\Dither.h" /> <ClInclude Include="..\..\common\FileReader.h" /> <ClInclude Include="..\..\common\FileReaderFwd.h" /> + <ClInclude Include="..\..\common\GzipWriter.h" /> <ClInclude Include="..\..\common\Logging.h" /> <ClInclude Include="..\..\common\Profiler.h" /> <ClInclude Include="..\..\common\misc_util.h" /> Modified: trunk/OpenMPT/build/vs2017winxpansi/libopenmpt.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2017winxpansi/libopenmpt.vcxproj.filters Fri May 3 23:25:33 2024 (r20700) +++ trunk/OpenMPT/build/vs2017winxpansi/libopenmpt.vcxproj.filters Sat May 4 00:06:21 2024 (r20701) @@ -177,6 +177,9 @@ <ClInclude Include="..\..\common\FileReaderFwd.h"> <Filter>common</Filter> </ClInclude> + <ClInclude Include="..\..\common\GzipWriter.h"> + <Filter>common</Filter> + </ClInclude> <ClInclude Include="..\..\common\Logging.h"> <Filter>common</Filter> </ClInclude> Modified: trunk/OpenMPT/build/vs2017winxpansi/libopenmpt_test.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2017winxpansi/libopenmpt_test.vcxproj Fri May 3 23:25:33 2024 (r20700) +++ trunk/OpenMPT/build/vs2017winxpansi/libopenmpt_test.vcxproj Sat May 4 00:06:21 2024 (r20701) @@ -678,6 +678,7 @@ <ClInclude Include="..\..\common\Dither.h" /> <ClInclude Include="..\..\common\FileReader.h" /> <ClInclude Include="..\..\common\FileReaderFwd.h" /> + <ClInclude Include="..\..\common\GzipWriter.h" /> <ClInclude Include="..\..\common\Logging.h" /> <ClInclude Include="..\..\common\Profiler.h" /> <ClInclude Include="..\..\common\misc_util.h" /> @@ -973,6 +974,7 @@ <ClInclude Include="..\..\src\openmpt\soundbase\SampleDecode.hpp" /> <ClInclude Include="..\..\src\openmpt\soundbase\SampleEncode.hpp" /> <ClInclude Include="..\..\src\openmpt\soundbase\SampleFormat.hpp" /> + <ClInclude Include="..\..\test\PlaybackTest.h" /> <ClInclude Include="..\..\test\TestTools.h" /> <ClInclude Include="..\..\test\TestToolsLib.h" /> <ClInclude Include="..\..\test\TestToolsTracker.h" /> @@ -1114,6 +1116,7 @@ <ClCompile Include="..\..\soundlib\plugins\dmo\WavesReverb.cpp" /> <ClCompile Include="..\..\soundlib\tuning.cpp" /> <ClCompile Include="..\..\soundlib\tuningCollection.cpp" /> + <ClCompile Include="..\..\test\PlaybackTest.cpp" /> <ClCompile Include="..\..\test\TestToolsLib.cpp" /> <ClCompile Include="..\..\test\libopenmpt_test.cpp" /> <ClCompile Include="..\..\test\mpt_tests_base.cpp" /> Modified: trunk/OpenMPT/build/vs2017winxpansi/libopenmpt_test.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2017winxpansi/libopenmpt_test.vcxproj.filters Fri May 3 23:25:33 2024 (r20700) +++ trunk/OpenMPT/build/vs2017winxpansi/libopenmpt_test.vcxproj.filters Sat May 4 00:06:21 2024 (r20701) @@ -183,6 +183,9 @@ <ClInclude Include="..\..\common\FileReaderFwd.h"> <Filter>common</Filter> </ClInclude> + <ClInclude Include="..\..\common\GzipWriter.h"> + <Filter>common</Filter> + </ClInclude> <ClInclude Include="..\..\common\Logging.h"> <Filter>common</Filter> </ClInclude> @@ -1068,6 +1071,9 @@ <ClInclude Include="..\..\src\openmpt\soundbase\SampleFormat.hpp"> <Filter>src\openmpt\soundbase</Filter> </ClInclude> + <ClInclude Include="..\..\test\PlaybackTest.h"> + <Filter>test</Filter> + </ClInclude> <ClInclude Include="..\..\test\TestTools.h"> <Filter>test</Filter> </ClInclude> @@ -1487,6 +1493,9 @@ <ClCompile Include="..\..\soundlib\tuningCollection.cpp"> <Filter>soundlib</Filter> </ClCompile> + <ClCompile Include="..\..\test\PlaybackTest.cpp"> + <Filter>test</Filter> + </ClCompile> <ClCompile Include="..\..\test\TestToolsLib.cpp"> <Filter>test</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2017winxpansi/updatesigntool.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2017winxpansi/updatesigntool.vcxproj Fri May 3 23:25:33 2024 (r20700) +++ trunk/OpenMPT/build/vs2017winxpansi/updatesigntool.vcxproj Sat May 4 00:06:21 2024 (r20701) @@ -630,6 +630,7 @@ <ClInclude Include="..\..\common\Dither.h" /> <ClInclude Include="..\..\common\FileReader.h" /> <ClInclude Include="..\..\common\FileReaderFwd.h" /> + <ClInclude Include="..\..\common\GzipWriter.h" /> <ClInclude Include="..\..\common\Logging.h" /> <ClInclude Include="..\..\common\Profiler.h" /> <ClInclude Include="..\..\common\misc_util.h" /> Modified: trunk/OpenMPT/build/vs2017winxpansi/updatesigntool.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2017winxpansi/updatesigntool.vcxproj.filters Fri May 3 23:25:33 2024 (r20700) +++ trunk/OpenMPT/build/vs2017winxpansi/updatesigntool.vcxproj.filters Sat May 4 00:06:21 2024 (r20701) @@ -195,6 +195,9 @@ <ClInclude Include="..\..\common\FileReaderFwd.h"> <Filter>common</Filter> </ClInclude> + <ClInclude Include="..\..\common\GzipWriter.h"> + <Filter>common</Filter> + </ClInclude> <ClInclude Include="..\..\common\Logging.h"> <Filter>common</Filter> </ClInclude> Modified: trunk/OpenMPT/build/vs2019win10/OpenMPT-ANSI.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2019win10/OpenMPT-ANSI.vcxproj Fri May 3 23:25:33 2024 (r20700) +++ trunk/OpenMPT/build/vs2019win10/OpenMPT-ANSI.vcxproj Sat May 4 00:06:21 2024 (r20701) @@ -1527,6 +1527,7 @@ <ClInclude Include="..\..\common\Dither.h" /> <ClInclude Include="..\..\common\FileReader.h" /> <ClInclude Include="..\..\common\FileReaderFwd.h" /> + <ClInclude Include="..\..\common\GzipWriter.h" /> <ClInclude Include="..\..\common\Logging.h" /> <ClInclude Include="..\..\common\Profiler.h" /> <ClInclude Include="..\..\common\misc_util.h" /> @@ -1962,6 +1963,7 @@ <ClInclude Include="..\..\src\openmpt\sounddevice\SoundDeviceRtAudio.hpp" /> <ClInclude Include="..\..\src\openmpt\sounddevice\SoundDeviceUtilities.hpp" /> <ClInclude Include="..\..\src\openmpt\sounddevice\SoundDeviceWaveout.hpp" /> + <ClInclude Include="..\..\test\PlaybackTest.h" /> <ClInclude Include="..\..\test\TestTools.h" /> <ClInclude Include="..\..\test\TestToolsLib.h" /> <ClInclude Include="..\..\test\TestToolsTracker.h" /> @@ -2236,6 +2238,7 @@ <ClCompile Include="..\..\src\openmpt\sounddevice\SoundDeviceRtAudio.cpp" /> <ClCompile Include="..\..\src\openmpt\sounddevice\SoundDeviceUtilities.cpp" /> <ClCompile Include="..\..\src\openmpt\sounddevice\SoundDeviceWaveout.cpp" /> + <ClCompile Include="..\..\test\PlaybackTest.cpp" /> <ClCompile Include="..\..\test\TestToolsLib.cpp" /> <ClCompile Include="..\..\test\libopenmpt_test.cpp" /> <ClCompile Include="..\..\test\mpt_tests_base.cpp" /> Modified: trunk/OpenMPT/build/vs2019win10/OpenMPT-ANSI.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2019win10/OpenMPT-ANSI.vcxproj.filters Fri May 3 23:25:33 2024 (r20700) +++ trunk/OpenMPT/build/vs2019win10/OpenMPT-ANSI.vcxproj.filters Sat May 4 00:06:21 2024 (r20701) @@ -249,6 +249,9 @@ <ClInclude Include="..\..\common\FileReaderFwd.h"> <Filter>common</Filter> </ClInclude> + <ClInclude Include="..\..\common\GzipWriter.h"> + <Filter>common</Filter> + </ClInclude> <ClInclude Include="..\..\common\Logging.h"> <Filter>common</Filter> </ClInclude> @@ -1554,6 +1557,9 @@ <ClInclude Include="..\..\src\openmpt\sounddevice\SoundDeviceWaveout.hpp"> <Filter>src\openmpt\sounddevice</Filter> </ClInclude> + <ClInclude Include="..\..\test\PlaybackTest.h"> + <Filter>test</Filter> + </ClInclude> <ClInclude Include="..\..\test\TestTools.h"> <Filter>test</Filter> </ClInclude> @@ -2372,6 +2378,9 @@ <ClCompile Include="..\..\src\openmpt\sounddevice\SoundDeviceWaveout.cpp"> <Filter>src\openmpt\sounddevice</Filter> </ClCompile> + <ClCompile Include="..\..\test\PlaybackTest.cpp"> + <Filter>test</Filter> + </ClCompile> <ClCompile Include="..\..\test\TestToolsLib.cpp"> <Filter>test</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2019win10/OpenMPT-NativeSupport.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2019win10/OpenMPT-NativeSupport.vcxproj Fri May 3 23:25:33 2024 (r20700) +++ trunk/OpenMPT/build/vs2019win10/OpenMPT-NativeSupport.vcxproj Sat May 4 00:06:21 2024 (r20701) @@ -1263,6 +1263,7 @@ <ClInclude Include="..\..\common\Dither.h" /> <ClInclude Include="..\..\common\FileReader.h" /> <ClInclude Include="..\..\common\FileReaderFwd.h" /> + <ClInclude Include="..\..\common\GzipWriter.h" /> <ClInclude Include="..\..\common\Logging.h" /> <ClInclude Include="..\..\common\Profiler.h" /> <ClInclude Include="..\..\common\misc_util.h" /> Modified: trunk/OpenMPT/build/vs2019win10/OpenMPT-NativeSupport.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2019win10/OpenMPT-NativeSupport.vcxproj.filters Fri May 3 23:25:33 2024 (r20700) +++ trunk/OpenMPT/build/vs2019win10/OpenMPT-NativeSupport.vcxproj.filters Sat May 4 00:06:21 2024 (r20701) @@ -210,6 +210,9 @@ <ClInclude Include="..\..\common\FileReaderFwd.h"> <Filter>common</Filter> </ClInclude> + <ClInclude Include="..\..\common\GzipWriter.h"> + <Filter>common</Filter> + </ClInclude> <ClInclude Include="..\..\common\Logging.h"> <Filter>common</Filter> </ClInclude> Modified: trunk/OpenMPT/build/vs2019win10/OpenMPT-UTF8.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2019win10/OpenMPT-UTF8.vcxproj Fri May 3 23:25:33 2024 (r20700) +++ trunk/OpenMPT/build/vs2019win10/OpenMPT-UTF8.vcxproj Sat May 4 00:06:21 2024 (r20701) @@ -1527,6 +1527,7 @@ <ClInclude Include="..\..\common\Dither.h" /> <ClInclude Include="..\..\common\FileReader.h" /> <ClInclude Include="..\..\common\FileReaderFwd.h" /> + <ClInclude Include="..\..\common\GzipWriter.h" /> <ClInclude Include="..\..\common\Logging.h" /> <ClInclude Include="..\..\common\Profiler.h" /> <ClInclude Include="..\..\common\misc_util.h" /> @@ -1962,6 +1963,7 @@ <ClInclude Include="..\..\src\openmpt\sounddevice\SoundDeviceRtAudio.hpp" /> <ClInclude Include="..\..\src\openmpt\sounddevice\SoundDeviceUtilities.hpp" /> <ClInclude Include="..\..\src\openmpt\sounddevice\SoundDeviceWaveout.hpp" /> + <ClInclude Include="..\..\test\PlaybackTest.h" /> <ClInclude Include="..\..\test\TestTools.h" /> <ClInclude Include="..\..\test\TestToolsLib.h" /> <ClInclude Include="..\..\test\TestToolsTracker.h" /> @@ -2236,6 +2238,7 @@ <ClCompile Include="..\..\src\openmpt\sounddevice\SoundDeviceRtAudio.cpp" /> <ClCompile Include="..\..\src\openmpt\sounddevice\SoundDeviceUtilities.cpp" /> <ClCompile Include="..\..\src\openmpt\sounddevice\SoundDeviceWaveout.cpp" /> + <ClCompile Include="..\..\test\PlaybackTest.cpp" /> <ClCompile Include="..\..\test\TestToolsLib.cpp" /> <ClCompile Include="..\..\test\libopenmpt_test.cpp" /> <ClCompile Include="..\..\test\mpt_tests_base.cpp" /> Modified: trunk/OpenMPT/build/vs2019win10/OpenMPT-UTF8.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2019win10/OpenMPT-UTF8.vcxproj.filters Fri May 3 23:25:33 2024 (r20700) +++ trunk/OpenMPT/build/vs2019win10/OpenMPT-UTF8.vcxproj.filters Sat May 4 00:06:21 2024 (r20701) @@ -249,6 +249,9 @@ <ClInclude Include="..\..\common\FileReaderFwd.h"> <Filter>common</Filter> </ClInclude> + <ClInclude Include="..\..\common\GzipWriter.h"> + <Filter>common</Filter> + </ClInclude> <ClInclude Include="..\..\common\Logging.h"> <Filter>common</Filter> </ClInclude> @@ -1554,6 +1557,9 @@ <ClInclude Include="..\..\src\openmpt\sounddevice\SoundDeviceWaveout.hpp"> <Filter>src\openmpt\sounddevice</Filter> </ClInclude> + <ClInclude Include="..\..\test\PlaybackTest.h"> + <Filter>test</Filter> + </ClInclude> <ClInclude Include="..\..\test\TestTools.h"> <Filter>test</Filter> </ClInclude> @@ -2372,6 +2378,9 @@ <ClCompile Include="..\..\src\openmpt\sounddevice\SoundDeviceWaveout.cpp"> <Filter>src\openmpt\sounddevice</Filter> </ClCompile> + <ClCompile Include="..\..\test\PlaybackTest.cpp"> + <Filter>test</Filter> + </ClCompile> <ClCompile Include="..\..\test\TestToolsLib.cpp"> <Filter>test</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2019win10/OpenMPT.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2019win10/OpenMPT.vcxproj Fri May 3 23:25:33 2024 (r20700) +++ trunk/OpenMPT/build/vs2019win10/OpenMPT.vcxproj Sat May 4 00:06:21 2024 (r20701) @@ -1527,6 +1527,7 @@ <ClInclude Include="..\..\common\Dither.h" /> <ClInclude Include="..\..\common\FileReader.h" /> <ClInclude Include="..\..\common\FileReaderFwd.h" /> + <ClInclude Include="..\..\common\GzipWriter.h" /> <ClInclude Include="..\..\common\Logging.h" /> <ClInclude Include="..\..\common\Profiler.h" /> <ClInclude Include="..\..\common\misc_util.h" /> @@ -1962,6 +1963,7 @@ <ClInclude Include="..\..\src\openmpt\sounddevice\SoundDeviceRtAudio.hpp" /> <ClInclude Include="..\..\src\openmpt\sounddevice\SoundDeviceUtilities.hpp" /> <ClInclude Include="..\..\src\openmpt\sounddevice\SoundDeviceWaveout.hpp" /> + <ClInclude Include="..\..\test\PlaybackTest.h" /> <ClInclude Include="..\..\test\TestTools.h" /> <ClInclude Include="..\..\test\TestToolsLib.h" /> <ClInclude Include="..\..\test\TestToolsTracker.h" /> @@ -2236,6 +2238,7 @@ <ClCompile Include="..\..\src\openmpt\sounddevice\SoundDeviceRtAudio.cpp" /> <ClCompile Include="..\..\src\openmpt\sounddevice\SoundDeviceUtilities.cpp" /> <ClCompile Include="..\..\src\openmpt\sounddevice\SoundDeviceWaveout.cpp" /> + <ClCompile Include="..\..\test\PlaybackTest.cpp" /> <ClCompile Include="..\..\test\TestToolsLib.cpp" /> <ClCompile Include="..\..\test\libopenmpt_test.cpp" /> <ClCompile Include="..\..\test\mpt_tests_base.cpp" /> Modified: trunk/OpenMPT/build/vs2019win10/OpenMPT.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2019win10/OpenMPT.vcxproj.filters Fri May 3 23:25:33 2024 (r20700) +++ trunk/OpenMPT/build/vs2019win10/OpenMPT.vcxproj.filters Sat May 4 00:06:21 2024 (r20701) @@ -249,6 +249,9 @@ <ClInclude Include="..\..\common\FileReaderFwd.h"> <Filter>common</Filter> </ClInclude> + <ClInclude Include="..\..\common\GzipWriter.h"> + <Filter>common</Filter> + </ClInclude> <ClInclude Include="..\..\common\Logging.h"> <Filter>common</Filter> </ClInclude> @@ -1554,6 +1557,9 @@ <ClInclude Include="..\..\src\openmpt\sounddevice\SoundDeviceWaveout.hpp"> <Filter>src\openmpt\sounddevice</Filter> </ClInclude> + <ClInclude Include="..\..\test\PlaybackTest.h"> + <Filter>test</Filter> + </ClInclude> <ClInclude Include="..\..\test\TestTools.h"> <Filter>test</Filter> </ClInclude> @@ -2372,6 +2378,9 @@ <ClCompile Include="..\..\src\openmpt\sounddevice\SoundDeviceWaveout.cpp"> <Filter>src\openmpt\sounddevice</Filter> </ClCompile> + <ClCompile Include="..\..\test\PlaybackTest.cpp"> + <Filter>test</Filter> + </ClCompile> <ClCompile Include="..\..\test\TestToolsLib.cpp"> <Filter>test</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2019win10/libopenmpt-small.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2019win10/libopenmpt-small.vcxproj Fri May 3 23:25:33 2024 (r20700) +++ trunk/OpenMPT/build/vs2019win10/libopenmpt-small.vcxproj Sat May 4 00:06:21 2024 (r20701) @@ -1275,6 +1275,7 @@ <ClInclude Include="..\..\common\Dither.h" /> <ClInclude Include="..\..\common\FileReader.h" /> <ClInclude Include="..\..\common\FileReaderFwd.h" /> + <ClInclude Include="..\..\common\GzipWriter.h" /> <ClInclude Include="..\..\common\Logging.h" /> <ClInclude Include="..\..\common\Profiler.h" /> <ClInclude Include="..\..\common\misc_util.h" /> Modified: trunk/OpenMPT/build/vs2019win10/libopenmpt-small.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2019win10/libopenmpt-small.vcxproj.filters Fri May 3 23:25:33 2024 (r20700) +++ trunk/OpenMPT/build/vs2019win10/libopenmpt-small.vcxproj.filters Sat May 4 00:06:21 2024 (r20701) @@ -177,6 +177,9 @@ <ClInclude Include="..\..\common\FileReaderFwd.h"> <Filter>common</Filter> </ClInclude> + <ClInclude Include="..\..\common\GzipWriter.h"> + <Filter>common</Filter> + </ClInclude> <ClInclude Include="..\..\common\Logging.h"> <Filter>common</Filter> </ClInclude> Modified: trunk/OpenMPT/build/vs2019win10/libopenmpt.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2019win10/libopenmpt.vcxproj Fri May 3 23:25:33 2024 (r20700) +++ trunk/OpenMPT/build/vs2019win10/libopenmpt.vcxproj Sat May 4 00:06:21 2024 (r20701) @@ -1275,6 +1275,7 @@ <ClInclude Include="..\..\common\Dither.h" /> <ClInclude Include="..\..\common\FileReader.h" /> <ClInclude Include="..\..\common\FileReaderFwd.h" /> + <ClInclude Include="..\..\common\GzipWriter.h" /> <ClInclude Include="..\..\common\Logging.h" /> <ClInclude Include="..\..\common\Profiler.h" /> <ClInclude Include="..\..\common\misc_util.h" /> Modified: trunk/OpenMPT/build/vs2019win10/libopenmpt.vcxproj.filters =================================... [truncated message content] |
|
From: <sv...@op...> - 2024-05-03 21:25:41
|
Author: sagamusix Date: Fri May 3 23:25:33 2024 New Revision: 20700 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20700 Log: [Ref] Various small cleanups. Modified: trunk/OpenMPT/mptrack/OPLExport.cpp trunk/OpenMPT/soundlib/ModChannel.cpp trunk/OpenMPT/soundlib/ModChannel.h trunk/OpenMPT/soundlib/OPL.cpp trunk/OpenMPT/soundlib/OPL.h trunk/OpenMPT/soundlib/Sndmix.cpp Modified: trunk/OpenMPT/mptrack/OPLExport.cpp ============================================================================== --- trunk/OpenMPT/mptrack/OPLExport.cpp Fri May 3 20:05:44 2024 (r20699) +++ trunk/OpenMPT/mptrack/OPLExport.cpp Fri May 3 23:25:33 2024 (r20700) @@ -336,7 +336,7 @@ mpt::IO::Write(f, s16le); } - void Port(CHANNELINDEX, uint16 reg, uint8 value) override + void Port(CHANNELINDEX, OPL::Register reg, OPL::Value value) override { if(const auto prevValue = m_prevRegisters.find(reg); prevValue != m_prevRegisters.end() && prevValue->second == value) return; @@ -345,7 +345,7 @@ } std::vector<RegisterDump> m_registerDump; - std::map<uint16, uint8> m_prevRegisters, m_registerDumpAtLoopStart; + std::map<OPL::Register, OPL::Value> m_prevRegisters, m_registerDumpAtLoopStart; CSoundFile &m_sndFile; }; Modified: trunk/OpenMPT/soundlib/ModChannel.cpp ============================================================================== --- trunk/OpenMPT/soundlib/ModChannel.cpp Fri May 3 20:05:44 2024 (r20699) +++ trunk/OpenMPT/soundlib/ModChannel.cpp Fri May 3 23:25:33 2024 (r20700) @@ -1,7 +1,8 @@ /* * ModChannel.cpp * -------------- - * Purpose: Module Channel header class and helpers + * Purpose: The ModChannel struct represents the state of one mixer channel. + * ModChannelSettings represents the default settings of one pattern channel. * Notes : (currently none) * Authors: OpenMPT Devs * The OpenMPT source code is released under the BSD license. Read LICENSE for more details. @@ -9,8 +10,8 @@ #include "stdafx.h" -#include "Sndfile.h" #include "ModChannel.h" +#include "Sndfile.h" #include "tuning.h" OPENMPT_NAMESPACE_BEGIN @@ -128,7 +129,13 @@ } -ModCommand::NOTE ModChannel::GetPluginNote(bool ignoreArpeggio) const +uint32 ModChannel::GetVSTVolume() const noexcept +{ + return pModInstrument ? pModInstrument->nGlobalVol * 4 : nVolume; +} + + +ModCommand::NOTE ModChannel::GetPluginNote(bool ignoreArpeggio) const noexcept { if(nArpeggioLastNote != NOTE_NONE && !ignoreArpeggio) { @@ -144,6 +151,24 @@ } +bool ModChannel::HasMIDIOutput() const noexcept +{ + return pModInstrument != nullptr && pModInstrument->HasValidMIDIChannel(); +} + + +bool ModChannel::HasCustomTuning() const noexcept +{ + return pModInstrument != nullptr && pModInstrument->pTuning != nullptr; +} + + +bool ModChannel::InSustainLoop() const noexcept +{ + return (dwFlags & (CHN_LOOP | CHN_KEYOFF)) == CHN_LOOP && pModSample->uFlags[CHN_SUSTAINLOOP]; +} + + void ModChannel::SetInstrumentPan(int32 pan, const CSoundFile &sndFile) { // IT compatibility: Instrument and sample panning does not override channel panning Modified: trunk/OpenMPT/soundlib/ModChannel.h ============================================================================== --- trunk/OpenMPT/soundlib/ModChannel.h Fri May 3 20:05:44 2024 (r20699) +++ trunk/OpenMPT/soundlib/ModChannel.h Fri May 3 23:25:33 2024 (r20700) @@ -1,7 +1,8 @@ /* * ModChannel.h * ------------ - * Purpose: Module Channel header class and helpers + * Purpose: The ModChannel struct represents the state of one mixer channel. + * ModChannelSettings represents the default settings of one pattern channel. * Notes : (currently none) * Authors: OpenMPT Devs * The OpenMPT source code is released under the BSD license. Read LICENSE for more details. @@ -13,8 +14,6 @@ #include "openmpt/all/BuildSettings.hpp" #include "InstrumentSynth.h" -#include "ModSample.h" -#include "ModInstrument.h" #include "modcommand.h" #include "Paula.h" #include "tuningbase.h" @@ -22,6 +21,8 @@ OPENMPT_NAMESPACE_BEGIN class CSoundFile; +struct ModSample; +struct ModInstrument; // Mix Channel Struct struct ModChannel @@ -187,17 +188,17 @@ bool IsSamplePlaying() const noexcept { return !increment.IsZero(); } - uint32 GetVSTVolume() const noexcept { return (pModInstrument) ? pModInstrument->nGlobalVol * 4 : nVolume; } + uint32 GetVSTVolume() const noexcept; - ModCommand::NOTE GetPluginNote(bool ignoreArpeggio = false) const; + ModCommand::NOTE GetPluginNote(bool ignoreArpeggio = false) const noexcept; // Check if the channel has a valid MIDI output. A return value of true implies that pModInstrument != nullptr. - bool HasMIDIOutput() const noexcept { return pModInstrument != nullptr && pModInstrument->HasValidMIDIChannel(); } + bool HasMIDIOutput() const noexcept; // Check if the channel uses custom tuning. A return value of true implies that pModInstrument != nullptr. - bool HasCustomTuning() const noexcept { return pModInstrument != nullptr && pModInstrument->pTuning != nullptr; } + bool HasCustomTuning() const noexcept; // Check if currently processed loop is a sustain loop. pModSample is not checked for validity! - bool InSustainLoop() const noexcept { return (dwFlags & (CHN_LOOP | CHN_KEYOFF)) == CHN_LOOP && pModSample->uFlags[CHN_SUSTAINLOOP]; } + bool InSustainLoop() const noexcept; void UpdateInstrumentVolume(const ModSample *smp, const ModInstrument *ins); Modified: trunk/OpenMPT/soundlib/OPL.cpp ============================================================================== --- trunk/OpenMPT/soundlib/OPL.cpp Fri May 3 20:05:44 2024 (r20699) +++ trunk/OpenMPT/soundlib/OPL.cpp Fri May 3 23:25:33 2024 (r20700) @@ -9,8 +9,8 @@ */ #include "stdafx.h" -#include "../common/misc_util.h" #include "OPL.h" +#include "../common/misc_util.h" #include <cstdint> #if MPT_COMPILER_GCC @@ -24,9 +24,9 @@ OPENMPT_NAMESPACE_BEGIN -OPL::OPL(uint32 samplerate) +OPL::OPL(uint32 sampleRate) { - Initialize(samplerate); + Initialize(sampleRate); } @@ -43,12 +43,12 @@ } -void OPL::Initialize(uint32 samplerate) +void OPL::Initialize(uint32 sampleRate) { if(m_opl == nullptr) - m_opl = std::make_unique<Opal>(samplerate); + m_opl = std::make_unique<Opal>(sampleRate); else - m_opl->SetSampleRate(samplerate); + m_opl->SetSampleRate(sampleRate); Reset(); } @@ -71,7 +71,7 @@ } -uint16 OPL::ChannelToRegister(uint8 oplCh) +OPL::Register OPL::ChannelToRegister(uint8 oplCh) { if(oplCh < 9) return oplCh; @@ -81,7 +81,7 @@ // Translate a channel's first operator address into a register -uint16 OPL::OperatorToRegister(uint8 oplCh) +OPL::Register OPL::OperatorToRegister(uint8 oplCh) { static constexpr uint8 OPLChannelToOperator[] = { 0, 1, 2, 8, 9, 10, 16, 17, 18 }; if(oplCh < 9) @@ -211,7 +211,7 @@ fnum |= (block << 10); - uint16 channel = ChannelToRegister(oplCh); + OPL::Register channel = ChannelToRegister(oplCh); m_KeyOnBlock[oplCh] = static_cast<uint8>((keyOff ? 0 : KEYON_BIT) | (fnum >> 8)); // Key on bit + Octave (block) + F-number high 2 bits Port(c, FNUM_LOW | channel, fnum & 0xFFu); // F-Number low 8 bits Port(c, KEYON_BLOCK | channel, m_KeyOnBlock[oplCh]); @@ -237,7 +237,7 @@ return; const auto &patch = m_Patches[oplCh]; - const uint16 modulator = OperatorToRegister(oplCh), carrier = modulator + 3; + const OPL::Register modulator = OperatorToRegister(oplCh), carrier = modulator + 3; if((patch[10] & CONNECTION_BIT) || applyToModulator) { // Set volume of both operators in additive mode @@ -279,7 +279,7 @@ m_Patches[oplCh] = patch; - const uint16 modulator = OperatorToRegister(oplCh), carrier = modulator + 3; + const OPL::Register modulator = OperatorToRegister(oplCh), carrier = modulator + 3; for(uint8 op = 0; op < 2; op++) { const auto opReg = op ? carrier : modulator; @@ -314,7 +314,7 @@ } -void OPL::Port(CHANNELINDEX c, uint16 reg, uint8 value) +void OPL::Port(CHANNELINDEX c, OPL::Register reg, OPL::Value value) { if(!m_logger) m_opl->Port(reg, value); @@ -323,11 +323,11 @@ } -std::vector<uint16> OPL::AllVoiceRegisters() +std::vector<OPL::Register> OPL::AllVoiceRegisters() { - static constexpr uint8 opRegisters[] = {OPL::AM_VIB, OPL::KSL_LEVEL, OPL::ATTACK_DECAY, OPL::SUSTAIN_RELEASE, OPL::WAVE_SELECT}; - static constexpr uint8 chnRegisters[] = {OPL::FNUM_LOW, OPL::KEYON_BLOCK, OPL::FEEDBACK_CONNECTION}; - std::vector<uint16> result; + static constexpr uint8 opRegisters[] = {AM_VIB, KSL_LEVEL, ATTACK_DECAY, SUSTAIN_RELEASE, WAVE_SELECT}; + static constexpr uint8 chnRegisters[] = {FNUM_LOW, KEYON_BLOCK, FEEDBACK_CONNECTION}; + std::vector<OPL::Register> result; result.reserve(234); for(uint16 chip = 0; chip < 2; chip++) { Modified: trunk/OpenMPT/soundlib/OPL.h ============================================================================== --- trunk/OpenMPT/soundlib/OPL.h Fri May 3 20:05:44 2024 (r20699) +++ trunk/OpenMPT/soundlib/OPL.h Fri May 3 23:25:33 2024 (r20700) @@ -23,16 +23,18 @@ enum OPLRegisters : uint8 { // Operators (combine with result of OperatorToRegister) - AM_VIB = 0x20, // AM / VIB / EG / KSR / Multiple (0x20 to 0x35) - KSL_LEVEL = 0x40, // KSL / Total level (0x40 to 0x55) - ATTACK_DECAY = 0x60, // Attack rate / Decay rate (0x60 to 0x75) - SUSTAIN_RELEASE = 0x80, // Sustain level / Release rate (0x80 to 0x95) - WAVE_SELECT = 0xE0, // Wave select (0xE0 to 0xF5) + AM_VIB = 0x20, // AM / VIB / EG / KSR / Multiple (0x20 to 0x35) + KSL_LEVEL = 0x40, // KSL / Total level (0x40 to 0x55) + ATTACK_DECAY = 0x60, // Attack rate / Decay rate (0x60 to 0x75) + SUSTAIN_RELEASE = 0x80, // Sustain level / Release rate (0x80 to 0x95) + WAVE_SELECT = 0xE0, // Wave select (0xE0 to 0xF5) // Channels (combine with result of ChannelToRegister) - FNUM_LOW = 0xA0, // F-number low bits (0xA0 to 0xA8) - KEYON_BLOCK = 0xB0, // F-number high bits / Key on / Block (octave) (0xB0 to 0xB8) - FEEDBACK_CONNECTION = 0xC0, // Feedback / Connection (0xC0 to 0xC8) + FNUM_LOW = 0xA0, // F-number low bits (0xA0 to 0xA8) + KEYON_BLOCK = 0xB0, // F-number high bits / Key on / Block (octave) (0xB0 to 0xB8) + FEEDBACK_CONNECTION = 0xC0, // Feedback / Connection (0xC0 to 0xC8) + + TREMOLO_VIBRATO_DEPTH = 0xBD, // Tremolo Depth / Vibrato Depth / Percussion Mode / BD/SD/TT/CY/HH Key-On }; enum OPLValues : uint8 @@ -41,12 +43,12 @@ TREMOLO_ON = 0x80, VIBRATO_ON = 0x40, SUSTAIN_ON = 0x20, - KSR = 0x10, // Key scaling rate - MULTIPLE_MASK = 0x0F, // Frequency multiplier + KSR = 0x10, // Key scaling rate + MULTIPLE_MASK = 0x0F, // Frequency multiplier // KSL_LEVEL - KSL_MASK = 0xC0, // Envelope scaling bits - TOTAL_LEVEL_MASK = 0x3F, // Strength (volume) of OP + KSL_MASK = 0xC0, // Envelope scaling bits + TOTAL_LEVEL_MASK = 0x3F, // Strength (volume) of OP // ATTACK_DECAY ATTACK_MASK = 0xF0, @@ -60,25 +62,28 @@ KEYON_BIT = 0x20, // FEEDBACK_CONNECTION - FEEDBACK_MASK = 0x0E, // Valid just for first OP of a voice + FEEDBACK_MASK = 0x0E, // Valid just for first OP of a voice CONNECTION_BIT = 0x01, VOICE_TO_LEFT = 0x10, VOICE_TO_RIGHT = 0x20, STEREO_BITS = VOICE_TO_LEFT | VOICE_TO_RIGHT, }; + using Register = uint16; + using Value = uint8; + class IRegisterLogger { public: - virtual void Port(CHANNELINDEX c, uint16 reg, uint8 value) = 0; + virtual void Port(CHANNELINDEX c, Register reg, Value value) = 0; virtual ~IRegisterLogger() {} }; - OPL(uint32 samplerate); - OPL(IRegisterLogger &logger); + explicit OPL(uint32 sampleRate); + explicit OPL(IRegisterLogger &logger); ~OPL(); - void Initialize(uint32 samplerate); + void Initialize(uint32 sampleRate); void Mix(int32 *buffer, size_t count, uint32 volumeFactorQ16); void NoteOff(CHANNELINDEX c); @@ -92,15 +97,15 @@ void Reset(); // A list of all registers for channels and operators - static std::vector<uint16> AllVoiceRegisters(); + static std::vector<Register> AllVoiceRegisters(); protected: - static uint16 ChannelToRegister(uint8 oplCh); - static uint16 OperatorToRegister(uint8 oplCh); + static Register ChannelToRegister(uint8 oplCh); + static Register OperatorToRegister(uint8 oplCh); static uint8 CalcVolume(uint8 trackerVol, uint8 kslVolume); uint8 GetVoice(CHANNELINDEX c) const; uint8 AllocateVoice(CHANNELINDEX c); - void Port(CHANNELINDEX c, uint16 reg, uint8 value); + void Port(CHANNELINDEX c, Register reg, Value value); enum { Modified: trunk/OpenMPT/soundlib/Sndmix.cpp ============================================================================== --- trunk/OpenMPT/soundlib/Sndmix.cpp Fri May 3 20:05:44 2024 (r20699) +++ trunk/OpenMPT/soundlib/Sndmix.cpp Fri May 3 23:25:33 2024 (r20700) @@ -1156,7 +1156,6 @@ pan += (envval * (pan)) / 32; } chn.nRealPan = Clamp(pan, 0, 256); - } } @@ -1374,7 +1373,8 @@ if (fadeout) { chn.nFadeOutVol -= fadeout * 2; - if (chn.nFadeOutVol <= 0) chn.nFadeOutVol = 0; + if (chn.nFadeOutVol <= 0) + chn.nFadeOutVol = 0; vol = (vol * chn.nFadeOutVol) / 65536; } else if (!chn.nFadeOutVol) { |
|
From: <sv...@op...> - 2024-05-03 18:05:55
|
Author: sagamusix Date: Fri May 3 20:05:44 2024 New Revision: 20699 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20699 Log: Merged revision(s) 20695-20696 from trunk/OpenMPT: [Imp] Enable host-specific performance optimizations in afl++. ........ [Var] Update fuzzer dictionary. ........ Modified: branches/OpenMPT-1.31/ (props changed) branches/OpenMPT-1.31/contrib/fuzzing/all_formats.dict branches/OpenMPT-1.31/contrib/fuzzing/get-afl.sh Modified: branches/OpenMPT-1.31/contrib/fuzzing/all_formats.dict ============================================================================== --- branches/OpenMPT-1.31/contrib/fuzzing/all_formats.dict Fri May 3 20:05:16 2024 (r20698) +++ branches/OpenMPT-1.31/contrib/fuzzing/all_formats.dict Fri May 3 20:05:44 2024 (r20699) @@ -8,7 +8,7 @@ amf="DMF\x0E" ams="Extreme" -ams="AMShdr\x1A\x02\x02" +ams="AMShdr\x1A\x00\x02\x02" #dbm="DBM0" dbm="NAME" @@ -54,7 +54,7 @@ fmt="FMTracker\x01\x01" gdm="GDM\xFE" -gdm="GMFS" +gdm="\x0D\x0A\x1AGMFS\x01\x00" gtk="GTK\x04" @@ -227,7 +227,7 @@ psm16="PPAT" ptm="PTMF" -ptm="\x1A\x03\x02" +ptm="\x1A\x03\x02\x00" s3m="SCRM" #s3m="SCRS" Modified: branches/OpenMPT-1.31/contrib/fuzzing/get-afl.sh ============================================================================== --- branches/OpenMPT-1.31/contrib/fuzzing/get-afl.sh Fri May 3 20:05:16 2024 (r20698) +++ branches/OpenMPT-1.31/contrib/fuzzing/get-afl.sh Fri May 3 20:05:44 2024 (r20699) @@ -12,7 +12,7 @@ tar -xzvf $AFL_FILENAME rm $AFL_FILENAME cd AFLplusplus-* -make source-only || exit +make PERFORMANCE=1 source-only || exit cd .. rm -rf afl mv AFLplusplus-* afl \ No newline at end of file |
|
From: <sv...@op...> - 2024-05-03 18:05:23
|
Author: sagamusix Date: Fri May 3 20:05:16 2024 New Revision: 20698 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20698 Log: Merged revision(s) 20697 from trunk/OpenMPT: [Fix] xmp-openmpt: For infinite subsong length, don't display a bogus -12:-55 time. ........ Modified: branches/OpenMPT-1.31/ (props changed) branches/OpenMPT-1.31/libopenmpt/xmp-openmpt/xmp-openmpt.cpp Modified: branches/OpenMPT-1.31/libopenmpt/xmp-openmpt/xmp-openmpt.cpp ============================================================================== --- branches/OpenMPT-1.31/libopenmpt/xmp-openmpt/xmp-openmpt.cpp Fri May 3 20:04:50 2024 (r20697) +++ branches/OpenMPT-1.31/libopenmpt/xmp-openmpt/xmp-openmpt.cpp Fri May 3 20:05:16 2024 (r20698) @@ -20,6 +20,7 @@ #include <cctype> #include <cstring> +#include <numeric> #include <tchar.h> @@ -244,6 +245,9 @@ } static std::string seconds_to_string( double time ) { + if ( !std::isnormal( time ) ) { + return "?"; + } std::int64_t time_ms = static_cast<std::int64_t>( time * 1000 ); std::int64_t seconds = ( time_ms / 1000 ) % 60; std::int64_t minutes = ( time_ms / ( 1000 * 60 ) ) % 60; @@ -1250,11 +1254,7 @@ } static DWORD WINAPI openmpt_GetSubSongs( float * length ) { - double tmp = 0.0; - for ( auto sub_length : self->subsong_lengths ) { - tmp += sub_length; - } - *length = static_cast<float>( tmp ); + *length = static_cast<float>( std::accumulate( self->subsong_lengths.cbegin(), self->subsong_lengths.cend(), 0.0 ) ); return static_cast<DWORD>( self->subsong_lengths.size() ); } |
|
From: <sv...@op...> - 2024-05-03 18:05:03
|
Author: sagamusix Date: Fri May 3 20:04:50 2024 New Revision: 20697 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20697 Log: [Fix] xmp-openmpt: For infinite subsong length, don't display a bogus -12:-55 time. Modified: trunk/OpenMPT/libopenmpt/xmp-openmpt/xmp-openmpt.cpp Modified: trunk/OpenMPT/libopenmpt/xmp-openmpt/xmp-openmpt.cpp ============================================================================== --- trunk/OpenMPT/libopenmpt/xmp-openmpt/xmp-openmpt.cpp Thu May 2 20:04:54 2024 (r20696) +++ trunk/OpenMPT/libopenmpt/xmp-openmpt/xmp-openmpt.cpp Fri May 3 20:04:50 2024 (r20697) @@ -20,6 +20,7 @@ #include <cctype> #include <cstring> +#include <numeric> #include <tchar.h> @@ -234,6 +235,9 @@ } static std::string seconds_to_string( double time ) { + if ( !std::isnormal( time ) ) { + return "?"; + } std::int64_t time_ms = static_cast<std::int64_t>( time * 1000 ); std::int64_t seconds = ( time_ms / 1000 ) % 60; std::int64_t minutes = ( time_ms / ( 1000 * 60 ) ) % 60; @@ -1278,11 +1282,7 @@ } static DWORD WINAPI openmpt_GetSubSongs( float * length ) { - double tmp = 0.0; - for ( auto sub_length : self->subsong_lengths ) { - tmp += sub_length; - } - *length = static_cast<float>( tmp ); + *length = static_cast<float>( std::accumulate( self->subsong_lengths.cbegin(), self->subsong_lengths.cend(), 0.0 ) ); return static_cast<DWORD>( self->subsong_lengths.size() ); } |
|
From: <sv...@op...> - 2024-05-02 18:05:06
|
Author: sagamusix Date: Thu May 2 20:04:54 2024 New Revision: 20696 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20696 Log: [Var] Update fuzzer dictionary. Modified: trunk/OpenMPT/contrib/fuzzing/all_formats.dict Modified: trunk/OpenMPT/contrib/fuzzing/all_formats.dict ============================================================================== --- trunk/OpenMPT/contrib/fuzzing/all_formats.dict Thu May 2 19:44:02 2024 (r20695) +++ trunk/OpenMPT/contrib/fuzzing/all_formats.dict Thu May 2 20:04:54 2024 (r20696) @@ -8,7 +8,7 @@ amf="DMF\x0E" ams="Extreme" -ams="AMShdr\x1A\x02\x02" +ams="AMShdr\x1A\x00\x02\x02" #dbm="DBM0" dbm="NAME" @@ -54,7 +54,7 @@ fmt="FMTracker\x01\x01" gdm="GDM\xFE" -gdm="GMFS" +gdm="\x0D\x0A\x1AGMFS\x01\x00" gtk="GTK\x04" @@ -229,7 +229,7 @@ psm16="PPAT" ptm="PTMF" -ptm="\x1A\x03\x02" +ptm="\x1A\x03\x02\x00" s3m="SCRM" #s3m="SCRS" |
|
From: <sv...@op...> - 2024-05-02 17:44:10
|
Author: sagamusix Date: Thu May 2 19:44:02 2024 New Revision: 20695 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20695 Log: [Imp] Enable host-specific performance optimizations in afl++. Modified: trunk/OpenMPT/contrib/fuzzing/get-afl.sh Modified: trunk/OpenMPT/contrib/fuzzing/get-afl.sh ============================================================================== --- trunk/OpenMPT/contrib/fuzzing/get-afl.sh Thu May 2 15:09:43 2024 (r20694) +++ trunk/OpenMPT/contrib/fuzzing/get-afl.sh Thu May 2 19:44:02 2024 (r20695) @@ -12,7 +12,7 @@ tar -xzvf $AFL_FILENAME rm $AFL_FILENAME cd AFLplusplus-* -make source-only || exit +make PERFORMANCE=1 source-only || exit cd .. rm -rf afl mv AFLplusplus-* afl \ No newline at end of file |
|
From: <sv...@op...> - 2024-05-02 13:09:56
|
Author: sagamusix Date: Thu May 2 15:09:43 2024 New Revision: 20694 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20694 Log: [Var] Fix typo in deterministic_random_device. Modified: trunk/OpenMPT/common/mptRandom.h trunk/OpenMPT/src/mpt/random/device.hpp Modified: trunk/OpenMPT/common/mptRandom.h ============================================================================== --- trunk/OpenMPT/common/mptRandom.h Wed May 1 15:52:51 2024 (r20693) +++ trunk/OpenMPT/common/mptRandom.h Thu May 2 15:09:43 2024 (r20694) @@ -95,7 +95,7 @@ #ifdef MPT_BUILD_FUZZER // Use deterministic seeding -using random_device = deterministc_random_device; +using random_device = deterministic_random_device; #else // !MPT_BUILD_FUZZER Modified: trunk/OpenMPT/src/mpt/random/device.hpp ============================================================================== --- trunk/OpenMPT/src/mpt/random/device.hpp Wed May 1 15:52:51 2024 (r20693) +++ trunk/OpenMPT/src/mpt/random/device.hpp Thu May 2 15:09:43 2024 (r20694) @@ -308,7 +308,7 @@ }; -using deterministc_random_device = mpt::prng_random_device<mpt::lcg_musl, mpt::prng_random_device_deterministic_seeder>; +using deterministic_random_device = mpt::prng_random_device<mpt::lcg_musl, mpt::prng_random_device_deterministic_seeder>; } // namespace MPT_INLINE_NS |
|
From: <sv...@op...> - 2024-05-01 13:53:04
|
Author: sagamusix Date: Wed May 1 15:52:51 2024 New Revision: 20693 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20693 Log: [Imp] XM: Reject files with impossible pattern header. [Imp] XM: Speed up decoding early if pattern data cannot be read, ignore patterns > MAX_PATTERNS for decoding. Modified: trunk/OpenMPT/soundlib/Load_xm.cpp Modified: trunk/OpenMPT/soundlib/Load_xm.cpp ============================================================================== --- trunk/OpenMPT/soundlib/Load_xm.cpp Tue Apr 30 18:55:49 2024 (r20692) +++ trunk/OpenMPT/soundlib/Load_xm.cpp Wed May 1 15:52:51 2024 (r20693) @@ -244,18 +244,16 @@ for(PATTERNINDEX pat = 0; pat < fileHeader.patterns; pat++) { FileReader::pos_type curPos = file.GetPosition(); - uint32 headerSize = file.ReadUint32LE(); - file.Skip(1); // Pack method (= 0) - - ROWINDEX numRows = 64; + const uint32 headerSize = file.ReadUint32LE(); + if(headerSize < 8 || !file.CanRead(headerSize - 4)) + break; + file.Skip(1); // Pack method (= 0) + ROWINDEX numRows; if(fileHeader.version == 0x0102) - { numRows = file.ReadUint8() + 1; - } else - { + else numRows = file.ReadUint16LE(); - } // A packed size of 0 indicates a completely empty pattern. const uint16 packedSize = file.ReadUint16LE(); @@ -268,10 +266,8 @@ file.Seek(curPos + headerSize); FileReader patternChunk = file.ReadChunk(packedSize); - if(!sndFile.Patterns.Insert(pat, numRows) || packedSize == 0) - { + if(pat >= MAX_PATTERNS || !sndFile.Patterns.Insert(pat, numRows) || packedSize == 0) continue; - } enum PatternFlags { @@ -287,6 +283,9 @@ for(auto &m : sndFile.Patterns[pat]) { + if(!file.CanRead(1)) + break; + uint8 info = patternChunk.ReadUint8(); uint8 vol = 0, command = 0; @@ -1223,7 +1222,7 @@ if(!p->IsEmpty()) emptyPattern = false; - // Apparently, completely empty patterns are loaded as empty 64-row patterns in FT2, regardless of their original size. + // Completely empty patterns are loaded as empty 64-row patterns in FT2, regardless of their original size. // We have to avoid this, so we add a "break to row 0" command in the last row. if(j == 1 && emptyPattern && numRows != 64) { |
|
From: <sv...@op...> - 2024-04-30 16:56:07
|
Author: sagamusix Date: Tue Apr 30 18:55:49 2024 New Revision: 20692 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20692 Log: Merged revision(s) 20690 from trunk/OpenMPT: [Imp] In r15576, resampler table initialization was moved to the time the first module is loaded in libopenmpt. This caused a huge performance loss for fuzzing using afl's persistent mode, so the original behaviour is restored for fuzzer builds now. ........ Modified: branches/OpenMPT-1.30/ (props changed) branches/OpenMPT-1.30/soundlib/Resampler.h Modified: branches/OpenMPT-1.30/soundlib/Resampler.h ============================================================================== --- branches/OpenMPT-1.30/soundlib/Resampler.h Tue Apr 30 18:55:30 2024 (r20691) +++ branches/OpenMPT-1.30/soundlib/Resampler.h Tue Apr 30 18:55:49 2024 (r20692) @@ -33,7 +33,9 @@ // Caching gets triggered via a global object that primes the cache during // construction. // This is only really useful with MPT_RESAMPLER_TABLES_CACHED. -//#define MPT_RESAMPLER_TABLES_CACHED_ONSTARTUP +#ifdef MPT_BUILD_FUZZER +#define MPT_RESAMPLER_TABLES_CACHED_ONSTARTUP +#endif #endif // LIBOPENMPT_BUILD |
|
From: <sv...@op...> - 2024-04-30 16:55:44
|
Author: sagamusix Date: Tue Apr 30 18:55:30 2024 New Revision: 20691 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20691 Log: Merged revision(s) 20690 from trunk/OpenMPT: [Imp] In r15576, resampler table initialization was moved to the time the first module is loaded in libopenmpt. This caused a huge performance loss for fuzzing using afl's persistent mode, so the original behaviour is restored for fuzzer builds now. ........ Modified: branches/OpenMPT-1.31/ (props changed) branches/OpenMPT-1.31/soundlib/Resampler.h Modified: branches/OpenMPT-1.31/soundlib/Resampler.h ============================================================================== --- branches/OpenMPT-1.31/soundlib/Resampler.h Tue Apr 30 18:55:05 2024 (r20690) +++ branches/OpenMPT-1.31/soundlib/Resampler.h Tue Apr 30 18:55:30 2024 (r20691) @@ -33,7 +33,9 @@ // Caching gets triggered via a global object that primes the cache during // construction. // This is only really useful with MPT_RESAMPLER_TABLES_CACHED. -//#define MPT_RESAMPLER_TABLES_CACHED_ONSTARTUP +#ifdef MPT_BUILD_FUZZER +#define MPT_RESAMPLER_TABLES_CACHED_ONSTARTUP +#endif #endif // LIBOPENMPT_BUILD |
|
From: <sv...@op...> - 2024-04-30 16:55:18
|
Author: sagamusix Date: Tue Apr 30 18:55:05 2024 New Revision: 20690 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20690 Log: [Imp] In r15576, resampler table initialization was moved to the time the first module is loaded in libopenmpt. This caused a huge performance loss for fuzzing using afl's persistent mode, so the original behaviour is restored for fuzzer builds now. Modified: trunk/OpenMPT/soundlib/Resampler.h Modified: trunk/OpenMPT/soundlib/Resampler.h ============================================================================== --- trunk/OpenMPT/soundlib/Resampler.h Mon Apr 29 11:37:36 2024 (r20689) +++ trunk/OpenMPT/soundlib/Resampler.h Tue Apr 30 18:55:05 2024 (r20690) @@ -33,7 +33,9 @@ // Caching gets triggered via a global object that primes the cache during // construction. // This is only really useful with MPT_RESAMPLER_TABLES_CACHED. -//#define MPT_RESAMPLER_TABLES_CACHED_ONSTARTUP +#ifdef MPT_BUILD_FUZZER +#define MPT_RESAMPLER_TABLES_CACHED_ONSTARTUP +#endif #endif // LIBOPENMPT_BUILD |
|
From: <sv...@op...> - 2024-04-29 09:37:48
|
Author: manx Date: Mon Apr 29 11:37:36 2024 New Revision: 20689 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20689 Log: Merged revision(s) 20671, 20673, 20679-20681, 20688 from trunk/OpenMPT: [New] build: CI: GitHub: Add Fedora builder. ........ [Fix] build: CI: GitHub: Fedora: Fix xz dependency install. ........ [Fix] build: CI: GitHub: Fedora: Workaround GitHub quirks. See <https://github.com/dorny/test-reporter/issues/131#issuecomment-881945146> and <https://github.com/actions/runner/issues/2033>. ........ [Imp] build: CI: GitHub: Fedora: Add matrix build for dependencies. ........ [New] build: CI: GitHub: Add Fedora Autotools builder. ........ [New] build: CI: GitHub: Add Fedora MinGW cross-compile builder. ........ Added: branches/OpenMPT-1.31/.github/workflows/Fedora-Autotools.yml - copied, changed from r20681, trunk/OpenMPT/.github/workflows/Fedora-Autotools.yml branches/OpenMPT-1.31/.github/workflows/Fedora-Cross-MinGW.yml - copied, changed from r20688, trunk/OpenMPT/.github/workflows/Fedora-Cross-MinGW.yml branches/OpenMPT-1.31/.github/workflows/Fedora-Makefile.yml - copied, changed from r20671, trunk/OpenMPT/.github/workflows/Fedora-Makefile.yml Modified: branches/OpenMPT-1.31/ (props changed) Copied and modified: branches/OpenMPT-1.31/.github/workflows/Fedora-Autotools.yml (from r20681, trunk/OpenMPT/.github/workflows/Fedora-Autotools.yml) ============================================================================== --- trunk/OpenMPT/.github/workflows/Fedora-Autotools.yml Sun Apr 28 20:04:03 2024 (r20681, copy source) +++ branches/OpenMPT-1.31/.github/workflows/Fedora-Autotools.yml Mon Apr 29 11:37:36 2024 (r20689) @@ -2,9 +2,7 @@ on: push: - branches: [ master ] - pull_request: - branches: [ master ] + branches: [ OpenMPT-1.31 ] concurrency: group: ${{ github.ref }}-${{ github.workflow }} Copied and modified: branches/OpenMPT-1.31/.github/workflows/Fedora-Cross-MinGW.yml (from r20688, trunk/OpenMPT/.github/workflows/Fedora-Cross-MinGW.yml) ============================================================================== --- trunk/OpenMPT/.github/workflows/Fedora-Cross-MinGW.yml Mon Apr 29 11:07:54 2024 (r20688, copy source) +++ branches/OpenMPT-1.31/.github/workflows/Fedora-Cross-MinGW.yml Mon Apr 29 11:37:36 2024 (r20689) @@ -2,9 +2,7 @@ on: push: - branches: [ master ] - pull_request: - branches: [ master ] + branches: [ OpenMPT-1.31 ] jobs: build: Copied and modified: branches/OpenMPT-1.31/.github/workflows/Fedora-Makefile.yml (from r20671, trunk/OpenMPT/.github/workflows/Fedora-Makefile.yml) ============================================================================== --- trunk/OpenMPT/.github/workflows/Fedora-Makefile.yml Sun Apr 28 17:36:46 2024 (r20671, copy source) +++ branches/OpenMPT-1.31/.github/workflows/Fedora-Makefile.yml Mon Apr 29 11:37:36 2024 (r20689) @@ -2,26 +2,36 @@ on: push: - branches: [ master ] - pull_request: - branches: [ master ] - -concurrency: - group: ${{ github.ref }}-${{ github.workflow }} - cancel-in-progress: true + branches: [ OpenMPT-1.31 ] jobs: build: + strategy: + fail-fast: false + matrix: + include: + - { deps: sys } + - { deps: local } + - { deps: small } + + concurrency: + group: ${{ github.ref }}-${{ github.workflow }}-${{matrix.deps}} + cancel-in-progress: true + runs-on: ubuntu-latest container: image: fedora:latest steps: - - uses: actions/checkout@v4 - - name: install dependencies - run: dnf -y upgrade --refresh && dnf -y install subversion perl-XML-XPath git mawk zip unzip p7zip xz-utils make binutils gcc gcc-g++ clang pcc pkgconf help2man doxygen autoconf autoconf-archive automake libtool ccache zlib-devel mpg123-devel libogg-devel libvorbis-devel portaudio-devel pulseaudio-libs-devel SDL2-devel flac-devel libsndfile-devel libtool-ltdl-devel - - name: make - run: make -j$(nproc) STRICT=1 - - name: make check - run: make -j$(nproc) STRICT=1 check + - name: Install dependencies + run: dnf -y upgrade --refresh && dnf -y install subversion perl-XML-XPath git mawk zip unzip p7zip xz make binutils gcc gcc-g++ clang pcc pkgconf help2man doxygen autoconf autoconf-archive automake libtool ccache zlib-devel mpg123-devel libogg-devel libvorbis-devel portaudio-devel pulseaudio-libs-devel SDL2-devel flac-devel libsndfile-devel libtool-ltdl-devel + - name: Checkout + uses: actions/checkout@v4 + - name: fix git + # https://github.com/actions/runner/issues/2033 + run: chown -R $(id -u):$(id -g) $(pwd) + - name: Build + run: make -j$(nproc) STRICT=1 VERBOSE=1 ${{ (matrix.deps == 'sys') && 'AUTO_DEPS=1' || (matrix.deps == 'local') && 'LOCAL_ZLIB=1 LOCAL_MPG123=1 LOCAL_OGG=1 LOCAL_VORBIS=1 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_FLAC=1 NO_SNDFILE=1' || 'NO_ZLIB=1 NO_MPG123=1 NO_OGG=1 NO_VORBIS=1 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_FLAC=1 NO_SNDFILE=1' }} + - name: Test + run: make -j$(nproc) STRICT=1 VERBOSE=1 ${{ (matrix.deps == 'sys') && 'AUTO_DEPS=1' || (matrix.deps == 'local') && 'LOCAL_ZLIB=1 LOCAL_MPG123=1 LOCAL_OGG=1 LOCAL_VORBIS=1 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_FLAC=1 NO_SNDFILE=1' || 'NO_ZLIB=1 NO_MPG123=1 NO_OGG=1 NO_VORBIS=1 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_FLAC=1 NO_SNDFILE=1' }} check |
|
From: <sv...@op...> - 2024-04-29 09:08:06
|
Author: manx Date: Mon Apr 29 11:07:54 2024 New Revision: 20688 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20688 Log: [New] build: CI: GitHub: Add Fedora MinGW cross-compile builder. Added: trunk/OpenMPT/.github/workflows/Fedora-Cross-MinGW.yml Added: trunk/OpenMPT/.github/workflows/Fedora-Cross-MinGW.yml ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/OpenMPT/.github/workflows/Fedora-Cross-MinGW.yml Mon Apr 29 11:07:54 2024 (r20688) @@ -0,0 +1,39 @@ +name: Fedora Cross MinGW + +on: + push: + branches: [ master ] + pull_request: + branches: [ master ] + +jobs: + build: + + strategy: + fail-fast: false + matrix: + include: + - { crt: msvcrt, arch: x86 } + - { crt: msvcrt, arch: amd64 } + - { crt: ucrt , arch: amd64 } + + concurrency: + group: ${{ github.ref }}-${{ github.workflow }}-${{matrix.crt}}-${{matrix.arch}} + cancel-in-progress: true + + runs-on: ubuntu-latest + container: + image: fedora:latest + + steps: + - name: Install dependencies + run: dnf -y upgrade --refresh && dnf -y install subversion perl-XML-XPath git mawk zip unzip p7zip xz make binutils gcc gcc-g++ clang pcc pkgconf help2man doxygen autoconf autoconf-archive automake libtool ccache zlib-devel mpg123-devel libogg-devel libvorbis-devel portaudio-devel pulseaudio-libs-devel SDL2-devel flac-devel libsndfile-devel libtool-ltdl-devel + - name: Install mingw + run: dnf -y install mingw32-filesystem mingw64-filesystem ucrt64-filesystem mingw-w64-tools mingw32-binutils mingw64-binutils ucrt64-binutils mingw32-gcc mingw32-gcc-c++ mingw64-gcc mingw64-gcc-c++ ucrt64-gcc ucrt64-gcc-c++ mingw32-windows-default-manifest mingw64-windows-default-manifest + - name: Checkout + uses: actions/checkout@v4 + - name: fix git + # https://github.com/actions/runner/issues/2033 + run: chown -R $(id -u):$(id -g) $(pwd) + - name: Build + run: make -j$(nproc) AUTO_DEPS=1 CONFIG=mingw-w64 WINDOWS_ARCH=${{matrix.arch}} WINDOWS_CRT=${{matrix.crt}} WINDOWS_VERSION=win10 |
|
From: <sv...@op...> - 2024-04-29 09:05:33
|
Author: manx Date: Mon Apr 29 11:05:22 2024 New Revision: 20687 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20687 Log: Merged revision(s) 20684-20686 from trunk/OpenMPT: [New] build: Makefile: MinGW-w64: Add WINDOWS_CRT option with values [crtdll,msvcrt,ucrt]. ........ [Doc] libopenmpt: Update changelog. ........ Modified: branches/OpenMPT-1.31/ (props changed) branches/OpenMPT-1.31/build/make/config-mingw-w64.mk branches/OpenMPT-1.31/doc/libopenmpt/changelog.md Modified: branches/OpenMPT-1.31/build/make/config-mingw-w64.mk ============================================================================== --- branches/OpenMPT-1.31/build/make/config-mingw-w64.mk Mon Apr 29 10:34:31 2024 (r20686) +++ branches/OpenMPT-1.31/build/make/config-mingw-w64.mk Mon Apr 29 11:05:22 2024 (r20687) @@ -13,17 +13,27 @@ $(error unknown WINDOWS_ARCH) endif +ifeq ($(WINDOWS_CRT),) +MINGW_CRT = mingw32 +else ifeq ($(WINDOWS_CRT),crtdll) +MINGW_CRT = mingw32crt +else ifeq ($(WINDOWS_CRT),msvcrt) +MINGW_CRT = mingw32 +else ifeq ($(WINDOWS_CRT),ucrt) +MINGW_CRT = mingw32ucrt +endif + ifeq ($(origin CC),default) -CC = $(MINGW_ARCH)-w64-mingw32-gcc$(MINGW_FLAVOUR) +CC = $(MINGW_ARCH)-w64-$(MINGW_CRT)-gcc$(MINGW_FLAVOUR) endif ifeq ($(origin CXX),default) -CXX = $(MINGW_ARCH)-w64-mingw32-g++$(MINGW_FLAVOUR) +CXX = $(MINGW_ARCH)-w64-$(MINGW_CRT)-g++$(MINGW_FLAVOUR) endif ifeq ($(origin LD),default) LD = $(CXX) endif ifeq ($(origin AR),default) -AR = $(MINGW_ARCH)-w64-mingw32-ar$(MINGW_FLAVOUR) +AR = $(MINGW_ARCH)-w64-$(MINGW_CRT)-ar$(MINGW_FLAVOUR) endif ifneq ($(STDCXX),) Modified: branches/OpenMPT-1.31/doc/libopenmpt/changelog.md ============================================================================== --- branches/OpenMPT-1.31/doc/libopenmpt/changelog.md Mon Apr 29 10:34:31 2024 (r20686) +++ branches/OpenMPT-1.31/doc/libopenmpt/changelog.md Mon Apr 29 11:05:22 2024 (r20687) @@ -11,6 +11,9 @@ `libopenmpt/bindings/freebasic/libopenmpt_ext.bi` were missing from the Autotools package. + * [**New**] New `Makefile` `CONFIG=mingw-w64` option + `WINDOWS_CRT=[crtdll,msvcrt,ucrt]` to select the toolchain CRT library. + * M15: Loosen SoundTracker file rejection heuristics a bit to allow loading of schmokk.mod and scramble_2.mod. Other heuristics has been tightened a bit. * MOD: Change VBlank timing heuristic to always assume CIA timing when long |
|
From: <sv...@op...> - 2024-04-29 08:34:43
|
Author: manx Date: Mon Apr 29 10:34:31 2024 New Revision: 20686 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20686 Log: [Doc] libopenmpt: Update changelog. Modified: trunk/OpenMPT/doc/libopenmpt/changelog.md Modified: trunk/OpenMPT/doc/libopenmpt/changelog.md ============================================================================== --- trunk/OpenMPT/doc/libopenmpt/changelog.md Mon Apr 29 10:23:20 2024 (r20685) +++ trunk/OpenMPT/doc/libopenmpt/changelog.md Mon Apr 29 10:34:31 2024 (r20686) @@ -11,6 +11,8 @@ Aleshar - The World Of Ice. * [**New**] `Makefile CONFIG=djgpp` now supports building LGPL libraries as DXE (use `ENABLE_DXE=0` to disable). + * [**New**] New `Makefile` `CONFIG=mingw-w64` option + `WINDOWS_CRT=[crtdll,msvcrt,ucrt]` to select the toolchain CRT library. * [**Change**] DOS builds now use zlib, libmpg123, libogg, and libvorbis instead of miniz, minimp3, and stb_vorbis by default. |
|
From: <sv...@op...> - 2024-04-29 08:23:33
|
Author: manx Date: Mon Apr 29 10:23:20 2024 New Revision: 20685 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20685 Log: Merged revision(s) 20682-20683 from trunk/OpenMPT: [Var] vorbis: Silence GCC false-positive warning. ........ [Var] vorbis: Silence GCC false-positive warning. ........ Modified: branches/OpenMPT-1.31/ (props changed) branches/OpenMPT-1.31/include/vorbis/OpenMPT.txt branches/OpenMPT-1.31/include/vorbis/lib/lpc.c branches/OpenMPT-1.31/include/vorbis/lib/psy.c Modified: branches/OpenMPT-1.31/include/vorbis/OpenMPT.txt ============================================================================== --- branches/OpenMPT-1.31/include/vorbis/OpenMPT.txt Mon Apr 29 10:22:54 2024 (r20684) +++ branches/OpenMPT-1.31/include/vorbis/OpenMPT.txt Mon Apr 29 10:23:20 2024 (r20685) @@ -4,6 +4,7 @@ symbian, test, vq) have been removed. - https://github.com/xiph/vorbis/pull/100 and https://github.com/xiph/vorbis/pull/101 have been applied. +- GCC warnings in lib/lpc.c and lib/psy.c have been silenced. - All modifications have been marked with /* OpenMPT */. - For building, premake is used to generate Visual Studio project files. See ../build/premake/ for details. Modified: branches/OpenMPT-1.31/include/vorbis/lib/lpc.c ============================================================================== --- branches/OpenMPT-1.31/include/vorbis/lib/lpc.c Mon Apr 29 10:22:54 2024 (r20684) +++ branches/OpenMPT-1.31/include/vorbis/lib/lpc.c Mon Apr 29 10:23:20 2024 (r20685) @@ -75,7 +75,14 @@ /* Generate lpc coefficients from autocorr values */ /* set our noise floor to about -100dB */ +#if defined(__GNUC__) && !defined(__clang__) && !defined(_MSC_VER) /* OpenMPT */ +#pragma GCC diagnostic push /* OpenMPT */ +#pragma GCC diagnostic ignored "-Wmaybe-uninitialized" /* OpenMPT */ +#endif /* OpenMPT */ error=aut[0] * (1. + 1e-10); +#if defined(__GNUC__) && !defined(__clang__) && !defined(_MSC_VER) /* OpenMPT */ +#pragma GCC diagnostic pop /* OpenMPT */ +#endif /* OpenMPT */ epsilon=1e-9*aut[0]+1e-10; for(i=0;i<m;i++){ Modified: branches/OpenMPT-1.31/include/vorbis/lib/psy.c ============================================================================== --- branches/OpenMPT-1.31/include/vorbis/lib/psy.c Mon Apr 29 10:22:54 2024 (r20684) +++ branches/OpenMPT-1.31/include/vorbis/lib/psy.c Mon Apr 29 10:23:20 2024 (r20685) @@ -711,8 +711,15 @@ for(i=0;i<n;i++)work[i]=logmdct[i]-logmask[i]; +#if defined(__GNUC__) && !defined(__clang__) && !defined(_MSC_VER) /* OpenMPT */ +#pragma GCC diagnostic push /* OpenMPT */ +#pragma GCC diagnostic ignored "-Wmaybe-uninitialized" /* OpenMPT */ +#endif /* OpenMPT */ bark_noise_hybridmp(n,p->bark,work,logmask,0., p->vi->noisewindowfixed); +#if defined(__GNUC__) && !defined(__clang__) && !defined(_MSC_VER) /* OpenMPT */ +#pragma GCC diagnostic pop /* OpenMPT */ +#endif /* OpenMPT */ for(i=0;i<n;i++)work[i]=logmdct[i]-work[i]; |
|
From: <sv...@op...> - 2024-04-29 08:23:07
|
Author: manx Date: Mon Apr 29 10:22:54 2024 New Revision: 20684 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20684 Log: [New] build: Makefile: MinGW-w64: Add WINDOWS_CRT option with values [crtdll,msvcrt,ucrt]. Modified: trunk/OpenMPT/build/make/config-mingw-w64.mk Modified: trunk/OpenMPT/build/make/config-mingw-w64.mk ============================================================================== --- trunk/OpenMPT/build/make/config-mingw-w64.mk Sun Apr 28 20:59:21 2024 (r20683) +++ trunk/OpenMPT/build/make/config-mingw-w64.mk Mon Apr 29 10:22:54 2024 (r20684) @@ -13,17 +13,27 @@ $(error unknown WINDOWS_ARCH) endif +ifeq ($(WINDOWS_CRT),) +MINGW_CRT = mingw32 +else ifeq ($(WINDOWS_CRT),crtdll) +MINGW_CRT = mingw32crt +else ifeq ($(WINDOWS_CRT),msvcrt) +MINGW_CRT = mingw32 +else ifeq ($(WINDOWS_CRT),ucrt) +MINGW_CRT = mingw32ucrt +endif + ifeq ($(origin CC),default) -CC = $(MINGW_ARCH)-w64-mingw32-gcc$(MINGW_FLAVOUR) +CC = $(MINGW_ARCH)-w64-$(MINGW_CRT)-gcc$(MINGW_FLAVOUR) endif ifeq ($(origin CXX),default) -CXX = $(MINGW_ARCH)-w64-mingw32-g++$(MINGW_FLAVOUR) +CXX = $(MINGW_ARCH)-w64-$(MINGW_CRT)-g++$(MINGW_FLAVOUR) endif ifeq ($(origin LD),default) LD = $(CXX) endif ifeq ($(origin AR),default) -AR = $(MINGW_ARCH)-w64-mingw32-ar$(MINGW_FLAVOUR) +AR = $(MINGW_ARCH)-w64-$(MINGW_CRT)-ar$(MINGW_FLAVOUR) endif ifneq ($(STDCXX),) |
|
From: <sv...@op...> - 2024-04-28 18:59:28
|
Author: manx Date: Sun Apr 28 20:59:21 2024 New Revision: 20683 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20683 Log: [Var] vorbis: Silence GCC false-positive warning. Modified: trunk/OpenMPT/include/vorbis/OpenMPT.txt trunk/OpenMPT/include/vorbis/lib/psy.c Modified: trunk/OpenMPT/include/vorbis/OpenMPT.txt ============================================================================== --- trunk/OpenMPT/include/vorbis/OpenMPT.txt Sun Apr 28 20:32:28 2024 (r20682) +++ trunk/OpenMPT/include/vorbis/OpenMPT.txt Sun Apr 28 20:59:21 2024 (r20683) @@ -4,7 +4,7 @@ symbian, test, vq) have been removed. - https://github.com/xiph/vorbis/pull/100 and https://github.com/xiph/vorbis/pull/101 have been applied. -- A GCC warning in lib/lpc.c has been silenced. +- GCC warnings in lib/lpc.c and lib/psy.c have been silenced. - All modifications have been marked with /* OpenMPT */. - For building, premake is used to generate Visual Studio project files. See ../build/premake/ for details. Modified: trunk/OpenMPT/include/vorbis/lib/psy.c ============================================================================== --- trunk/OpenMPT/include/vorbis/lib/psy.c Sun Apr 28 20:32:28 2024 (r20682) +++ trunk/OpenMPT/include/vorbis/lib/psy.c Sun Apr 28 20:59:21 2024 (r20683) @@ -711,8 +711,15 @@ for(i=0;i<n;i++)work[i]=logmdct[i]-logmask[i]; +#if defined(__GNUC__) && !defined(__clang__) && !defined(_MSC_VER) /* OpenMPT */ +#pragma GCC diagnostic push /* OpenMPT */ +#pragma GCC diagnostic ignored "-Wmaybe-uninitialized" /* OpenMPT */ +#endif /* OpenMPT */ bark_noise_hybridmp(n,p->bark,work,logmask,0., p->vi->noisewindowfixed); +#if defined(__GNUC__) && !defined(__clang__) && !defined(_MSC_VER) /* OpenMPT */ +#pragma GCC diagnostic pop /* OpenMPT */ +#endif /* OpenMPT */ for(i=0;i<n;i++)work[i]=logmdct[i]-work[i]; |
|
From: <sv...@op...> - 2024-04-28 18:32:40
|
Author: manx Date: Sun Apr 28 20:32:28 2024 New Revision: 20682 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20682 Log: [Var] vorbis: Silence GCC false-positive warning. Modified: trunk/OpenMPT/include/vorbis/OpenMPT.txt trunk/OpenMPT/include/vorbis/lib/lpc.c Modified: trunk/OpenMPT/include/vorbis/OpenMPT.txt ============================================================================== --- trunk/OpenMPT/include/vorbis/OpenMPT.txt Sun Apr 28 20:04:03 2024 (r20681) +++ trunk/OpenMPT/include/vorbis/OpenMPT.txt Sun Apr 28 20:32:28 2024 (r20682) @@ -4,6 +4,7 @@ symbian, test, vq) have been removed. - https://github.com/xiph/vorbis/pull/100 and https://github.com/xiph/vorbis/pull/101 have been applied. +- A GCC warning in lib/lpc.c has been silenced. - All modifications have been marked with /* OpenMPT */. - For building, premake is used to generate Visual Studio project files. See ../build/premake/ for details. Modified: trunk/OpenMPT/include/vorbis/lib/lpc.c ============================================================================== --- trunk/OpenMPT/include/vorbis/lib/lpc.c Sun Apr 28 20:04:03 2024 (r20681) +++ trunk/OpenMPT/include/vorbis/lib/lpc.c Sun Apr 28 20:32:28 2024 (r20682) @@ -75,7 +75,14 @@ /* Generate lpc coefficients from autocorr values */ /* set our noise floor to about -100dB */ +#if defined(__GNUC__) && !defined(__clang__) && !defined(_MSC_VER) /* OpenMPT */ +#pragma GCC diagnostic push /* OpenMPT */ +#pragma GCC diagnostic ignored "-Wmaybe-uninitialized" /* OpenMPT */ +#endif /* OpenMPT */ error=aut[0] * (1. + 1e-10); +#if defined(__GNUC__) && !defined(__clang__) && !defined(_MSC_VER) /* OpenMPT */ +#pragma GCC diagnostic pop /* OpenMPT */ +#endif /* OpenMPT */ epsilon=1e-9*aut[0]+1e-10; for(i=0;i<m;i++){ |
|
From: <sv...@op...> - 2024-04-28 18:04:10
|
Author: manx Date: Sun Apr 28 20:04:03 2024 New Revision: 20681 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20681 Log: [New] build: CI: GitHub: Add Fedora Autotools builder. Added: trunk/OpenMPT/.github/workflows/Fedora-Autotools.yml Added: trunk/OpenMPT/.github/workflows/Fedora-Autotools.yml ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/OpenMPT/.github/workflows/Fedora-Autotools.yml Sun Apr 28 20:04:03 2024 (r20681) @@ -0,0 +1,29 @@ +name: Fedora Autotools + +on: + push: + branches: [ master ] + pull_request: + branches: [ master ] + +concurrency: + group: ${{ github.ref }}-${{ github.workflow }} + cancel-in-progress: true + +jobs: + build: + + runs-on: ubuntu-latest + container: + image: fedora:latest + + steps: + - name: Install dependencies + run: dnf -y upgrade --refresh && dnf -y install subversion perl-XML-XPath git mawk zip unzip p7zip xz make binutils gcc gcc-g++ clang pcc pkgconf help2man doxygen autoconf autoconf-archive automake libtool ccache zlib-devel mpg123-devel libogg-devel libvorbis-devel portaudio-devel pulseaudio-libs-devel SDL2-devel flac-devel libsndfile-devel libtool-ltdl-devel + - name: Checkout + uses: actions/checkout@v4 + - name: fix git + # https://github.com/actions/runner/issues/2033 + run: chown -R $(id -u):$(id -g) $(pwd) + - name: Build + run: export MAKEFLAGS=-j$(nproc); ./build/autotools/autoconfiscate.sh |
3 messages has been excluded from this view by a project administrator.
