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
(108) |
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <sv...@op...> - 2024-09-23 16:38:13
|
Author: manx Date: Mon Sep 23 18:38:01 2024 New Revision: 21701 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21701 Log: [Var] mpt/main/main.hpp: Cleanup formatting. Modified: trunk/OpenMPT/src/mpt/main/main.hpp Modified: trunk/OpenMPT/src/mpt/main/main.hpp ============================================================================== --- trunk/OpenMPT/src/mpt/main/main.hpp Mon Sep 23 18:23:23 2024 (r21700) +++ trunk/OpenMPT/src/mpt/main/main.hpp Mon Sep 23 18:38:01 2024 (r21701) @@ -107,7 +107,9 @@ #endif // MPT_OS_DJGPP #if !defined(MPT_MAIN_PROLOG) +/* clang-format off */ #define MPT_MAIN_PROLOG() do { } while(0) +/* clang-format on */ #endif |
Author: manx Date: Mon Sep 23 18:23:23 2024 New Revision: 21700 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21700 Log: [Ref] openmpt123: Use mpt/main. Modified: trunk/OpenMPT/build/premake/mpt-openmpt123.lua trunk/OpenMPT/build/vs2017winxp/openmpt123.vcxproj trunk/OpenMPT/build/vs2017winxp/openmpt123.vcxproj.filters trunk/OpenMPT/build/vs2017winxpansi/openmpt123.vcxproj trunk/OpenMPT/build/vs2017winxpansi/openmpt123.vcxproj.filters trunk/OpenMPT/build/vs2019win7/openmpt123.vcxproj trunk/OpenMPT/build/vs2019win7/openmpt123.vcxproj.filters trunk/OpenMPT/build/vs2022win10/openmpt123.vcxproj trunk/OpenMPT/build/vs2022win10/openmpt123.vcxproj.filters trunk/OpenMPT/build/vs2022win10clang/openmpt123.vcxproj trunk/OpenMPT/build/vs2022win10clang/openmpt123.vcxproj.filters trunk/OpenMPT/build/vs2022win7/openmpt123.vcxproj trunk/OpenMPT/build/vs2022win7/openmpt123.vcxproj.filters trunk/OpenMPT/build/vs2022win8/openmpt123.vcxproj trunk/OpenMPT/build/vs2022win8/openmpt123.vcxproj.filters trunk/OpenMPT/build/vs2022win81/openmpt123.vcxproj trunk/OpenMPT/build/vs2022win81/openmpt123.vcxproj.filters trunk/OpenMPT/openmpt123/openmpt123.cpp Modified: trunk/OpenMPT/build/premake/mpt-openmpt123.lua ============================================================================== --- trunk/OpenMPT/build/premake/mpt-openmpt123.lua Mon Sep 23 18:20:59 2024 (r21699) +++ trunk/OpenMPT/build/premake/mpt-openmpt123.lua Mon Sep 23 18:23:23 2024 (r21700) @@ -32,6 +32,7 @@ "../../src/mpt/format/*.hpp", "../../src/mpt/io/*.hpp", "../../src/mpt/io_file/*.hpp", + "../../src/mpt/main/*.hpp", "../../src/mpt/parse/*.hpp", "../../src/mpt/path/*.hpp", "../../src/mpt/random/*.hpp", Modified: trunk/OpenMPT/build/vs2017winxp/openmpt123.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2017winxp/openmpt123.vcxproj Mon Sep 23 18:20:59 2024 (r21699) +++ trunk/OpenMPT/build/vs2017winxp/openmpt123.vcxproj Mon Sep 23 18:23:23 2024 (r21700) @@ -813,6 +813,7 @@ <ClInclude Include="..\..\src\mpt\io_file\fstream.hpp" /> <ClInclude Include="..\..\src\mpt\io_file\inputfile.hpp" /> <ClInclude Include="..\..\src\mpt\io_file\outputfile.hpp" /> + <ClInclude Include="..\..\src\mpt\main\main.hpp" /> <ClInclude Include="..\..\src\mpt\parse\parse.hpp" /> <ClInclude Include="..\..\src\mpt\parse\split.hpp" /> <ClInclude Include="..\..\src\mpt\path\basic_path.hpp" /> Modified: trunk/OpenMPT/build/vs2017winxp/openmpt123.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2017winxp/openmpt123.vcxproj.filters Mon Sep 23 18:20:59 2024 (r21699) +++ trunk/OpenMPT/build/vs2017winxp/openmpt123.vcxproj.filters Mon Sep 23 18:23:23 2024 (r21700) @@ -31,6 +31,9 @@ <Filter Include="src\mpt\io_file"> <UniqueIdentifier>{D34C5655-3FD8-C319-48E9-460EB4F31F1A}</UniqueIdentifier> </Filter> + <Filter Include="src\mpt\main"> + <UniqueIdentifier>{C1DDD503-AD40-65A8-56C6-9D5E4208312B}</UniqueIdentifier> + </Filter> <Filter Include="src\mpt\parse"> <UniqueIdentifier>{B706C87E-23C7-43B5-EC01-8D3258818891}</UniqueIdentifier> </Filter> @@ -288,6 +291,9 @@ <ClInclude Include="..\..\src\mpt\io_file\outputfile.hpp"> <Filter>src\mpt\io_file</Filter> </ClInclude> + <ClInclude Include="..\..\src\mpt\main\main.hpp"> + <Filter>src\mpt\main</Filter> + </ClInclude> <ClInclude Include="..\..\src\mpt\parse\parse.hpp"> <Filter>src\mpt\parse</Filter> </ClInclude> Modified: trunk/OpenMPT/build/vs2017winxpansi/openmpt123.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2017winxpansi/openmpt123.vcxproj Mon Sep 23 18:20:59 2024 (r21699) +++ trunk/OpenMPT/build/vs2017winxpansi/openmpt123.vcxproj Mon Sep 23 18:23:23 2024 (r21700) @@ -813,6 +813,7 @@ <ClInclude Include="..\..\src\mpt\io_file\fstream.hpp" /> <ClInclude Include="..\..\src\mpt\io_file\inputfile.hpp" /> <ClInclude Include="..\..\src\mpt\io_file\outputfile.hpp" /> + <ClInclude Include="..\..\src\mpt\main\main.hpp" /> <ClInclude Include="..\..\src\mpt\parse\parse.hpp" /> <ClInclude Include="..\..\src\mpt\parse\split.hpp" /> <ClInclude Include="..\..\src\mpt\path\basic_path.hpp" /> Modified: trunk/OpenMPT/build/vs2017winxpansi/openmpt123.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2017winxpansi/openmpt123.vcxproj.filters Mon Sep 23 18:20:59 2024 (r21699) +++ trunk/OpenMPT/build/vs2017winxpansi/openmpt123.vcxproj.filters Mon Sep 23 18:23:23 2024 (r21700) @@ -31,6 +31,9 @@ <Filter Include="src\mpt\io_file"> <UniqueIdentifier>{D34C5655-3FD8-C319-48E9-460EB4F31F1A}</UniqueIdentifier> </Filter> + <Filter Include="src\mpt\main"> + <UniqueIdentifier>{C1DDD503-AD40-65A8-56C6-9D5E4208312B}</UniqueIdentifier> + </Filter> <Filter Include="src\mpt\parse"> <UniqueIdentifier>{B706C87E-23C7-43B5-EC01-8D3258818891}</UniqueIdentifier> </Filter> @@ -288,6 +291,9 @@ <ClInclude Include="..\..\src\mpt\io_file\outputfile.hpp"> <Filter>src\mpt\io_file</Filter> </ClInclude> + <ClInclude Include="..\..\src\mpt\main\main.hpp"> + <Filter>src\mpt\main</Filter> + </ClInclude> <ClInclude Include="..\..\src\mpt\parse\parse.hpp"> <Filter>src\mpt\parse</Filter> </ClInclude> Modified: trunk/OpenMPT/build/vs2019win7/openmpt123.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2019win7/openmpt123.vcxproj Mon Sep 23 18:20:59 2024 (r21699) +++ trunk/OpenMPT/build/vs2019win7/openmpt123.vcxproj Mon Sep 23 18:23:23 2024 (r21700) @@ -810,6 +810,7 @@ <ClInclude Include="..\..\src\mpt\io_file\fstream.hpp" /> <ClInclude Include="..\..\src\mpt\io_file\inputfile.hpp" /> <ClInclude Include="..\..\src\mpt\io_file\outputfile.hpp" /> + <ClInclude Include="..\..\src\mpt\main\main.hpp" /> <ClInclude Include="..\..\src\mpt\parse\parse.hpp" /> <ClInclude Include="..\..\src\mpt\parse\split.hpp" /> <ClInclude Include="..\..\src\mpt\path\basic_path.hpp" /> Modified: trunk/OpenMPT/build/vs2019win7/openmpt123.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2019win7/openmpt123.vcxproj.filters Mon Sep 23 18:20:59 2024 (r21699) +++ trunk/OpenMPT/build/vs2019win7/openmpt123.vcxproj.filters Mon Sep 23 18:23:23 2024 (r21700) @@ -37,6 +37,9 @@ <Filter Include="src\mpt\io_file"> <UniqueIdentifier>{D34C5655-3FD8-C319-48E9-460EB4F31F1A}</UniqueIdentifier> </Filter> + <Filter Include="src\mpt\main"> + <UniqueIdentifier>{C1DDD503-AD40-65A8-56C6-9D5E4208312B}</UniqueIdentifier> + </Filter> <Filter Include="src\mpt\parse"> <UniqueIdentifier>{B706C87E-23C7-43B5-EC01-8D3258818891}</UniqueIdentifier> </Filter> @@ -294,6 +297,9 @@ <ClInclude Include="..\..\src\mpt\io_file\outputfile.hpp"> <Filter>src\mpt\io_file</Filter> </ClInclude> + <ClInclude Include="..\..\src\mpt\main\main.hpp"> + <Filter>src\mpt\main</Filter> + </ClInclude> <ClInclude Include="..\..\src\mpt\parse\parse.hpp"> <Filter>src\mpt\parse</Filter> </ClInclude> Modified: trunk/OpenMPT/build/vs2022win10/openmpt123.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2022win10/openmpt123.vcxproj Mon Sep 23 18:20:59 2024 (r21699) +++ trunk/OpenMPT/build/vs2022win10/openmpt123.vcxproj Mon Sep 23 18:23:23 2024 (r21700) @@ -1588,6 +1588,7 @@ <ClInclude Include="..\..\src\mpt\io_file\fstream.hpp" /> <ClInclude Include="..\..\src\mpt\io_file\inputfile.hpp" /> <ClInclude Include="..\..\src\mpt\io_file\outputfile.hpp" /> + <ClInclude Include="..\..\src\mpt\main\main.hpp" /> <ClInclude Include="..\..\src\mpt\parse\parse.hpp" /> <ClInclude Include="..\..\src\mpt\parse\split.hpp" /> <ClInclude Include="..\..\src\mpt\path\basic_path.hpp" /> Modified: trunk/OpenMPT/build/vs2022win10/openmpt123.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2022win10/openmpt123.vcxproj.filters Mon Sep 23 18:20:59 2024 (r21699) +++ trunk/OpenMPT/build/vs2022win10/openmpt123.vcxproj.filters Mon Sep 23 18:23:23 2024 (r21700) @@ -37,6 +37,9 @@ <Filter Include="src\mpt\io_file"> <UniqueIdentifier>{D34C5655-3FD8-C319-48E9-460EB4F31F1A}</UniqueIdentifier> </Filter> + <Filter Include="src\mpt\main"> + <UniqueIdentifier>{C1DDD503-AD40-65A8-56C6-9D5E4208312B}</UniqueIdentifier> + </Filter> <Filter Include="src\mpt\parse"> <UniqueIdentifier>{B706C87E-23C7-43B5-EC01-8D3258818891}</UniqueIdentifier> </Filter> @@ -294,6 +297,9 @@ <ClInclude Include="..\..\src\mpt\io_file\outputfile.hpp"> <Filter>src\mpt\io_file</Filter> </ClInclude> + <ClInclude Include="..\..\src\mpt\main\main.hpp"> + <Filter>src\mpt\main</Filter> + </ClInclude> <ClInclude Include="..\..\src\mpt\parse\parse.hpp"> <Filter>src\mpt\parse</Filter> </ClInclude> Modified: trunk/OpenMPT/build/vs2022win10clang/openmpt123.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2022win10clang/openmpt123.vcxproj Mon Sep 23 18:20:59 2024 (r21699) +++ trunk/OpenMPT/build/vs2022win10clang/openmpt123.vcxproj Mon Sep 23 18:23:23 2024 (r21700) @@ -1506,6 +1506,7 @@ <ClInclude Include="..\..\src\mpt\io_file\fstream.hpp" /> <ClInclude Include="..\..\src\mpt\io_file\inputfile.hpp" /> <ClInclude Include="..\..\src\mpt\io_file\outputfile.hpp" /> + <ClInclude Include="..\..\src\mpt\main\main.hpp" /> <ClInclude Include="..\..\src\mpt\parse\parse.hpp" /> <ClInclude Include="..\..\src\mpt\parse\split.hpp" /> <ClInclude Include="..\..\src\mpt\path\basic_path.hpp" /> Modified: trunk/OpenMPT/build/vs2022win10clang/openmpt123.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2022win10clang/openmpt123.vcxproj.filters Mon Sep 23 18:20:59 2024 (r21699) +++ trunk/OpenMPT/build/vs2022win10clang/openmpt123.vcxproj.filters Mon Sep 23 18:23:23 2024 (r21700) @@ -37,6 +37,9 @@ <Filter Include="src\mpt\io_file"> <UniqueIdentifier>{D34C5655-3FD8-C319-48E9-460EB4F31F1A}</UniqueIdentifier> </Filter> + <Filter Include="src\mpt\main"> + <UniqueIdentifier>{C1DDD503-AD40-65A8-56C6-9D5E4208312B}</UniqueIdentifier> + </Filter> <Filter Include="src\mpt\parse"> <UniqueIdentifier>{B706C87E-23C7-43B5-EC01-8D3258818891}</UniqueIdentifier> </Filter> @@ -294,6 +297,9 @@ <ClInclude Include="..\..\src\mpt\io_file\outputfile.hpp"> <Filter>src\mpt\io_file</Filter> </ClInclude> + <ClInclude Include="..\..\src\mpt\main\main.hpp"> + <Filter>src\mpt\main</Filter> + </ClInclude> <ClInclude Include="..\..\src\mpt\parse\parse.hpp"> <Filter>src\mpt\parse</Filter> </ClInclude> Modified: trunk/OpenMPT/build/vs2022win7/openmpt123.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2022win7/openmpt123.vcxproj Mon Sep 23 18:20:59 2024 (r21699) +++ trunk/OpenMPT/build/vs2022win7/openmpt123.vcxproj Mon Sep 23 18:23:23 2024 (r21700) @@ -830,6 +830,7 @@ <ClInclude Include="..\..\src\mpt\io_file\fstream.hpp" /> <ClInclude Include="..\..\src\mpt\io_file\inputfile.hpp" /> <ClInclude Include="..\..\src\mpt\io_file\outputfile.hpp" /> + <ClInclude Include="..\..\src\mpt\main\main.hpp" /> <ClInclude Include="..\..\src\mpt\parse\parse.hpp" /> <ClInclude Include="..\..\src\mpt\parse\split.hpp" /> <ClInclude Include="..\..\src\mpt\path\basic_path.hpp" /> Modified: trunk/OpenMPT/build/vs2022win7/openmpt123.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2022win7/openmpt123.vcxproj.filters Mon Sep 23 18:20:59 2024 (r21699) +++ trunk/OpenMPT/build/vs2022win7/openmpt123.vcxproj.filters Mon Sep 23 18:23:23 2024 (r21700) @@ -37,6 +37,9 @@ <Filter Include="src\mpt\io_file"> <UniqueIdentifier>{D34C5655-3FD8-C319-48E9-460EB4F31F1A}</UniqueIdentifier> </Filter> + <Filter Include="src\mpt\main"> + <UniqueIdentifier>{C1DDD503-AD40-65A8-56C6-9D5E4208312B}</UniqueIdentifier> + </Filter> <Filter Include="src\mpt\parse"> <UniqueIdentifier>{B706C87E-23C7-43B5-EC01-8D3258818891}</UniqueIdentifier> </Filter> @@ -294,6 +297,9 @@ <ClInclude Include="..\..\src\mpt\io_file\outputfile.hpp"> <Filter>src\mpt\io_file</Filter> </ClInclude> + <ClInclude Include="..\..\src\mpt\main\main.hpp"> + <Filter>src\mpt\main</Filter> + </ClInclude> <ClInclude Include="..\..\src\mpt\parse\parse.hpp"> <Filter>src\mpt\parse</Filter> </ClInclude> Modified: trunk/OpenMPT/build/vs2022win8/openmpt123.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2022win8/openmpt123.vcxproj Mon Sep 23 18:20:59 2024 (r21699) +++ trunk/OpenMPT/build/vs2022win8/openmpt123.vcxproj Mon Sep 23 18:23:23 2024 (r21700) @@ -1200,6 +1200,7 @@ <ClInclude Include="..\..\src\mpt\io_file\fstream.hpp" /> <ClInclude Include="..\..\src\mpt\io_file\inputfile.hpp" /> <ClInclude Include="..\..\src\mpt\io_file\outputfile.hpp" /> + <ClInclude Include="..\..\src\mpt\main\main.hpp" /> <ClInclude Include="..\..\src\mpt\parse\parse.hpp" /> <ClInclude Include="..\..\src\mpt\parse\split.hpp" /> <ClInclude Include="..\..\src\mpt\path\basic_path.hpp" /> Modified: trunk/OpenMPT/build/vs2022win8/openmpt123.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2022win8/openmpt123.vcxproj.filters Mon Sep 23 18:20:59 2024 (r21699) +++ trunk/OpenMPT/build/vs2022win8/openmpt123.vcxproj.filters Mon Sep 23 18:23:23 2024 (r21700) @@ -37,6 +37,9 @@ <Filter Include="src\mpt\io_file"> <UniqueIdentifier>{D34C5655-3FD8-C319-48E9-460EB4F31F1A}</UniqueIdentifier> </Filter> + <Filter Include="src\mpt\main"> + <UniqueIdentifier>{C1DDD503-AD40-65A8-56C6-9D5E4208312B}</UniqueIdentifier> + </Filter> <Filter Include="src\mpt\parse"> <UniqueIdentifier>{B706C87E-23C7-43B5-EC01-8D3258818891}</UniqueIdentifier> </Filter> @@ -294,6 +297,9 @@ <ClInclude Include="..\..\src\mpt\io_file\outputfile.hpp"> <Filter>src\mpt\io_file</Filter> </ClInclude> + <ClInclude Include="..\..\src\mpt\main\main.hpp"> + <Filter>src\mpt\main</Filter> + </ClInclude> <ClInclude Include="..\..\src\mpt\parse\parse.hpp"> <Filter>src\mpt\parse</Filter> </ClInclude> Modified: trunk/OpenMPT/build/vs2022win81/openmpt123.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2022win81/openmpt123.vcxproj Mon Sep 23 18:20:59 2024 (r21699) +++ trunk/OpenMPT/build/vs2022win81/openmpt123.vcxproj Mon Sep 23 18:23:23 2024 (r21700) @@ -1200,6 +1200,7 @@ <ClInclude Include="..\..\src\mpt\io_file\fstream.hpp" /> <ClInclude Include="..\..\src\mpt\io_file\inputfile.hpp" /> <ClInclude Include="..\..\src\mpt\io_file\outputfile.hpp" /> + <ClInclude Include="..\..\src\mpt\main\main.hpp" /> <ClInclude Include="..\..\src\mpt\parse\parse.hpp" /> <ClInclude Include="..\..\src\mpt\parse\split.hpp" /> <ClInclude Include="..\..\src\mpt\path\basic_path.hpp" /> Modified: trunk/OpenMPT/build/vs2022win81/openmpt123.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2022win81/openmpt123.vcxproj.filters Mon Sep 23 18:20:59 2024 (r21699) +++ trunk/OpenMPT/build/vs2022win81/openmpt123.vcxproj.filters Mon Sep 23 18:23:23 2024 (r21700) @@ -37,6 +37,9 @@ <Filter Include="src\mpt\io_file"> <UniqueIdentifier>{D34C5655-3FD8-C319-48E9-460EB4F31F1A}</UniqueIdentifier> </Filter> + <Filter Include="src\mpt\main"> + <UniqueIdentifier>{C1DDD503-AD40-65A8-56C6-9D5E4208312B}</UniqueIdentifier> + </Filter> <Filter Include="src\mpt\parse"> <UniqueIdentifier>{B706C87E-23C7-43B5-EC01-8D3258818891}</UniqueIdentifier> </Filter> @@ -294,6 +297,9 @@ <ClInclude Include="..\..\src\mpt\io_file\outputfile.hpp"> <Filter>src\mpt\io_file</Filter> </ClInclude> + <ClInclude Include="..\..\src\mpt\main\main.hpp"> + <Filter>src\mpt\main</Filter> + </ClInclude> <ClInclude Include="..\..\src\mpt\parse\parse.hpp"> <Filter>src\mpt\parse</Filter> </ClInclude> Modified: trunk/OpenMPT/openmpt123/openmpt123.cpp ============================================================================== --- trunk/OpenMPT/openmpt123/openmpt123.cpp Mon Sep 23 18:20:59 2024 (r21699) +++ trunk/OpenMPT/openmpt123/openmpt123.cpp Mon Sep 23 18:23:23 2024 (r21700) @@ -45,8 +45,8 @@ #include <sys/types.h> #endif -#include "mpt/base/check_platform.hpp" #include "mpt/base/detect.hpp" +#include "mpt/main/main.hpp" #include "mpt/random/crand.hpp" #include "mpt/random/default_engines.hpp" @@ -79,7 +79,6 @@ #if MPT_OS_DJGPP #include <conio.h> -#include <crt0.h> #include <dpmi.h> #include <fcntl.h> #include <io.h> @@ -2176,37 +2175,8 @@ #endif -#if MPT_OS_DJGPP -/* Work-around <https://gcc.gnu.org/bugzilla/show_bug.cgi?id=45977> */ -/* clang-format off */ -extern "C" { - int _crt0_startup_flags = 0 - | _CRT0_FLAG_NONMOVE_SBRK /* force interrupt compatible allocation */ - | _CRT0_DISABLE_SBRK_ADDRESS_WRAP /* force NT compatible allocation */ - | _CRT0_FLAG_LOCK_MEMORY /* lock all code and data at program startup */ - | 0; -} -/* clang-format on */ -#endif /* MPT_OS_DJGPP */ -#if MPT_OS_WINDOWS && defined(UNICODE) -static int wmain( int wargc, wchar_t * wargv [] ) { -#else -static int main( int argc, char * argv [] ) { -#endif - #if MPT_OS_DJGPP - _crt0_startup_flags &= ~_CRT0_FLAG_LOCK_MEMORY; /* disable automatic locking for all further memory allocations */ - assert(mpt::platform::libc().is_ok()); - #endif /* MPT_OS_DJGPP */ - std::vector<mpt::ustring> args; - #if MPT_OS_WINDOWS && defined(UNICODE) - for ( int arg = 0; arg < wargc; ++arg ) { - args.push_back( mpt::transcode<mpt::ustring>( wargv[arg] ) ); - } - #else - for ( int arg = 0; arg < argc; ++arg ) { - args.push_back( mpt::transcode<mpt::ustring>( mpt::logical_encoding::locale, argv[arg] ) ); - } - #endif + +static mpt::uint8 main( std::vector<mpt::ustring> args ) { FILE_mode_guard stdin_utf8_guard( stdin, FILE_mode::utf8 ); FILE_mode_guard stdout_utf8_guard( stdout, FILE_mode::utf8 ); @@ -2455,17 +2425,5 @@ } // namespace openmpt123 -#if MPT_OS_WINDOWS && defined(UNICODE) -#if defined(__GNUC__) || (defined(__clang__) && !defined(_MSC_VER)) -// mingw64 does only default to special C linkage for "main", but not for "wmain". -extern "C" int wmain( int wargc, wchar_t * wargv [] ); -extern "C" -#endif -int wmain( int wargc, wchar_t * wargv [] ) { - return openmpt123::wmain( wargc, wargv ); -} -#else -int main( int argc, char * argv [] ) { - return openmpt123::main( argc, argv ); -} -#endif + +MPT_MAIN_IMPLEMENT_MAIN(openmpt123) |
|
From: <sv...@op...> - 2024-09-23 16:21:12
|
Author: manx Date: Mon Sep 23 18:20:59 2024 New Revision: 21699 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21699 Log: [Ref] mpt/main/main.hpp: Add main library that abstracts away platform-specific non-standard handling of main(), like Win32 wmain, MinGW missing prototypes, and DJGPP crt0 flags. Added: trunk/OpenMPT/src/mpt/main/ trunk/OpenMPT/src/mpt/main/main.hpp (contents, props changed) Modified: trunk/OpenMPT/Makefile trunk/OpenMPT/build/autotools/Makefile.am trunk/OpenMPT/build/autotools/autoconfiscate.sh trunk/OpenMPT/build/premake-xcode/mpt-libopenmpt.lua trunk/OpenMPT/build/premake/mpt-OpenMPT-NativeSupport.lua trunk/OpenMPT/build/premake/mpt-OpenMPT.lua trunk/OpenMPT/build/premake/mpt-PluginBridge.lua trunk/OpenMPT/build/premake/mpt-libopenmpt-small.lua trunk/OpenMPT/build/premake/mpt-libopenmpt.lua trunk/OpenMPT/build/premake/mpt-libopenmpt_test.lua trunk/OpenMPT/build/premake/mpt-updatesigntool.lua Modified: trunk/OpenMPT/Makefile ============================================================================== --- trunk/OpenMPT/Makefile Mon Sep 23 16:25:29 2024 (r21698) +++ trunk/OpenMPT/Makefile Mon Sep 23 18:20:59 2024 (r21699) @@ -1835,6 +1835,7 @@ svn export ./src/mpt/io_write bin/$(FLAVOUR_DIR)dist-tar/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/src/mpt/io_write #svn export ./src/mpt/json bin/$(FLAVOUR_DIR)dist-tar/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/src/mpt/json #svn export ./src/mpt/library bin/$(FLAVOUR_DIR)dist-tar/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/src/mpt/library + svn export ./src/mpt/main bin/$(FLAVOUR_DIR)dist-tar/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/src/mpt/main svn export ./src/mpt/mutex bin/$(FLAVOUR_DIR)dist-tar/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/src/mpt/mutex svn export ./src/mpt/out_of_memory bin/$(FLAVOUR_DIR)dist-tar/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/src/mpt/out_of_memory svn export ./src/mpt/osinfo bin/$(FLAVOUR_DIR)dist-tar/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/src/mpt/osinfo @@ -1935,6 +1936,7 @@ svn export ./src/mpt/io_write bin/$(FLAVOUR_DIR)dist-zip/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/src/mpt/io_write --native-eol CRLF #svn export ./src/mpt/json bin/$(FLAVOUR_DIR)dist-zip/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/src/mpt/json --native-eol CRLF #svn export ./src/mpt/library bin/$(FLAVOUR_DIR)dist-zip/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/src/mpt/library --native-eol CRLF + svn export ./src/mpt/main bin/$(FLAVOUR_DIR)dist-zip/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/src/mpt/main --native-eol CRLF svn export ./src/mpt/mutex bin/$(FLAVOUR_DIR)dist-zip/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/src/mpt/mutex --native-eol CRLF svn export ./src/mpt/out_of_memory bin/$(FLAVOUR_DIR)dist-zip/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/src/mpt/out_of_memory --native-eol CRLF svn export ./src/mpt/osinfo bin/$(FLAVOUR_DIR)dist-zip/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/src/mpt/osinfo --native-eol CRLF Modified: trunk/OpenMPT/build/autotools/Makefile.am ============================================================================== --- trunk/OpenMPT/build/autotools/Makefile.am Mon Sep 23 16:25:29 2024 (r21698) +++ trunk/OpenMPT/build/autotools/Makefile.am Mon Sep 23 18:20:59 2024 (r21699) @@ -238,6 +238,7 @@ MPT_FILES_SRC_MPT += src/mpt/io_write/buffer.hpp #MPT_FILES_SRC_MPT += src/mpt/json/json.hpp #MPT_FILES_SRC_MPT += src/mpt/library/library.hpp +MPT_FILES_SRC_MPT += src/mpt/main/main.hpp MPT_FILES_SRC_MPT += src/mpt/mutex/mutex.hpp MPT_FILES_SRC_MPT += src/mpt/osinfo/class.hpp MPT_FILES_SRC_MPT += src/mpt/osinfo/dos_memory.hpp Modified: trunk/OpenMPT/build/autotools/autoconfiscate.sh ============================================================================== --- trunk/OpenMPT/build/autotools/autoconfiscate.sh Mon Sep 23 16:25:29 2024 (r21698) +++ trunk/OpenMPT/build/autotools/autoconfiscate.sh Mon Sep 23 18:20:59 2024 (r21699) @@ -89,6 +89,7 @@ svn export ./src/mpt/io_write bin/dist-autotools/src/mpt/io_write #svn export ./src/mpt/json bin/dist-autotools/src/mpt/json #svn export ./src/mpt/library bin/dist-autotools/src/mpt/library +svn export ./src/mpt/main bin/dist-autotools/src/mpt/main svn export ./src/mpt/mutex bin/dist-autotools/src/mpt/mutex svn export ./src/mpt/out_of_memory bin/dist-autotools/src/mpt/out_of_memory svn export ./src/mpt/osinfo bin/dist-autotools/src/mpt/osinfo @@ -164,6 +165,7 @@ cp -r ./src/mpt/io_write bin/dist-autotools/src/mpt/io_write #cp -r ./src/mpt/json bin/dist-autotools/src/mpt/json #cp -r ./src/mpt/library bin/dist-autotools/src/mpt/library +cp -r ./src/mpt/main bin/dist-autotools/src/mpt/main cp -r ./src/mpt/mutex bin/dist-autotools/src/mpt/mutex cp -r ./src/mpt/out_of_memory bin/dist-autotools/src/mpt/out_of_memory cp -r ./src/mpt/osinfo bin/dist-autotools/src/mpt/osinfo Modified: trunk/OpenMPT/build/premake-xcode/mpt-libopenmpt.lua ============================================================================== --- trunk/OpenMPT/build/premake-xcode/mpt-libopenmpt.lua Mon Sep 23 16:25:29 2024 (r21698) +++ trunk/OpenMPT/build/premake-xcode/mpt-libopenmpt.lua Mon Sep 23 18:20:59 2024 (r21699) @@ -49,6 +49,8 @@ "../../src/mpt/json/**.hpp", "../../src/mpt/library/**.cpp", "../../src/mpt/library/**.hpp", + "../../src/mpt/main/**.cpp", + "../../src/mpt/main/**.hpp", "../../src/mpt/test/**.cpp", "../../src/mpt/test/**.hpp", "../../src/mpt/uuid_namespace/**.cpp", Modified: trunk/OpenMPT/build/premake/mpt-OpenMPT-NativeSupport.lua ============================================================================== --- trunk/OpenMPT/build/premake/mpt-OpenMPT-NativeSupport.lua Mon Sep 23 16:25:29 2024 (r21698) +++ trunk/OpenMPT/build/premake/mpt-OpenMPT-NativeSupport.lua Mon Sep 23 18:20:59 2024 (r21699) @@ -35,6 +35,8 @@ } excludes { "../../mptrack/wine/WineWrapper.cpp", + "../../src/mpt/main/**.cpp", + "../../src/mpt/main/**.hpp", "../../src/openmpt/fileformat_base/**.cpp", "../../src/openmpt/fileformat_base/**.hpp", "../../src/openmpt/soundfile_data/**.cpp", Modified: trunk/OpenMPT/build/premake/mpt-OpenMPT.lua ============================================================================== --- trunk/OpenMPT/build/premake/mpt-OpenMPT.lua Mon Sep 23 16:25:29 2024 (r21698) +++ trunk/OpenMPT/build/premake/mpt-OpenMPT.lua Mon Sep 23 18:20:59 2024 (r21699) @@ -118,6 +118,10 @@ "../../pluginBridge/BridgeWrapper.cpp", "../../pluginBridge/BridgeWrapper.h", } + excludes { + "../../src/mpt/main/**.cpp", + "../../src/mpt/main/**.hpp", + } files { "../../mptrack/mptrack.rc", "../../mptrack/res/*.*", -- resource data files Modified: trunk/OpenMPT/build/premake/mpt-PluginBridge.lua ============================================================================== --- trunk/OpenMPT/build/premake/mpt-PluginBridge.lua Mon Sep 23 16:25:29 2024 (r21698) +++ trunk/OpenMPT/build/premake/mpt-PluginBridge.lua Mon Sep 23 18:20:59 2024 (r21699) @@ -23,6 +23,8 @@ "../../common/versionNumber.h", } excludes { + "../../src/mpt/main/**.cpp", + "../../src/mpt/main/**.hpp", "../../src/openmpt/fileformat_base/**.cpp", "../../src/openmpt/fileformat_base/**.hpp", "../../src/openmpt/soundbase/**.cpp", @@ -83,6 +85,8 @@ "../../common/versionNumber.h", } excludes { + "../../src/mpt/main/**.cpp", + "../../src/mpt/main/**.hpp", "../../src/openmpt/fileformat_base/**.cpp", "../../src/openmpt/fileformat_base/**.hpp", "../../src/openmpt/soundbase/**.cpp", Modified: trunk/OpenMPT/build/premake/mpt-libopenmpt-small.lua ============================================================================== --- trunk/OpenMPT/build/premake/mpt-libopenmpt-small.lua Mon Sep 23 16:25:29 2024 (r21698) +++ trunk/OpenMPT/build/premake/mpt-libopenmpt-small.lua Mon Sep 23 18:20:59 2024 (r21699) @@ -66,6 +66,8 @@ "../../src/mpt/json/**.hpp", "../../src/mpt/library/**.cpp", "../../src/mpt/library/**.hpp", + "../../src/mpt/main/**.cpp", + "../../src/mpt/main/**.hpp", "../../src/mpt/test/**.cpp", "../../src/mpt/test/**.hpp", "../../src/mpt/uuid_namespace/**.cpp", Modified: trunk/OpenMPT/build/premake/mpt-libopenmpt.lua ============================================================================== --- trunk/OpenMPT/build/premake/mpt-libopenmpt.lua Mon Sep 23 16:25:29 2024 (r21698) +++ trunk/OpenMPT/build/premake/mpt-libopenmpt.lua Mon Sep 23 18:20:59 2024 (r21699) @@ -52,6 +52,8 @@ "../../src/mpt/json/**.hpp", "../../src/mpt/library/**.cpp", "../../src/mpt/library/**.hpp", + "../../src/mpt/main/**.cpp", + "../../src/mpt/main/**.hpp", "../../src/mpt/test/**.cpp", "../../src/mpt/test/**.hpp", "../../src/mpt/uuid_namespace/**.cpp", Modified: trunk/OpenMPT/build/premake/mpt-libopenmpt_test.lua ============================================================================== --- trunk/OpenMPT/build/premake/mpt-libopenmpt_test.lua Mon Sep 23 16:25:29 2024 (r21698) +++ trunk/OpenMPT/build/premake/mpt-libopenmpt_test.lua Mon Sep 23 18:20:59 2024 (r21699) @@ -78,6 +78,8 @@ "../../src/mpt/json/**.hpp", "../../src/mpt/library/**.cpp", "../../src/mpt/library/**.hpp", + "../../src/mpt/main/**.cpp", + "../../src/mpt/main/**.hpp", "../../src/mpt/uuid_namespace/**.cpp", "../../src/mpt/uuid_namespace/**.hpp", "../../test/mpt_tests_crypto.cpp", Modified: trunk/OpenMPT/build/premake/mpt-updatesigntool.lua ============================================================================== --- trunk/OpenMPT/build/premake/mpt-updatesigntool.lua Mon Sep 23 16:25:29 2024 (r21698) +++ trunk/OpenMPT/build/premake/mpt-updatesigntool.lua Mon Sep 23 18:20:59 2024 (r21699) @@ -24,6 +24,8 @@ "../../installer/updatesigntool/*.h", } excludes { + "../../src/mpt/main/**.cpp", + "../../src/mpt/main/**.hpp", "../../src/openmpt/fileformat_base/**.cpp", "../../src/openmpt/fileformat_base/**.hpp", "../../src/openmpt/soundbase/**.cpp", Added: trunk/OpenMPT/src/mpt/main/main.hpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/OpenMPT/src/mpt/main/main.hpp Mon Sep 23 18:20:59 2024 (r21699) @@ -0,0 +1,196 @@ +/* SPDX-License-Identifier: BSL-1.0 OR BSD-3-Clause */ + +#ifndef MPT_MAIN_MAIN_HPP +#define MPT_MAIN_MAIN_HPP + + + +#include "mpt/base/check_platform.hpp" +#include "mpt/base/detect.hpp" +#include "mpt/base/integer.hpp" +#include "mpt/base/macros.hpp" +#include "mpt/base/namespace.hpp" +#include "mpt/string/types.hpp" +#include "mpt/string_transcode/transcode.hpp" + +#include <type_traits> +#include <vector> + +#if MPT_OS_DJGPP +#include <cassert> +#endif // MPT_OS_DJGPP + +#if MPT_OS_DJGPP +#include <crt0.h> +#endif // MPT_OS_DJGPP + +#if MPT_OS_WINDOWS +#include <windows.h> +#endif // MPT_OS_WINDOWS + + + +namespace mpt { +inline namespace MPT_INLINE_NS { + + + +namespace main { + + + +#if MPT_OS_DJGPP +/* Work-around <https://gcc.gnu.org/bugzilla/show_bug.cgi?id=45977> */ +/* clang-format off */ +#define MPT_MAIN_PREFIX \ + extern "C" { \ + int _crt0_startup_flags = 0 \ + | _CRT0_FLAG_NONMOVE_SBRK /* force interrupt compatible allocation */ \ + | _CRT0_DISABLE_SBRK_ADDRESS_WRAP /* force NT compatible allocation */ \ + | _CRT0_FLAG_LOCK_MEMORY /* lock all code and data at program startup */ \ + | 0; \ + } \ +/* clang-format on */ +#endif /* MPT_OS_DJGPP */ + +#if !defined(MPT_MAIN_PREFIX) +#define MPT_MAIN_PREFIX +#endif + + + +#if MPT_OS_WINDOWS && defined(UNICODE) +#define MPT_MAIN_NAME wmain +#elif defined(MPT_OS_WINDOWS) +#define MPT_MAIN_NAME main +#endif + +#if !defined(MPT_MAIN_NAME) +#define MPT_MAIN_NAME main +#endif + + + +#if MPT_OS_WINDOWS && defined(UNICODE) +#define MPT_MAIN_ARGV_TYPE wchar_t +#elif defined(MPT_OS_WINDOWS) +#define MPT_MAIN_ARGV_TYPE char +#endif + +#if !defined(MPT_MAIN_NAME) +#define MPT_MAIN_ARGV_TYPE char +#endif + + + +#if MPT_OS_WINDOWS && (MPT_COMPILER_GCC || MPT_COMPILER_CLANG) +#if defined(UNICODE) +#define MPT_MAIN_DECL extern "C" int wmain(int argc, wchar_t * argv[]); +#endif +#endif + +#if !defined(MPT_MAIN_DECL) +#define MPT_MAIN_DECL +#endif + + + +#if MPT_OS_DJGPP +/* clang-format off */ +#define MPT_MAIN_PROLOG() \ + do { \ + _crt0_startup_flags &= ~_CRT0_FLAG_LOCK_MEMORY; \ + assert(mpt::platform::libc().is_ok()); \ + } while (0) \ +/**/ +/* clang-format on */ +#endif // MPT_OS_DJGPP + +#if !defined(MPT_MAIN_PROLOG) +#define MPT_MAIN_PROLOG() do { } while(0) +#endif + + + +#if MPT_OS_WINDOWS && (MPT_COMPILER_GCC || MPT_COMPILER_CLANG) +#if defined(UNICODE) +#define MPT_MAIN_DEF_PREFIX extern "C" +#endif +#endif // MPT_OS_WINDOWS && (MPT_COMPILER_GCC || MPT_COMPILER_CLANG) + +#if !defined(MPT_MAIN_DEF_PREFIX) +#define MPT_MAIN_DEF_PREFIX +#endif + + + +inline mpt::ustring transcode_arg(char * arg) { + return mpt::transcode<mpt::ustring>(mpt::logical_encoding::locale, arg); +} + +#if !defined(MPT_COMPILER_QUIRK_NO_WCHAR) +inline mpt::ustring transcode_arg(wchar_t * arg) { + return mpt::transcode<mpt::ustring>(arg); +} +#endif + +template <typename Tchar> +inline std::vector<mpt::ustring> transcode_argv(int argc, Tchar * argv[]) { + std::vector<mpt::ustring> args; + args.reserve(argc); + for (int arg = 0; arg < argc; ++arg) { + args.push_back(transcode_arg(argv[arg])); + } + return args; +} + + + +#if !defined(MPT_MAIN_POSTFIX) +#define MPT_MAIN_POSTFIX +#endif + + + +/* clang-format off */ +#define MPT_MAIN_IMPLEMENT_MAIN(ns) \ + MPT_MAIN_PREFIX \ + MPT_MAIN_DECL \ + MPT_MAIN_DEF_PREFIX int MPT_MAIN_NAME(int argc, MPT_MAIN_ARGV_TYPE * argv[]) { \ + MPT_MAIN_PROLOG(); \ + static_assert(std::is_same<decltype(ns::main), mpt::uint8(std::vector<mpt::ustring>)>::value); \ + return static_cast<int>(ns::main(mpt::main::transcode_argv(argc, argv))); \ + } \ + MPT_MAIN_POSTFIX \ +/**/ +/* clang-format on */ + + + +/* clang-format off */ +#define MPT_MAIN_IMPLEMENT_MAIN_NO_ARGS(ns) \ + MPT_MAIN_PREFIX \ + MPT_MAIN_DECL \ + MPT_MAIN_DEF_PREFIX int MPT_MAIN_NAME(int argc, MPT_MAIN_ARGV_TYPE * argv[]) { \ + MPT_MAIN_PROLOG(); \ + static_assert(std::is_same<decltype(ns::main), mpt::uint8(void); \ + MPT_UNUSED(argc); \ + MPT_UNUSED(argv); \ + return static_cast<int>(ns::main()); \ + } \ + MPT_MAIN_POSTFIX \ +/**/ +/* clang-format on */ + + + +} // namespace main + + + +} // namespace MPT_INLINE_NS +} // namespace mpt + + + +#endif // MPT_MAIN_MAIN_HPP |
|
From: <sv...@op...> - 2024-09-23 14:25:37
|
Author: manx Date: Mon Sep 23 16:25:29 2024 New Revision: 21698 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21698 Log: Merged revision(s) 21696 from trunk/OpenMPT: [Fix] mpt/base/math.hpp: Fix header guard name. ........ Modified: branches/OpenMPT-1.30/ (props changed) branches/OpenMPT-1.30/src/mpt/base/math.hpp Modified: branches/OpenMPT-1.30/src/mpt/base/math.hpp ============================================================================== --- branches/OpenMPT-1.30/src/mpt/base/math.hpp Mon Sep 23 16:25:05 2024 (r21697) +++ branches/OpenMPT-1.30/src/mpt/base/math.hpp Mon Sep 23 16:25:29 2024 (r21698) @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: BSL-1.0 OR BSD-3-Clause */ -#ifndef MPT_BASE_EMPTY_HPP -#define MPT_BASE_EMPTY_HPP +#ifndef MPT_BASE_MATH_HPP +#define MPT_BASE_MATH_HPP @@ -85,4 +85,4 @@ -#endif // MPT_BASE_EMPTY_HPP +#endif // MPT_BASE_MATH_HPP |
|
From: <sv...@op...> - 2024-09-23 14:25:17
|
Author: manx Date: Mon Sep 23 16:25:05 2024 New Revision: 21697 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21697 Log: Merged revision(s) 21696 from trunk/OpenMPT: [Fix] mpt/base/math.hpp: Fix header guard name. ........ Modified: branches/OpenMPT-1.31/ (props changed) branches/OpenMPT-1.31/src/mpt/base/math.hpp Modified: branches/OpenMPT-1.31/src/mpt/base/math.hpp ============================================================================== --- branches/OpenMPT-1.31/src/mpt/base/math.hpp Mon Sep 23 16:24:34 2024 (r21696) +++ branches/OpenMPT-1.31/src/mpt/base/math.hpp Mon Sep 23 16:25:05 2024 (r21697) @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: BSL-1.0 OR BSD-3-Clause */ -#ifndef MPT_BASE_EMPTY_HPP -#define MPT_BASE_EMPTY_HPP +#ifndef MPT_BASE_MATH_HPP +#define MPT_BASE_MATH_HPP @@ -85,4 +85,4 @@ -#endif // MPT_BASE_EMPTY_HPP +#endif // MPT_BASE_MATH_HPP |
|
From: <sv...@op...> - 2024-09-23 14:24:45
|
Author: manx Date: Mon Sep 23 16:24:34 2024 New Revision: 21696 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21696 Log: [Fix] mpt/base/math.hpp: Fix header guard name. Modified: trunk/OpenMPT/src/mpt/base/math.hpp Modified: trunk/OpenMPT/src/mpt/base/math.hpp ============================================================================== --- trunk/OpenMPT/src/mpt/base/math.hpp Mon Sep 23 15:50:59 2024 (r21695) +++ trunk/OpenMPT/src/mpt/base/math.hpp Mon Sep 23 16:24:34 2024 (r21696) @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: BSL-1.0 OR BSD-3-Clause */ -#ifndef MPT_BASE_EMPTY_HPP -#define MPT_BASE_EMPTY_HPP +#ifndef MPT_BASE_MATH_HPP +#define MPT_BASE_MATH_HPP @@ -85,4 +85,4 @@ -#endif // MPT_BASE_EMPTY_HPP +#endif // MPT_BASE_MATH_HPP |
|
From: <sv...@op...> - 2024-09-23 13:51:11
|
Author: manx Date: Mon Sep 23 15:50:59 2024 New Revision: 21695 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21695 Log: [Ref] openmpt123: Factor out stdio handling for different modes and platforms. Modified: trunk/OpenMPT/openmpt123/openmpt123.cpp Modified: trunk/OpenMPT/openmpt123/openmpt123.cpp ============================================================================== --- trunk/OpenMPT/openmpt123/openmpt123.cpp Mon Sep 23 15:49:57 2024 (r21694) +++ trunk/OpenMPT/openmpt123/openmpt123.cpp Mon Sep 23 15:50:59 2024 (r21695) @@ -2160,7 +2160,6 @@ return; } tcgetattr( STDIN_FILENO, &saved_attributes ); - atexit( reset_input_mode ); tcgetattr( STDIN_FILENO, &tattr ); tattr.c_lflag &= ~( ICANON | ECHO ); tattr.c_cc[VMIN] = 1; |
|
From: <sv...@op...> - 2024-09-23 13:50:10
|
Author: manx Date: Mon Sep 23 15:49:57 2024 New Revision: 21694 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21694 Log: [Ref] openmpt123: Factor out stdio handling for different modes and platforms. Modified: trunk/OpenMPT/openmpt123/openmpt123.cpp Modified: trunk/OpenMPT/openmpt123/openmpt123.cpp ============================================================================== --- trunk/OpenMPT/openmpt123/openmpt123.cpp Mon Sep 23 15:24:20 2024 (r21693) +++ trunk/OpenMPT/openmpt123/openmpt123.cpp Mon Sep 23 15:49:57 2024 (r21694) @@ -153,30 +153,6 @@ constexpr auto libopenmpt_encoding = mpt::common_encoding::utf8; -#if !MPT_OS_WINDOWS - -static termios saved_attributes; - -static void reset_input_mode() { - tcsetattr( STDIN_FILENO, TCSANOW, &saved_attributes ); -} - -static void set_input_mode() { - termios tattr; - if ( !isatty( STDIN_FILENO ) ) { - return; - } - tcgetattr( STDIN_FILENO, &saved_attributes ); - atexit( reset_input_mode ); - tcgetattr( STDIN_FILENO, &tattr ); - tattr.c_lflag &= ~( ICANON | ECHO ); - tattr.c_cc[VMIN] = 1; - tattr.c_cc[VTIME] = 0; - tcsetattr( STDIN_FILENO, TCSAFLUSH, &tattr ); -} - -#endif - class file_audio_stream_raii : public file_audio_stream_base { private: std::unique_ptr<file_audio_stream_base> impl; @@ -2102,31 +2078,48 @@ } +enum class FILE_mode { + unchanged, + utf8, + binary, +}; + #if MPT_OS_WINDOWS -class FD_utf8_raii { +class FILE_mode_guard { private: FILE * file; int old_mode; public: - FD_utf8_raii( FILE * file, bool set_utf8 ) + FILE_mode_guard( FILE * file, FILE_mode new_mode ) : file(file) , old_mode(-1) { - if ( set_utf8 ) { - fflush( file ); - #if defined(UNICODE) - old_mode = _setmode( _fileno( file ), _O_U8TEXT ); - #else - old_mode = _setmode( _fileno( file ), _O_TEXT ); - #endif - if ( old_mode == -1 ) { - throw exception( MPT_USTRING("failed to set TEXT mode on file descriptor") ); - } + switch (new_mode) { + case FILE_mode::utf8: + fflush( file ); + #if defined(UNICODE) + old_mode = _setmode( _fileno( file ), _O_U8TEXT ); + #else + old_mode = _setmode( _fileno( file ), _O_TEXT ); + #endif + if ( old_mode == -1 ) { + throw exception( MPT_USTRING("failed to set TEXT mode on file descriptor") ); + } + break; + case FILE_mode::binary: + fflush( file ); + old_mode = _setmode( _fileno( file ), _O_BINARY ); + if ( old_mode == -1 ) { + throw exception( MPT_USTRING("failed to set binary mode on file descriptor") ); + } + break; + default: + // nothing + break; } } - ~FD_utf8_raii() - { + ~FILE_mode_guard() { if ( old_mode != -1 ) { fflush( file ); old_mode = _setmode( _fileno( file ), old_mode ); @@ -2134,28 +2127,50 @@ } }; -class FD_binary_raii { -private: - FILE * file; - int old_mode; +class terminal_input_guard { public: - FD_binary_raii( FILE * file, bool set_binary ) - : file(file) - , old_mode(-1) - { - if ( set_binary ) { - fflush( file ); - old_mode = _setmode( _fileno( file ), _O_BINARY ); - if ( old_mode == -1 ) { - throw exception( MPT_USTRING("failed to set binary mode on file descriptor") ); - } - } + terminal_input_guard( bool /* enable */ ) { + return; } - ~FD_binary_raii() + ~terminal_input_guard() = default; +}; + +#else + +class FILE_mode_guard { +public: + FILE_mode_guard( FILE * /* file */, FILE_mode /* new_mode */ ) { - if ( old_mode != -1 ) { - fflush( file ); - old_mode = _setmode( _fileno( file ), old_mode ); + return; + } + ~FILE_mode_guard() = default; +}; + +class terminal_input_guard { +private: + bool changed = false; + termios saved_attributes; +public: + terminal_input_guard( bool enable ) { + if ( !enable ) { + return; + } + termios tattr; + if ( !isatty( STDIN_FILENO ) ) { + return; + } + tcgetattr( STDIN_FILENO, &saved_attributes ); + atexit( reset_input_mode ); + tcgetattr( STDIN_FILENO, &tattr ); + tattr.c_lflag &= ~( ICANON | ECHO ); + tattr.c_cc[VMIN] = 1; + tattr.c_cc[VTIME] = 0; + tcsetattr( STDIN_FILENO, TCSAFLUSH, &tattr ); + changed = true; + } + ~terminal_input_guard() { + if ( changed ) { + tcsetattr(STDIN_FILENO, TCSANOW, &saved_attributes); } } }; @@ -2194,11 +2209,9 @@ } #endif -#if MPT_OS_WINDOWS - FD_utf8_raii stdin_utf8_guard( stdin, true ); - FD_utf8_raii stdout_utf8_guard( stdout, true ); - FD_utf8_raii stderr_utf8_guard( stderr, true ); -#endif + FILE_mode_guard stdin_utf8_guard( stdin, FILE_mode::utf8 ); + FILE_mode_guard stdout_utf8_guard( stdout, FILE_mode::utf8 ); + FILE_mode_guard stderr_utf8_guard( stderr, FILE_mode::utf8 ); textout_dummy dummy_log; #if MPT_OS_WINDOWS && !MPT_WINRT_BEFORE(MPT_WIN_10) #if defined(UNICODE) @@ -2304,23 +2317,13 @@ } // set stdin binary -#if MPT_OS_WINDOWS - FD_binary_raii stdin_guard( stdin, !stdin_can_ui ); -#endif + FILE_mode_guard stdin_guard( stdin, stdin_can_ui ? FILE_mode::unchanged : FILE_mode::binary ); // set stdout binary -#if MPT_OS_WINDOWS - FD_binary_raii stdout_guard( stdout, !stdout_can_ui ); -#endif + FILE_mode_guard stdout_guard( stdout, stdout_can_ui ? FILE_mode::unchanged : FILE_mode::binary ); // setup terminal - #if !MPT_OS_WINDOWS - if ( stdin_can_ui ) { - if ( flags.mode == Mode::UI ) { - set_input_mode(); - } - } - #endif + terminal_input_guard input_guard( stdin_can_ui && ( flags.mode == Mode::UI ) ); textout & log = flags.quiet ? static_cast<textout&>( dummy_log ) : static_cast<textout&>( stdout_can_ui ? std_out : std_err ); |
|
From: <sv...@op...> - 2024-09-23 13:24:32
|
Author: sagamusix Date: Mon Sep 23 15:24:20 2024 New Revision: 21693 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21693 Log: Merged revision(s) 21689, 21692 from trunk/OpenMPT: [Fix] Prevent "Close All" keyboard shortcut from being activated when a dialog is open. It wasn't able to close the files anyway (due to using SafeFileClose call), but it reset the modified status of open files. [Fix] "Close All" menu item didn't show associated keyboard shortcut. [Mod] Make toolbar toggling menu entry titles more obvious, and show available keyboard shortcuts when opening via context menu. [Ref] Unify implementations for toolbar toggling menu. ........ [Ref] DMF: Document different possible header value for tracker ID. ........ Modified: branches/OpenMPT-1.31/ (props changed) branches/OpenMPT-1.31/mptrack/InputHandler.cpp branches/OpenMPT-1.31/mptrack/MainFrm.cpp branches/OpenMPT-1.31/mptrack/Mainfrm.h branches/OpenMPT-1.31/mptrack/mptrack.rc branches/OpenMPT-1.31/mptrack/resource.h branches/OpenMPT-1.31/soundlib/Load_dmf.cpp Modified: branches/OpenMPT-1.31/mptrack/InputHandler.cpp ============================================================================== --- branches/OpenMPT-1.31/mptrack/InputHandler.cpp Mon Sep 23 15:22:44 2024 (r21692) +++ branches/OpenMPT-1.31/mptrack/InputHandler.cpp Mon Sep 23 15:24:20 2024 (r21693) @@ -488,8 +488,8 @@ { ID_VIEW_INSTRUMENTS, kcViewInstruments, _T("&Instruments") }, { ID_VIEW_COMMENTS, kcViewComments, _T("&Comments") }, { ID_VIEW_OPTIONS, kcViewOptions, _T("S&etup") }, - { ID_VIEW_TOOLBAR, kcViewMain, _T("&Main") }, - { IDD_TREEVIEW, kcViewTree, _T("&Tree") }, + { ID_VIEW_TOOLBAR, kcViewMain, _T("Show &Main Toolbar") }, + { IDD_TREEVIEW, kcViewTree, _T("Show &Tree View") }, { ID_PLUGIN_SETUP, kcViewAddPlugin, _T("Pl&ugin Manager") }, { ID_CHANNEL_MANAGER, kcViewChannelManager, _T("Ch&annel Manager") }, { ID_CLIPBOARD_MANAGER, kcToggleClipboardManager, _T("C&lipboard Manager") }, @@ -528,6 +528,7 @@ ID_FILE_OPEN, ID_FILE_APPENDMODULE, ID_FILE_CLOSE, + ID_FILE_CLOSEALL, ID_FILE_SAVE, ID_FILE_SAVE_AS, ID_FILE_SAVEASWAVE, Modified: branches/OpenMPT-1.31/mptrack/MainFrm.cpp ============================================================================== --- branches/OpenMPT-1.31/mptrack/MainFrm.cpp Mon Sep 23 15:22:44 2024 (r21692) +++ branches/OpenMPT-1.31/mptrack/MainFrm.cpp Mon Sep 23 15:24:20 2024 (r21693) @@ -541,24 +541,17 @@ BOOL CMainFrame::PreTranslateMessage(MSG* pMsg) { + // Right-click menu to disable/enable tree view and main toolbar when right-clicking on either the menu strip or main toolbar if((pMsg->message == WM_RBUTTONDOWN) || (pMsg->message == WM_NCRBUTTONDOWN)) { - CWnd* pWnd = CWnd::FromHandlePermanent(pMsg->hwnd); - CControlBar* pBar = NULL; - HWND hwnd = (pWnd) ? pWnd->m_hWnd : NULL; - - if ((hwnd) && (pMsg->message == WM_RBUTTONDOWN)) pBar = DYNAMIC_DOWNCAST(CControlBar, pWnd); - if ((pBar != NULL) || ((pMsg->message == WM_NCRBUTTONDOWN) && (pMsg->wParam == HTMENU))) + CControlBar *pBar = nullptr; + if(CWnd *pWnd = CWnd::FromHandlePermanent(pMsg->hwnd); pWnd && (pMsg->message == WM_RBUTTONDOWN)) + pBar = dynamic_cast<CControlBar *>(pWnd); + if(pBar != nullptr || (pMsg->message == WM_NCRBUTTONDOWN && pMsg->wParam == HTMENU)) { - CMenu Menu; CPoint pt; - GetCursorPos(&pt); - if (Menu.LoadMenu(IDR_TOOLBARS)) - { - CMenu* pSubMenu = Menu.GetSubMenu(0); - if (pSubMenu!=NULL) pSubMenu->TrackPopupMenu(TPM_LEFTALIGN | TPM_RIGHTBUTTON,pt.x,pt.y,this); - } + ShowToolbarMenu(pt); } } return CMDIFrameWnd::PreTranslateMessage(pMsg); @@ -2430,13 +2423,19 @@ void CMainFrame::OnRButtonDown(UINT, CPoint pt) { - CMenu Menu; ClientToScreen(&pt); - if (Menu.LoadMenu(IDR_TOOLBARS)) - { - CMenu *pSubMenu = Menu.GetSubMenu(0); - if (pSubMenu != nullptr) pSubMenu->TrackPopupMenu(TPM_LEFTALIGN | TPM_RIGHTBUTTON, pt.x, pt.y, this); - } + ShowToolbarMenu(pt); +} + + +void CMainFrame::ShowToolbarMenu(CPoint screenPt) +{ + CMenu menu; + if(!menu.CreatePopupMenu()) + return; + menu.AppendMenu(MF_STRING, ID_VIEW_TOOLBAR, m_InputHandler->GetMenuText(ID_VIEW_TOOLBAR)); + menu.AppendMenu(MF_STRING, IDD_TREEVIEW, m_InputHandler->GetMenuText(IDD_TREEVIEW)); + menu.TrackPopupMenu(TPM_LEFTALIGN | TPM_RIGHTBUTTON, screenPt.x, screenPt.y, this); } @@ -2447,19 +2446,23 @@ case kcViewTree: OnBarCheck(IDD_TREEVIEW); break; case kcViewOptions: OnViewOptions(); break; case kcViewMain: OnBarCheck(ID_VIEW_TOOLBAR); break; - case kcFileImportMidiLib: OnImportMidiLib(); break; + case kcFileImportMidiLib: OnImportMidiLib(); break; case kcFileAddSoundBank: OnAddDlsBank(); break; - case kcPauseSong: OnPlayerPause(); break; - case kcPrevOctave: OnPrevOctave(); break; - case kcNextOctave: OnNextOctave(); break; - case kcFileNew: theApp.OnFileNew(); break; - case kcFileOpen: theApp.OnFileOpen(); break; - case kcMidiRecord: OnMidiRecord(); break; - case kcHelp: OnHelp(); break; + case kcPauseSong: OnPlayerPause(); break; + case kcPrevOctave: OnPrevOctave(); break; + case kcNextOctave: OnNextOctave(); break; + case kcFileNew: theApp.OnFileNew(); break; + case kcFileOpen: theApp.OnFileOpen(); break; + case kcMidiRecord: OnMidiRecord(); break; + case kcHelp: OnHelp(); break; case kcViewAddPlugin: OnPluginManager(); break; - case kcNextDocument: MDINext(); break; - case kcPrevDocument: MDIPrev(); break; - case kcFileCloseAll: theApp.OnFileCloseAll(); break; + case kcNextDocument: MDINext(); break; + case kcPrevDocument: MDIPrev(); break; + case kcFileCloseAll: + if(GetActiveWindow() != this) + return kcNull; + theApp.OnFileCloseAll(); + break; //D'oh!! moddoc isn't a CWnd so we have to handle its messages and pass them on. Modified: branches/OpenMPT-1.31/mptrack/Mainfrm.h ============================================================================== --- branches/OpenMPT-1.31/mptrack/Mainfrm.h Mon Sep 23 15:22:44 2024 (r21692) +++ branches/OpenMPT-1.31/mptrack/Mainfrm.h Mon Sep 23 15:24:20 2024 (r21693) @@ -493,6 +493,8 @@ /// Opens either template or example menu item. void OpenMenuItemFile(const UINT nId, const bool isTemplateFile); + void ShowToolbarMenu(CPoint screenPt); + public: void UpdateMRUList(); Modified: branches/OpenMPT-1.31/mptrack/mptrack.rc ============================================================================== --- branches/OpenMPT-1.31/mptrack/mptrack.rc Mon Sep 23 15:22:44 2024 (r21692) +++ branches/OpenMPT-1.31/mptrack/mptrack.rc Mon Sep 23 15:24:20 2024 (r21693) @@ -2870,15 +2870,6 @@ END END -IDR_TOOLBARS MENU -BEGIN - POPUP "&ToolBars" - BEGIN - MENUITEM "&Main", ID_VIEW_TOOLBAR - MENUITEM "&Tree", IDD_TREEVIEW - END -END - IDR_ENVELOPES MENU BEGIN POPUP "&Envelope" Modified: branches/OpenMPT-1.31/mptrack/resource.h ============================================================================== --- branches/OpenMPT-1.31/mptrack/resource.h Mon Sep 23 15:22:44 2024 (r21692) +++ branches/OpenMPT-1.31/mptrack/resource.h Mon Sep 23 15:24:20 2024 (r21693) @@ -31,7 +31,6 @@ #define IDD_OPTIONS_EFFECTS 133 #define IDR_MAINFRAME 200 #define IDR_MODULETYPE 201 -#define IDR_TOOLBARS 202 #define ID_PATTERN_CHANNELMANAGER 202 #define IDR_ENVELOPES 203 #define ID_INDICATOR_CPU 203 Modified: branches/OpenMPT-1.31/soundlib/Load_dmf.cpp ============================================================================== --- branches/OpenMPT-1.31/soundlib/Load_dmf.cpp Mon Sep 23 15:22:44 2024 (r21692) +++ branches/OpenMPT-1.31/soundlib/Load_dmf.cpp Mon Sep 23 15:24:20 2024 (r21693) @@ -24,7 +24,7 @@ { char signature[4]; // "DDMF" uint8 version; // 1 - 7 are beta versions, 8 is the official thing, 10 is xtracker32 - char tracker[8]; // "XTRACKER" + char tracker[8]; // "XTRACKER", or "SCREAM 3" when converting from S3M, etc. char songname[30]; char composer[20]; uint8 creationDay; |
|
From: <sv...@op...> - 2024-09-23 13:22:51
|
Author: sagamusix Date: Mon Sep 23 15:22:44 2024 New Revision: 21692 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21692 Log: [Ref] DMF: Document different possible header value for tracker ID. Modified: trunk/OpenMPT/soundlib/Load_dmf.cpp Modified: trunk/OpenMPT/soundlib/Load_dmf.cpp ============================================================================== --- trunk/OpenMPT/soundlib/Load_dmf.cpp Mon Sep 23 15:20:13 2024 (r21691) +++ trunk/OpenMPT/soundlib/Load_dmf.cpp Mon Sep 23 15:22:44 2024 (r21692) @@ -24,7 +24,7 @@ { char signature[4]; // "DDMF" uint8 version; // 1 - 7 are beta versions, 8 is the official thing, 10 is xtracker32 - char tracker[8]; // "XTRACKER" + char tracker[8]; // "XTRACKER", or "SCREAM 3" when converting from S3M, etc. char songname[30]; char composer[20]; uint8 creationDay; |
|
From: <sv...@op...> - 2024-09-23 13:20:25
|
Author: sagamusix Date: Mon Sep 23 15:20:13 2024 New Revision: 21691 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21691 Log: [Ref] Remove final inclusion of resource.h in a header file. Modified: trunk/OpenMPT/mptrack/AbstractVstEditor.cpp trunk/OpenMPT/mptrack/Childfrm.cpp trunk/OpenMPT/mptrack/Ctrl_com.cpp trunk/OpenMPT/mptrack/Ctrl_gen.cpp trunk/OpenMPT/mptrack/Ctrl_ins.cpp trunk/OpenMPT/mptrack/Ctrl_seq.cpp trunk/OpenMPT/mptrack/Ctrl_smp.cpp trunk/OpenMPT/mptrack/EffectVis.cpp trunk/OpenMPT/mptrack/Globals.cpp trunk/OpenMPT/mptrack/Globals.h trunk/OpenMPT/mptrack/Moddoc.cpp trunk/OpenMPT/mptrack/Mptrack.cpp trunk/OpenMPT/mptrack/PatternClipboard.cpp trunk/OpenMPT/mptrack/View_ins.cpp trunk/OpenMPT/mptrack/View_pat.cpp trunk/OpenMPT/mptrack/View_smp.cpp trunk/OpenMPT/mptrack/View_tre.cpp trunk/OpenMPT/mptrack/view_com.cpp trunk/OpenMPT/mptrack/view_com.h Modified: trunk/OpenMPT/mptrack/AbstractVstEditor.cpp ============================================================================== --- trunk/OpenMPT/mptrack/AbstractVstEditor.cpp Mon Sep 23 15:04:20 2024 (r21690) +++ trunk/OpenMPT/mptrack/AbstractVstEditor.cpp Mon Sep 23 15:20:13 2024 (r21691) @@ -18,6 +18,7 @@ #include "Mainfrm.h" #include "Mptrack.h" #include "Reporting.h" +#include "resource.h" #include "VstPresets.h" #include "Vstplug.h" #include "../common/FileReader.h" Modified: trunk/OpenMPT/mptrack/Childfrm.cpp ============================================================================== --- trunk/OpenMPT/mptrack/Childfrm.cpp Mon Sep 23 15:04:20 2024 (r21690) +++ trunk/OpenMPT/mptrack/Childfrm.cpp Mon Sep 23 15:20:13 2024 (r21691) @@ -18,6 +18,7 @@ #include "Mainfrm.h" #include "Moddoc.h" #include "Mptrack.h" +#include "resource.h" #include "view_com.h" #include "View_gen.h" #include "View_ins.h" Modified: trunk/OpenMPT/mptrack/Ctrl_com.cpp ============================================================================== --- trunk/OpenMPT/mptrack/Ctrl_com.cpp Mon Sep 23 15:04:20 2024 (r21690) +++ trunk/OpenMPT/mptrack/Ctrl_com.cpp Mon Sep 23 15:20:13 2024 (r21691) @@ -16,6 +16,7 @@ #include "Mainfrm.h" #include "Moddoc.h" #include "Mptrack.h" +#include "resource.h" #include "TrackerSettings.h" #include "view_com.h" #include "../soundlib/mod_specifications.h" Modified: trunk/OpenMPT/mptrack/Ctrl_gen.cpp ============================================================================== --- trunk/OpenMPT/mptrack/Ctrl_gen.cpp Mon Sep 23 15:04:20 2024 (r21690) +++ trunk/OpenMPT/mptrack/Ctrl_gen.cpp Mon Sep 23 15:20:13 2024 (r21691) @@ -17,6 +17,7 @@ #include "Mainfrm.h" #include "Moddoc.h" #include "Mptrack.h" +#include "resource.h" #include "TrackerSettings.h" #include "View_gen.h" #include "WindowMessages.h" Modified: trunk/OpenMPT/mptrack/Ctrl_ins.cpp ============================================================================== --- trunk/OpenMPT/mptrack/Ctrl_ins.cpp Mon Sep 23 15:04:20 2024 (r21690) +++ trunk/OpenMPT/mptrack/Ctrl_ins.cpp Mon Sep 23 15:20:13 2024 (r21691) @@ -21,6 +21,7 @@ #include "Moddoc.h" #include "Mptrack.h" #include "Reporting.h" +#include "resource.h" #include "SelectPluginDialog.h" #include "TrackerSettings.h" #include "TuningDialog.h" Modified: trunk/OpenMPT/mptrack/Ctrl_seq.cpp ============================================================================== --- trunk/OpenMPT/mptrack/Ctrl_seq.cpp Mon Sep 23 15:04:20 2024 (r21690) +++ trunk/OpenMPT/mptrack/Ctrl_seq.cpp Mon Sep 23 15:20:13 2024 (r21691) @@ -19,6 +19,7 @@ #include "MPTrackUtil.h" #include "PatternClipboard.h" #include "Reporting.h" +#include "resource.h" #include "TrackerSettings.h" #include "WindowMessages.h" #include "../soundlib/mod_specifications.h" Modified: trunk/OpenMPT/mptrack/Ctrl_smp.cpp ============================================================================== --- trunk/OpenMPT/mptrack/Ctrl_smp.cpp Mon Sep 23 15:04:20 2024 (r21690) +++ trunk/OpenMPT/mptrack/Ctrl_smp.cpp Mon Sep 23 15:20:13 2024 (r21691) @@ -24,6 +24,7 @@ #include "ProgressDialog.h" #include "PSRatioCalc.h" #include "Reporting.h" +#include "resource.h" #include "SampleEditorDialogs.h" #include "TrackerSettings.h" #include "View_smp.h" Modified: trunk/OpenMPT/mptrack/EffectVis.cpp ============================================================================== --- trunk/OpenMPT/mptrack/EffectVis.cpp Mon Sep 23 15:04:20 2024 (r21690) +++ trunk/OpenMPT/mptrack/EffectVis.cpp Mon Sep 23 15:20:13 2024 (r21691) @@ -16,6 +16,7 @@ #include "Mainfrm.h" #include "Moddoc.h" #include "Mptrack.h" +#include "resource.h" #include "View_pat.h" Modified: trunk/OpenMPT/mptrack/Globals.cpp ============================================================================== --- trunk/OpenMPT/mptrack/Globals.cpp Mon Sep 23 15:04:20 2024 (r21690) +++ trunk/OpenMPT/mptrack/Globals.cpp Mon Sep 23 15:20:13 2024 (r21691) @@ -22,6 +22,7 @@ #include "Mainfrm.h" #include "Moddoc.h" #include "Mptrack.h" +#include "resource.h" #include "TrackerSettings.h" #include "../soundlib/mod_specifications.h" @@ -109,6 +110,18 @@ } +afx_msg void CModControlDlg::OnEditCut() { if(m_hWndView) ::SendMessage(m_hWndView, WM_COMMAND, ID_EDIT_CUT, 0); } +afx_msg void CModControlDlg::OnEditCopy() { if(m_hWndView) ::SendMessage(m_hWndView, WM_COMMAND, ID_EDIT_COPY, 0); } +afx_msg void CModControlDlg::OnEditPaste() { if(m_hWndView) ::SendMessage(m_hWndView, WM_COMMAND, ID_EDIT_PASTE, 0); } +afx_msg void CModControlDlg::OnEditMixPaste() { if(m_hWndView) ::SendMessage(m_hWndView, WM_COMMAND, ID_EDIT_MIXPASTE, 0); } +afx_msg void CModControlDlg::OnEditMixPasteITStyle() { if(m_hWndView) ::SendMessage(m_hWndView, WM_COMMAND, ID_EDIT_MIXPASTE_ITSTYLE, 0); } +afx_msg void CModControlDlg::OnEditPasteFlood() { if(m_hWndView) ::SendMessage(m_hWndView, WM_COMMAND, ID_EDIT_PASTEFLOOD, 0); } +afx_msg void CModControlDlg::OnEditPushForwardPaste() { if(m_hWndView) ::SendMessage(m_hWndView, WM_COMMAND, ID_EDIT_PUSHFORWARDPASTE, 0); } +afx_msg void CModControlDlg::OnEditFind() { if(m_hWndView) ::SendMessage(m_hWndView, WM_COMMAND, ID_EDIT_FIND, 0); } +afx_msg void CModControlDlg::OnEditFindNext() { if(m_hWndView) ::SendMessage(m_hWndView, WM_COMMAND, ID_EDIT_FINDNEXT, 0); } +afx_msg void CModControlDlg::OnSwitchToView() { if(m_hWndView) ::PostMessage(m_hWndView, WM_MOD_VIEWMSG, VIEWMSG_SETFOCUS, 0); } + + LRESULT CModControlDlg::OnModCtrlMsg(WPARAM wParam, LPARAM lParam) { switch(wParam) @@ -513,6 +526,15 @@ return 0; } +afx_msg void CModControlView::OnEditCut() { if(m_hWndView) ::SendMessage(m_hWndView, WM_COMMAND, ID_EDIT_CUT, 0); } +afx_msg void CModControlView::OnEditCopy() { if(m_hWndView) ::SendMessage(m_hWndView, WM_COMMAND, ID_EDIT_COPY, 0); } +afx_msg void CModControlView::OnEditPaste() { if(m_hWndView) ::SendMessage(m_hWndView, WM_COMMAND, ID_EDIT_PASTE, 0); } +afx_msg void CModControlView::OnEditMixPaste() { if(m_hWndView) ::SendMessage(m_hWndView, WM_COMMAND, ID_EDIT_MIXPASTE, 0); } +afx_msg void CModControlView::OnEditMixPasteITStyle() { if(m_hWndView) ::SendMessage(m_hWndView, WM_COMMAND, ID_EDIT_MIXPASTE_ITSTYLE, 0); } +afx_msg void CModControlView::OnEditFind() { if(m_hWndView) ::SendMessage(m_hWndView, WM_COMMAND, ID_EDIT_FIND, 0); } +afx_msg void CModControlView::OnEditFindNext() { if(m_hWndView) ::SendMessage(m_hWndView, WM_COMMAND, ID_EDIT_FINDNEXT, 0); } +afx_msg void CModControlView::OnSwitchToView() { if(m_hWndView) ::PostMessage(m_hWndView, WM_MOD_VIEWMSG, VIEWMSG_SETFOCUS, 0); } + LRESULT CModControlView::OnModCtrlMsg(WPARAM wParam, LPARAM lParam) { Modified: trunk/OpenMPT/mptrack/Globals.h ============================================================================== --- trunk/OpenMPT/mptrack/Globals.h Mon Sep 23 15:04:20 2024 (r21690) +++ trunk/OpenMPT/mptrack/Globals.h Mon Sep 23 15:20:13 2024 (r21691) @@ -12,7 +12,6 @@ #include "openmpt/all/BuildSettings.hpp" #include "DialogBase.h" -#include "resource.h" #include "Settings.h" #include "UpdateHints.h" #include "WindowMessages.h" @@ -67,16 +66,16 @@ void ForgetLastFocusItem() { m_lastFocusItem = nullptr; } void RestoreLastFocusItem(); - afx_msg void OnEditCut() { if (m_hWndView) ::SendMessage(m_hWndView, WM_COMMAND, ID_EDIT_CUT, 0); } - afx_msg void OnEditCopy() { if (m_hWndView) ::SendMessage(m_hWndView, WM_COMMAND, ID_EDIT_COPY, 0); } - afx_msg void OnEditPaste() { if (m_hWndView) ::SendMessage(m_hWndView, WM_COMMAND, ID_EDIT_PASTE, 0); } - afx_msg void OnEditMixPaste() { if (m_hWndView) ::SendMessage(m_hWndView, WM_COMMAND, ID_EDIT_MIXPASTE, 0); } - afx_msg void OnEditMixPasteITStyle() { if (m_hWndView) ::SendMessage(m_hWndView, WM_COMMAND, ID_EDIT_MIXPASTE_ITSTYLE, 0); } - afx_msg void OnEditPasteFlood() { if (m_hWndView) ::SendMessage(m_hWndView, WM_COMMAND, ID_EDIT_PASTEFLOOD, 0); } - afx_msg void OnEditPushForwardPaste() { if (m_hWndView) ::SendMessage(m_hWndView, WM_COMMAND, ID_EDIT_PUSHFORWARDPASTE, 0); } - afx_msg void OnEditFind() { if (m_hWndView) ::SendMessage(m_hWndView, WM_COMMAND, ID_EDIT_FIND, 0); } - afx_msg void OnEditFindNext() { if (m_hWndView) ::SendMessage(m_hWndView, WM_COMMAND, ID_EDIT_FINDNEXT, 0); } - afx_msg void OnSwitchToView() { if (m_hWndView) ::PostMessage(m_hWndView, WM_MOD_VIEWMSG, VIEWMSG_SETFOCUS, 0); } + afx_msg void OnEditCut(); + afx_msg void OnEditCopy(); + afx_msg void OnEditPaste(); + afx_msg void OnEditMixPaste(); + afx_msg void OnEditMixPasteITStyle(); + afx_msg void OnEditPasteFlood(); + afx_msg void OnEditPushForwardPaste(); + afx_msg void OnEditFind(); + afx_msg void OnEditFindNext(); + afx_msg void OnSwitchToView(); //{{AFX_VIRTUAL(CModControlDlg) void OnOK() override {} @@ -167,14 +166,14 @@ afx_msg void OnSize(UINT nType, int cx, int cy); afx_msg void OnDestroy(); afx_msg void OnTabSelchange(NMHDR* pNMHDR, LRESULT* pResult); - afx_msg void OnEditCut() { if (m_hWndView) ::SendMessage(m_hWndView, WM_COMMAND, ID_EDIT_CUT, 0); } - afx_msg void OnEditCopy() { if (m_hWndView) ::SendMessage(m_hWndView, WM_COMMAND, ID_EDIT_COPY, 0); } - afx_msg void OnEditPaste() { if (m_hWndView) ::SendMessage(m_hWndView, WM_COMMAND, ID_EDIT_PASTE, 0); } - afx_msg void OnEditMixPaste() { if (m_hWndView) ::SendMessage(m_hWndView, WM_COMMAND, ID_EDIT_MIXPASTE, 0); } //rewbs.mixPaste - afx_msg void OnEditMixPasteITStyle() { if (m_hWndView) ::SendMessage(m_hWndView, WM_COMMAND, ID_EDIT_MIXPASTE_ITSTYLE, 0); } - afx_msg void OnEditFind() { if (m_hWndView) ::SendMessage(m_hWndView, WM_COMMAND, ID_EDIT_FIND, 0); } - afx_msg void OnEditFindNext() { if (m_hWndView) ::SendMessage(m_hWndView, WM_COMMAND, ID_EDIT_FINDNEXT, 0); } - afx_msg void OnSwitchToView() { if (m_hWndView) ::PostMessage(m_hWndView, WM_MOD_VIEWMSG, VIEWMSG_SETFOCUS, 0); } + afx_msg void OnEditCut(); + afx_msg void OnEditCopy(); + afx_msg void OnEditPaste(); + afx_msg void OnEditMixPaste(); + afx_msg void OnEditMixPasteITStyle(); + afx_msg void OnEditFind(); + afx_msg void OnEditFindNext(); + afx_msg void OnSwitchToView(); afx_msg LRESULT OnActivateModView(WPARAM, LPARAM); afx_msg LRESULT OnModCtrlMsg(WPARAM wParam, LPARAM lParam); afx_msg LRESULT OnGetToolTipText(WPARAM, LPARAM); Modified: trunk/OpenMPT/mptrack/Moddoc.cpp ============================================================================== --- trunk/OpenMPT/mptrack/Moddoc.cpp Mon Sep 23 15:04:20 2024 (r21690) +++ trunk/OpenMPT/mptrack/Moddoc.cpp Mon Sep 23 15:20:13 2024 (r21691) @@ -27,6 +27,7 @@ #include "ModDocTemplate.h" #include "Mpdlgs.h" #include "Reporting.h" +#include "resource.h" #include "openmpt/streamencoder/StreamEncoderAU.hpp" #include "openmpt/streamencoder/StreamEncoderFLAC.hpp" #include "openmpt/streamencoder/StreamEncoderMP3.hpp" Modified: trunk/OpenMPT/mptrack/Mptrack.cpp ============================================================================== --- trunk/OpenMPT/mptrack/Mptrack.cpp Mon Sep 23 15:04:20 2024 (r21690) +++ trunk/OpenMPT/mptrack/Mptrack.cpp Mon Sep 23 15:20:13 2024 (r21691) @@ -28,6 +28,7 @@ #include "MPTrackWine.h" #include "PlugNotFoundDlg.h" #include "Reporting.h" +#include "resource.h" #include "TrackerSettings.h" #include "UpdateCheck.h" #include "WelcomeDialog.h" Modified: trunk/OpenMPT/mptrack/PatternClipboard.cpp ============================================================================== --- trunk/OpenMPT/mptrack/PatternClipboard.cpp Mon Sep 23 15:04:20 2024 (r21690) +++ trunk/OpenMPT/mptrack/PatternClipboard.cpp Mon Sep 23 15:20:13 2024 (r21691) @@ -14,6 +14,7 @@ #include "Mainfrm.h" #include "Moddoc.h" #include "Clipboard.h" +#include "resource.h" #include "View_pat.h" #include "../soundlib/mod_specifications.h" #include "../soundlib/Tables.h" Modified: trunk/OpenMPT/mptrack/View_ins.cpp ============================================================================== --- trunk/OpenMPT/mptrack/View_ins.cpp Mon Sep 23 15:04:20 2024 (r21690) +++ trunk/OpenMPT/mptrack/View_ins.cpp Mon Sep 23 15:20:13 2024 (r21691) @@ -23,6 +23,7 @@ #include "Moddoc.h" #include "Mptrack.h" #include "Reporting.h" +#include "resource.h" #include "ScaleEnvPointsDlg.h" #include "WindowMessages.h" #include "../common/mptStringBuffer.h" Modified: trunk/OpenMPT/mptrack/View_pat.cpp ============================================================================== --- trunk/OpenMPT/mptrack/View_pat.cpp Mon Sep 23 15:04:20 2024 (r21690) +++ trunk/OpenMPT/mptrack/View_pat.cpp Mon Sep 23 15:20:13 2024 (r21691) @@ -25,6 +25,7 @@ #include "PatternFont.h" #include "PatternGotoDialog.h" #include "Reporting.h" +#include "resource.h" #include "SampleEditorDialogs.h" // For amplification dialog (which is re-used from sample editor) #include "WindowMessages.h" #include "WindowMessages.h" Modified: trunk/OpenMPT/mptrack/View_smp.cpp ============================================================================== --- trunk/OpenMPT/mptrack/View_smp.cpp Mon Sep 23 15:04:20 2024 (r21690) +++ trunk/OpenMPT/mptrack/View_smp.cpp Mon Sep 23 15:20:13 2024 (r21691) @@ -24,6 +24,7 @@ #include "Mptrack.h" #include "OPLInstrDlg.h" #include "Reporting.h" +#include "resource.h" #include "SampleEditorDialogs.h" #include "WindowMessages.h" #include "../common/FileReader.h" Modified: trunk/OpenMPT/mptrack/View_tre.cpp ============================================================================== --- trunk/OpenMPT/mptrack/View_tre.cpp Mon Sep 23 15:04:20 2024 (r21690) +++ trunk/OpenMPT/mptrack/View_tre.cpp Mon Sep 23 15:20:13 2024 (r21691) @@ -25,6 +25,7 @@ #include "Mainfrm.h" #include "Moddoc.h" #include "Reporting.h" +#include "resource.h" #include "TrackerSettings.h" #include "WindowMessages.h" #include "../common/FileReader.h" Modified: trunk/OpenMPT/mptrack/view_com.cpp ============================================================================== --- trunk/OpenMPT/mptrack/view_com.cpp Mon Sep 23 15:04:20 2024 (r21690) +++ trunk/OpenMPT/mptrack/view_com.cpp Mon Sep 23 15:20:13 2024 (r21691) @@ -21,6 +21,7 @@ #include "Mainfrm.h" #include "Moddoc.h" #include "Mptrack.h" +#include "resource.h" #include "WindowMessages.h" #include "../common/mptStringBuffer.h" #include "../soundlib/mod_specifications.h" @@ -617,6 +618,11 @@ } +void CViewComments::OnShowSamples() { SwitchToList(IDC_LIST_SAMPLES); } +void CViewComments::OnShowInstruments() { SwitchToList(IDC_LIST_INSTRUMENTS); } +void CViewComments::OnShowPatterns() { SwitchToList(IDC_LIST_PATTERNS); } + + bool CViewComments::SwitchToList(int list) { if(list == m_nListId) Modified: trunk/OpenMPT/mptrack/view_com.h ============================================================================== --- trunk/OpenMPT/mptrack/view_com.h Mon Sep 23 15:04:20 2024 (r21690) +++ trunk/OpenMPT/mptrack/view_com.h Mon Sep 23 15:20:13 2024 (r21691) @@ -54,9 +54,9 @@ // cppcheck-suppress duplInheritedMember afx_msg void OnDestroy(); afx_msg void OnSize(UINT nType, int cx, int cy); - afx_msg void OnShowSamples() { SwitchToList(IDC_LIST_SAMPLES); } - afx_msg void OnShowInstruments() { SwitchToList(IDC_LIST_INSTRUMENTS); } - afx_msg void OnShowPatterns() { SwitchToList(IDC_LIST_PATTERNS); } + afx_msg void OnShowSamples(); + afx_msg void OnShowInstruments(); + afx_msg void OnShowPatterns(); afx_msg void OnEndLabelEdit(LPNMHDR pnmhdr, LRESULT *pLResult); afx_msg void OnBeginLabelEdit(LPNMHDR pnmhdr, LRESULT *pLResult); afx_msg void OnDblClickListItem(NMHDR *, LRESULT *); |
|
From: <sv...@op...> - 2024-09-23 13:04:28
|
Author: sagamusix Date: Mon Sep 23 15:04:20 2024 New Revision: 21690 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21690 Log: [Ref] Remove resource.h inclusion from various header files. Modified: trunk/OpenMPT/mptrack/ChannelManagerDlg.cpp trunk/OpenMPT/mptrack/Mod2wave.cpp trunk/OpenMPT/mptrack/Modedit.cpp trunk/OpenMPT/mptrack/Mpdlgs.cpp trunk/OpenMPT/mptrack/Mpdlgs.h trunk/OpenMPT/mptrack/PatternEditorDialogs.cpp trunk/OpenMPT/mptrack/PatternEditorDialogs.h trunk/OpenMPT/mptrack/PatternFindReplaceDlg.cpp trunk/OpenMPT/mptrack/PatternFindReplaceDlg.h trunk/OpenMPT/mptrack/SampleEditorDialogs.cpp trunk/OpenMPT/mptrack/SampleEditorDialogs.h trunk/OpenMPT/mptrack/TrackerSettings.cpp trunk/OpenMPT/mptrack/UpdateCheck.cpp trunk/OpenMPT/mptrack/View_gen.cpp trunk/OpenMPT/mptrack/View_gen.h trunk/OpenMPT/mptrack/dlg_misc.cpp trunk/OpenMPT/mptrack/dlg_misc.h Modified: trunk/OpenMPT/mptrack/ChannelManagerDlg.cpp ============================================================================== --- trunk/OpenMPT/mptrack/ChannelManagerDlg.cpp Mon Sep 23 14:24:15 2024 (r21689) +++ trunk/OpenMPT/mptrack/ChannelManagerDlg.cpp Mon Sep 23 15:04:20 2024 (r21690) @@ -13,6 +13,7 @@ #include "Mainfrm.h" #include "Moddoc.h" #include "MPTrackUtil.h" +#include "resource.h" #include "UpdateHints.h" #include "../common/mptStringBuffer.h" Modified: trunk/OpenMPT/mptrack/Mod2wave.cpp ============================================================================== --- trunk/OpenMPT/mptrack/Mod2wave.cpp Mon Sep 23 14:24:15 2024 (r21689) +++ trunk/OpenMPT/mptrack/Mod2wave.cpp Mon Sep 23 15:04:20 2024 (r21690) @@ -15,6 +15,7 @@ #include "Mpdlgs.h" #include "Mptrack.h" #include "Reporting.h" +#include "resource.h" #include "Sndfile.h" #include "WAVTools.h" #include "../common/Dither.h" Modified: trunk/OpenMPT/mptrack/Modedit.cpp ============================================================================== --- trunk/OpenMPT/mptrack/Modedit.cpp Mon Sep 23 14:24:15 2024 (r21689) +++ trunk/OpenMPT/mptrack/Modedit.cpp Mon Sep 23 15:04:20 2024 (r21690) @@ -16,6 +16,7 @@ #include "Moddoc.h" #include "Mptrack.h" #include "Reporting.h" +#include "resource.h" #include "TrackerSettings.h" #include "../common/misc_util.h" #include "../common/mptFileIO.h" Modified: trunk/OpenMPT/mptrack/Mpdlgs.cpp ============================================================================== --- trunk/OpenMPT/mptrack/Mpdlgs.cpp Mon Sep 23 14:24:15 2024 (r21689) +++ trunk/OpenMPT/mptrack/Mpdlgs.cpp Mon Sep 23 15:04:20 2024 (r21690) @@ -17,6 +17,7 @@ #include "Moddoc.h" #include "Mptrack.h" #include "Reporting.h" +#include "resource.h" #include "Sndfile.h" #include "WindowMessages.h" #include "../common/Dither.h" @@ -1025,6 +1026,10 @@ } +COptionsMixer::COptionsMixer() : CPropertyPage{IDD_OPTIONS_MIXER} {} + + + BOOL COptionsMixer::OnInitDialog() { CPropertyPage::OnInitDialog(); @@ -1327,25 +1332,25 @@ #ifndef NO_EQ // EQ ON_WM_VSCROLL() - ON_COMMAND(IDC_CHECK3, &COptionsPlayer::OnSettingsChanged) - ON_COMMAND(IDC_BUTTON1, &COptionsPlayer::OnEqUser1) - ON_COMMAND(IDC_BUTTON2, &COptionsPlayer::OnEqUser2) - ON_COMMAND(IDC_BUTTON3, &COptionsPlayer::OnEqUser3) - ON_COMMAND(IDC_BUTTON4, &COptionsPlayer::OnEqUser4) - ON_COMMAND(IDC_BUTTON5, &COptionsPlayer::OnSavePreset) - ON_COMMAND_RANGE(ID_EQSLIDER_BASE, ID_EQSLIDER_BASE + MAX_EQ_BANDS, &COptionsPlayer::OnSliderMenu) - ON_COMMAND_RANGE(ID_EQMENU_BASE, ID_EQMENU_BASE + EQ_MAX_FREQS, &COptionsPlayer::OnSliderFreq) + ON_COMMAND(IDC_CHECK3, &COptionsPlayer::OnSettingsChanged) + ON_COMMAND(IDC_BUTTON1, &COptionsPlayer::OnEqUser1) + ON_COMMAND(IDC_BUTTON2, &COptionsPlayer::OnEqUser2) + ON_COMMAND(IDC_BUTTON3, &COptionsPlayer::OnEqUser3) + ON_COMMAND(IDC_BUTTON4, &COptionsPlayer::OnEqUser4) + ON_COMMAND(IDC_BUTTON5, &COptionsPlayer::OnSavePreset) + ON_COMMAND_RANGE(ID_EQSLIDER_BASE, ID_EQSLIDER_BASE + MAX_EQ_BANDS, &COptionsPlayer::OnSliderMenu) + ON_COMMAND_RANGE(ID_EQMENU_BASE, ID_EQMENU_BASE + EQ_MAX_FREQS, &COptionsPlayer::OnSliderFreq) #endif // !NO_EQ // DSP ON_WM_HSCROLL() - ON_CBN_SELCHANGE(IDC_COMBO2, &COptionsPlayer::OnSettingsChanged) - ON_COMMAND(IDC_CHECK1, &COptionsPlayer::OnSettingsChanged) - ON_COMMAND(IDC_CHECK2, &COptionsPlayer::OnSettingsChanged) - ON_COMMAND(IDC_CHECK4, &COptionsPlayer::OnSettingsChanged) - ON_COMMAND(IDC_CHECK5, &COptionsPlayer::OnSettingsChanged) - ON_COMMAND(IDC_CHECK6, &COptionsPlayer::OnSettingsChanged) - ON_COMMAND(IDC_CHECK7, &COptionsPlayer::OnSettingsChanged) + ON_CBN_SELCHANGE(IDC_COMBO2, &COptionsPlayer::OnSettingsChanged) + ON_COMMAND(IDC_CHECK1, &COptionsPlayer::OnSettingsChanged) + ON_COMMAND(IDC_CHECK2, &COptionsPlayer::OnSettingsChanged) + ON_COMMAND(IDC_CHECK4, &COptionsPlayer::OnSettingsChanged) + ON_COMMAND(IDC_CHECK5, &COptionsPlayer::OnSettingsChanged) + ON_COMMAND(IDC_CHECK6, &COptionsPlayer::OnSettingsChanged) + ON_COMMAND(IDC_CHECK7, &COptionsPlayer::OnSettingsChanged) END_MESSAGE_MAP() @@ -1364,6 +1369,14 @@ } +COptionsPlayer::COptionsPlayer() : CPropertyPage{IDD_OPTIONS_PLAYER} +#ifndef NO_EQ + , m_EQPreset(TrackerSettings::Instance().m_EqSettings) +#endif +{ +} + + BOOL COptionsPlayer::OnInitDialog() { CPropertyPage::OnInitDialog(); @@ -1725,6 +1738,14 @@ } +CMidiSetupDlg::CMidiSetupDlg(DWORD flags, UINT device) + : CPropertyPage{IDD_OPTIONS_MIDI} + , m_dwMidiSetup{flags} + , m_nMidiDevice{device} +{ +} + + BOOL CMidiSetupDlg::OnInitDialog() { CPropertyPage::OnInitDialog(); Modified: trunk/OpenMPT/mptrack/Mpdlgs.h ============================================================================== --- trunk/OpenMPT/mptrack/Mpdlgs.h Mon Sep 23 14:24:15 2024 (r21689) +++ trunk/OpenMPT/mptrack/Mpdlgs.h Mon Sep 23 15:04:20 2024 (r21690) @@ -10,10 +10,10 @@ #pragma once -#include "resource.h" +#include "openmpt/all/BuildSettings.hpp" + #include "TrackerSettings.h" #include "../sounddsp/EQ.h" -#include "openmpt/all/BuildSettings.hpp" #include "openmpt/sounddevice/SoundDevice.hpp" OPENMPT_NAMESPACE_BEGIN @@ -111,9 +111,7 @@ bool m_initialized = false; public: - COptionsMixer() - : CPropertyPage(IDD_OPTIONS_MIXER) - {} + COptionsMixer(); protected: void UpdateRamping(); @@ -145,7 +143,7 @@ UINT m_nSliderNo; short int m_x, m_y; public: - CEQSlider() {} + CEQSlider() = default; void Init(UINT nID, UINT n, CWnd *parent); BOOL PreTranslateMessage(MSG *pMsg); }; @@ -169,11 +167,7 @@ #endif // !NO_EQ public: - COptionsPlayer() : CPropertyPage(IDD_OPTIONS_PLAYER) -#ifndef NO_EQ - , m_EQPreset(TrackerSettings::Instance().m_EqSettings) -#endif - { } + COptionsPlayer(); protected: BOOL OnInitDialog() override; @@ -185,10 +179,10 @@ #ifndef NO_EQ afx_msg void OnVScroll(UINT nSBCode, UINT nPos, CScrollBar* pScrollBar); - afx_msg void OnEqUser1() { LoadEQPreset(TrackerSettings::Instance().m_EqUserPresets[0]); }; - afx_msg void OnEqUser2() { LoadEQPreset(TrackerSettings::Instance().m_EqUserPresets[1]); }; - afx_msg void OnEqUser3() { LoadEQPreset(TrackerSettings::Instance().m_EqUserPresets[2]); }; - afx_msg void OnEqUser4() { LoadEQPreset(TrackerSettings::Instance().m_EqUserPresets[3]); }; + afx_msg void OnEqUser1() { LoadEQPreset(TrackerSettings::Instance().m_EqUserPresets[0]); }; + afx_msg void OnEqUser2() { LoadEQPreset(TrackerSettings::Instance().m_EqUserPresets[1]); }; + afx_msg void OnEqUser3() { LoadEQPreset(TrackerSettings::Instance().m_EqUserPresets[2]); }; + afx_msg void OnEqUser4() { LoadEQPreset(TrackerSettings::Instance().m_EqUserPresets[3]); }; afx_msg void OnSavePreset(); afx_msg void OnSliderMenu(UINT); afx_msg void OnSliderFreq(UINT); @@ -213,11 +207,7 @@ CComboBox m_InputDevice, m_ATBehaviour, m_Quantize; public: - CMidiSetupDlg(DWORD d, UINT n) - : CPropertyPage(IDD_OPTIONS_MIDI) - , m_dwMidiSetup(d) - , m_nMidiDevice(n) - { } + CMidiSetupDlg(DWORD flags, UINT device); protected: BOOL OnInitDialog() override; Modified: trunk/OpenMPT/mptrack/PatternEditorDialogs.cpp ============================================================================== --- trunk/OpenMPT/mptrack/PatternEditorDialogs.cpp Mon Sep 23 14:24:15 2024 (r21689) +++ trunk/OpenMPT/mptrack/PatternEditorDialogs.cpp Mon Sep 23 15:04:20 2024 (r21690) @@ -16,6 +16,7 @@ #include "Moddoc.h" #include "Mptrack.h" #include "Reporting.h" +#include "resource.h" #include "TempoSwingDialog.h" #include "View_pat.h" #include "WindowMessages.h" @@ -131,6 +132,15 @@ ON_COMMAND(IDC_BUTTON1, &CPatternPropertiesDlg::OnTempoSwing) END_MESSAGE_MAP() + +CPatternPropertiesDlg::CPatternPropertiesDlg(CModDoc &modParent, PATTERNINDEX nPat, CWnd *parent) + : DialogBase{IDD_PATTERN_PROPERTIES, parent} + , modDoc{modParent} + , m_nPattern{nPat} +{ +} + + BOOL CPatternPropertiesDlg::OnInitDialog() { CComboBox *combo; @@ -1159,6 +1169,14 @@ } +CSplitKeyboardSettings::CSplitKeyboardSettings(CWnd *parent, CSoundFile &sf, SplitKeyboardSettings &settings) + : DialogBase{IDD_KEYBOARD_SPLIT, parent} + , sndFile{sf} + , m_Settings{settings} +{ +} + + BOOL CSplitKeyboardSettings::OnInitDialog() { if(sndFile.GetpModDoc() == nullptr) Modified: trunk/OpenMPT/mptrack/PatternEditorDialogs.h ============================================================================== --- trunk/OpenMPT/mptrack/PatternEditorDialogs.h Mon Sep 23 14:24:15 2024 (r21689) +++ trunk/OpenMPT/mptrack/PatternEditorDialogs.h Mon Sep 23 15:04:20 2024 (r21690) @@ -13,13 +13,12 @@ #include "openmpt/all/BuildSettings.hpp" #include "DialogBase.h" -#include "dlg_misc.h" // for keyboard control +#include "dlg_misc.h" // for keyboard control #include "ColorPickerButton.h" #include "EffectInfo.h" #include "PatternCursor.h" #include "PluginComboBox.h" #include "ResizableDialog.h" -#include "resource.h" #include "TrackerSettings.h" OPENMPT_NAMESPACE_BEGIN @@ -35,11 +34,7 @@ PATTERNINDEX m_nPattern; public: - CPatternPropertiesDlg(CModDoc &modParent, PATTERNINDEX nPat, CWnd *parent=NULL) - : DialogBase(IDD_PATTERN_PROPERTIES, parent) - , modDoc(modParent) - , m_nPattern(nPat) - { } + CPatternPropertiesDlg(CModDoc &modParent, PATTERNINDEX nPat, CWnd *parent = nullptr); protected: BOOL OnInitDialog() override; @@ -158,7 +153,7 @@ public: SplitKeyboardSettings &m_Settings; - CSplitKeyboardSettings(CWnd *parent, CSoundFile &sf, SplitKeyboardSettings &settings) : DialogBase(IDD_KEYBOARD_SPLIT, parent), sndFile(sf), m_Settings(settings) { } + CSplitKeyboardSettings(CWnd *parent, CSoundFile &sf, SplitKeyboardSettings &settings); protected: void DoDataExchange(CDataExchange* pDX) override; Modified: trunk/OpenMPT/mptrack/PatternFindReplaceDlg.cpp ============================================================================== --- trunk/OpenMPT/mptrack/PatternFindReplaceDlg.cpp Mon Sep 23 14:24:15 2024 (r21689) +++ trunk/OpenMPT/mptrack/PatternFindReplaceDlg.cpp Mon Sep 23 15:04:20 2024 (r21690) @@ -14,6 +14,7 @@ #include "DialogBase.h" #include "Mptrack.h" #include "PatternFindReplace.h" +#include "resource.h" #include "View_pat.h" #include "mpt/parse/parse.hpp" @@ -723,6 +724,13 @@ } +void CFindReplaceTab::OnVolCmdChanged() +{ + CheckOnChange(IDC_CHECK3); + UpdateVolumeList(); +}; + + void CFindReplaceTab::RelativeOrMultiplyPrompt(CComboBox &comboBox, FindReplace::ReplaceMode &action, int &value, int range, bool isHex) { int sel = comboBox.GetCurSel(); @@ -837,6 +845,13 @@ } +void CFindReplaceTab::OnEffectChanged() +{ + CheckOnChange(IDC_CHECK5); + UpdateParamList(); +}; + + void CFindReplaceTab::OnParamChanged() { CheckOnChange(IDC_CHECK6); @@ -913,6 +928,21 @@ } +void CFindReplaceTab::OnCheckNote() { CheckReplace(IDC_CHECK1); }; +void CFindReplaceTab::OnCheckInstr() { CheckReplace(IDC_CHECK2); }; +void CFindReplaceTab::OnCheckVolCmd() { CheckReplace(IDC_CHECK3); }; +void CFindReplaceTab::OnCheckVolume() { CheckReplace(IDC_CHECK4); }; +void CFindReplaceTab::OnCheckEffect() { CheckReplace(IDC_CHECK5); }; +void CFindReplaceTab::OnCheckParam() { CheckReplace(IDC_CHECK6); }; + + +void CFindReplaceTab::CheckReplace(int nIDButton) +{ + if(m_isReplaceTab && IsDlgButtonChecked(nIDButton)) + CheckDlgButton(IDC_CHECK7, BST_CHECKED); +}; + + void CFindReplaceTab::OnCheckChannelSearch() { if (!m_isReplaceTab) Modified: trunk/OpenMPT/mptrack/PatternFindReplaceDlg.h ============================================================================== --- trunk/OpenMPT/mptrack/PatternFindReplaceDlg.h Mon Sep 23 14:24:15 2024 (r21689) +++ trunk/OpenMPT/mptrack/PatternFindReplaceDlg.h Mon Sep 23 15:04:20 2024 (r21690) @@ -16,7 +16,6 @@ #include "PatternCursor.h" #include "PatternFindReplace.h" #include "PluginComboBox.h" -#include "resource.h" OPENMPT_NAMESPACE_BEGIN @@ -80,20 +79,20 @@ void CheckOnChange(int nIDButton) { CheckDlgButton(nIDButton, BST_CHECKED); CheckReplace(nIDButton); }; afx_msg void OnNoteChanged(); afx_msg void OnInstrChanged(); - afx_msg void OnVolCmdChanged() { CheckOnChange(IDC_CHECK3); UpdateVolumeList(); }; + afx_msg void OnVolCmdChanged(); afx_msg void OnVolumeChanged(); - afx_msg void OnEffectChanged() { CheckOnChange(IDC_CHECK5); UpdateParamList(); }; + afx_msg void OnEffectChanged(); afx_msg void OnParamChanged(); afx_msg void OnPCParamChanged(); // When a checkbox is checked, also check "Replace By". - afx_msg void OnCheckNote() { CheckReplace(IDC_CHECK1); }; - afx_msg void OnCheckInstr() { CheckReplace(IDC_CHECK2); }; - afx_msg void OnCheckVolCmd() { CheckReplace(IDC_CHECK3); }; - afx_msg void OnCheckVolume() { CheckReplace(IDC_CHECK4); }; - afx_msg void OnCheckEffect() { CheckReplace(IDC_CHECK5); }; - afx_msg void OnCheckParam() { CheckReplace(IDC_CHECK6); }; + afx_msg void OnCheckNote(); + afx_msg void OnCheckInstr(); + afx_msg void OnCheckVolCmd(); + afx_msg void OnCheckVolume(); + afx_msg void OnCheckEffect(); + afx_msg void OnCheckParam(); // Check "Replace By" - afx_msg void CheckReplace(int nIDButton) { if(m_isReplaceTab && IsDlgButtonChecked(nIDButton)) CheckDlgButton(IDC_CHECK7, BST_CHECKED); }; + afx_msg void CheckReplace(int nIDButton); afx_msg void OnCheckChannelSearch(); Modified: trunk/OpenMPT/mptrack/SampleEditorDialogs.cpp ============================================================================== --- trunk/OpenMPT/mptrack/SampleEditorDialogs.cpp Mon Sep 23 14:24:15 2024 (r21689) +++ trunk/OpenMPT/mptrack/SampleEditorDialogs.cpp Mon Sep 23 15:04:20 2024 (r21690) @@ -162,6 +162,20 @@ } +void CAmpDlg::EnableFadeIn() +{ + if(!m_locked) + CheckDlgButton(IDC_CHECK1, BST_CHECKED); +} + + +void CAmpDlg::EnableFadeOut() +{ + if(!m_locked) + CheckDlgButton(IDC_CHECK2, BST_CHECKED); +} + + ////////////////////////////////////////////////////////////// // Sample import dialog @@ -184,6 +198,13 @@ } +CRawSampleDlg::CRawSampleDlg(FileReader &file, CWnd *parent) + : DialogBase{IDD_LOADRAWSAMPLE, parent} + , m_file{file} +{ +} + + BOOL CRawSampleDlg::OnInitDialog() { DialogBase::OnInitDialog(); @@ -579,12 +600,20 @@ { DialogBase::DoDataExchange(pDX); //{{AFX_DATA_MAP(CSampleGridDlg) - DDX_Control(pDX, IDC_EDIT1, m_EditSegments); - DDX_Control(pDX, IDC_SPIN1, m_SpinSegments); + DDX_Control(pDX, IDC_EDIT1, m_EditSegments); + DDX_Control(pDX, IDC_SPIN1, m_SpinSegments); //}}AFX_DATA_MAP } +CSampleGridDlg::CSampleGridDlg(CWnd* parent, SmpLength nSegments, SmpLength nMaxSegments) + : DialogBase{IDD_SAMPLE_GRID_SIZE, parent} + , m_nSegments{nSegments} + , m_nMaxSegments{nMaxSegments} +{ +} + + BOOL CSampleGridDlg::OnInitDialog() { DialogBase::OnInitDialog(); @@ -613,9 +642,9 @@ BEGIN_MESSAGE_MAP(CSampleXFadeDlg, DialogBase) ON_WM_HSCROLL() - ON_COMMAND(IDC_RADIO1, &CSampleXFadeDlg::OnLoopTypeChanged) - ON_COMMAND(IDC_RADIO2, &CSampleXFadeDlg::OnLoopTypeChanged) - ON_EN_CHANGE(IDC_EDIT1, &CSampleXFadeDlg::OnFadeLengthChanged) + ON_COMMAND(IDC_RADIO1, &CSampleXFadeDlg::OnLoopTypeChanged) + ON_COMMAND(IDC_RADIO2, &CSampleXFadeDlg::OnLoopTypeChanged) + ON_EN_CHANGE(IDC_EDIT1, &CSampleXFadeDlg::OnFadeLengthChanged) ON_NOTIFY_EX(TTN_NEEDTEXT, 0, &CSampleXFadeDlg::OnToolTipText) END_MESSAGE_MAP() @@ -634,6 +663,12 @@ } +CSampleXFadeDlg::CSampleXFadeDlg(CWnd *parent, ModSample &sample) + : DialogBase{IDD_SAMPLE_XFADE, parent} + , m_sample{sample} +{ +} + BOOL CSampleXFadeDlg::OnInitDialog() { DialogBase::OnInitDialog(); @@ -761,6 +796,16 @@ ON_EN_SETFOCUS(IDC_EDIT1, &CResamplingDlg::OnFocusEdit) END_MESSAGE_MAP() + +CResamplingDlg::CResamplingDlg(CWnd *parent, uint32 frequency, ResamplingMode srcMode, bool resampleAll) + : DialogBase{IDD_RESAMPLE, parent} + , m_srcMode{srcMode} + , m_frequency{frequency} + , m_resampleAll{resampleAll} +{ +} + + BOOL CResamplingDlg::OnInitDialog() { DialogBase::OnInitDialog(); @@ -844,6 +889,12 @@ } +void CResamplingDlg::OnFocusEdit() +{ + CheckRadioButton(IDC_RADIO1, IDC_RADIO3, IDC_RADIO3); +} + + //////////////////////////////////////////////////////////////////////////////////////////// // Sample mix dialog Modified: trunk/OpenMPT/mptrack/SampleEditorDialogs.h ============================================================================== --- trunk/OpenMPT/mptrack/SampleEditorDialogs.h Mon Sep 23 14:24:15 2024 (r21689) +++ trunk/OpenMPT/mptrack/SampleEditorDialogs.h Mon Sep 23 15:04:20 2024 (r21690) @@ -15,7 +15,6 @@ #include "CDecimalSupport.h" #include "DialogBase.h" -#include "resource.h" #include "../common/FileReaderFwd.h" #include "../soundlib/SampleIO.h" #include "../tracklib/FadeLaws.h" @@ -54,8 +53,8 @@ void OnOK() override; void OnDestroy(); - afx_msg void EnableFadeIn() { if(!m_locked) CheckDlgButton(IDC_CHECK1, BST_CHECKED); } - afx_msg void EnableFadeOut() { if(!m_locked) CheckDlgButton(IDC_CHECK2, BST_CHECKED); } + afx_msg void EnableFadeIn(); + afx_msg void EnableFadeOut(); DECLARE_MESSAGE_MAP() }; @@ -87,9 +86,7 @@ void SetOffset(SmpLength offset) { m_offset = offset; } public: - CRawSampleDlg(FileReader &file, CWnd *parent = nullptr) - : DialogBase(IDD_LOADRAWSAMPLE, parent) - , m_file(file) {} + CRawSampleDlg(FileReader &file, CWnd *parent = nullptr); protected: void DoDataExchange(CDataExchange *pDX) override; @@ -163,7 +160,7 @@ CSpinButtonCtrl m_SpinSegments; public: - CSampleGridDlg(CWnd *parent, SmpLength nSegments, SmpLength nMaxSegments) : DialogBase(IDD_SAMPLE_GRID_SIZE, parent) { m_nSegments = nSegments; m_nMaxSegments = nMaxSegments; }; + CSampleGridDlg(CWnd *parent, SmpLength nSegments, SmpLength nMaxSegments); protected: void DoDataExchange(CDataExchange* pDX) override; @@ -193,9 +190,7 @@ bool m_editLocked = true; public: - CSampleXFadeDlg(CWnd *parent, ModSample &sample) - : DialogBase(IDD_SAMPLE_XFADE, parent) - , m_sample(sample) {} + CSampleXFadeDlg(CWnd *parent, ModSample &sample); SmpLength PercentToSamples(uint32 percent) const { return Util::muldivr_unsigned(percent, m_loopLength, 100000); } uint32 SamplesToPercent(SmpLength samples) const { return Util::muldivr_unsigned(samples, 100000, m_loopLength); } @@ -235,7 +230,7 @@ static bool m_updatePatterns; public: - CResamplingDlg(CWnd *parent, uint32 frequency, ResamplingMode srcMode, bool resampleAll) : DialogBase(IDD_RESAMPLE, parent), m_srcMode(srcMode), m_frequency(frequency), m_resampleAll(resampleAll) { }; + CResamplingDlg(CWnd *parent, uint32 frequency, ResamplingMode srcMode, bool resampleAll); uint32 GetFrequency() const { return m_frequency; } ResamplingMode GetFilter() const { return m_srcMode; } static ResamplingOption GetResamplingOption() { return m_lastChoice; } @@ -245,7 +240,7 @@ BOOL OnInitDialog() override; void OnOK() override; - afx_msg void OnFocusEdit() { CheckRadioButton(IDC_RADIO1, IDC_RADIO3, IDC_RADIO3); } + afx_msg void OnFocusEdit(); DECLARE_MESSAGE_MAP() }; Modified: trunk/OpenMPT/mptrack/TrackerSettings.cpp ============================================================================== --- trunk/OpenMPT/mptrack/TrackerSettings.cpp Mon Sep 23 14:24:15 2024 (r21689) +++ trunk/OpenMPT/mptrack/TrackerSettings.cpp Mon Sep 23 15:04:20 2024 (r21690) @@ -17,6 +17,7 @@ #include "Mpdlgs.h" #include "Mptrack.h" #include "PatternClipboard.h" +#include "resource.h" #include "TuningDialog.h" #include "UpdateCheck.h" #include "../common/ComponentManager.h" Modified: trunk/OpenMPT/mptrack/UpdateCheck.cpp ============================================================================== --- trunk/OpenMPT/mptrack/UpdateCheck.cpp Mon Sep 23 14:24:15 2024 (r21689) +++ trunk/OpenMPT/mptrack/UpdateCheck.cpp Mon Sep 23 15:04:20 2024 (r21690) @@ -18,6 +18,7 @@ #include "Mptrack.h" #include "ProgressDialog.h" #include "Reporting.h" +#include "resource.h" #include "TrackerSettings.h" #include "WindowMessages.h" #include "../common/misc_util.h" Modified: trunk/OpenMPT/mptrack/View_gen.cpp ============================================================================== --- trunk/OpenMPT/mptrack/View_gen.cpp Mon Sep 23 14:24:15 2024 (r21689) +++ trunk/OpenMPT/mptrack/View_gen.cpp Mon Sep 23 15:04:20 2024 (r21690) @@ -22,6 +22,7 @@ #include "Moddoc.h" #include "MoveFXSlotDialog.h" #include "Reporting.h" +#include "resource.h" #include "SelectPluginDialog.h" #include "../common/mptStringBuffer.h" #include "../soundlib/mod_specifications.h" @@ -170,6 +171,9 @@ } +CViewGlobals::CViewGlobals() : CFormView{IDD_VIEW_GLOBALS} { } + + CModDoc* CViewGlobals::GetDocument() const { return static_cast<CModDoc *>(m_pDocument); } void CViewGlobals::OnInitialUpdate() Modified: trunk/OpenMPT/mptrack/View_gen.h ============================================================================== --- trunk/OpenMPT/mptrack/View_gen.h Mon Sep 23 14:24:15 2024 (r21689) +++ trunk/OpenMPT/mptrack/View_gen.h Mon Sep 23 15:04:20 2024 (r21690) @@ -14,7 +14,6 @@ #include "openmpt/all/BuildSettings.hpp" #include "ColorPickerButton.h" #include "PluginComboBox.h" -#include "resource.h" #include "UpdateHints.h" #include "WindowMessages.h" #include "../soundlib/plugins/PluginStructs.h" @@ -56,7 +55,7 @@ enum {AdjustPattern = true, NoPatternAdjust = false}; protected: - CViewGlobals() : CFormView(IDD_VIEW_GLOBALS) { } + CViewGlobals(); DECLARE_SERIAL(CViewGlobals) public: Modified: trunk/OpenMPT/mptrack/dlg_misc.cpp ============================================================================== --- trunk/OpenMPT/mptrack/dlg_misc.cpp Mon Sep 23 14:24:15 2024 (r21689) +++ trunk/OpenMPT/mptrack/dlg_misc.cpp Mon Sep 23 15:04:20 2024 (r21690) @@ -16,6 +16,7 @@ #include "Moddoc.h" #include "Mptrack.h" #include "Reporting.h" +#include "resource.h" #include "TempoSwingDialog.h" #include "WindowMessages.h" #include "../common/mptStringBuffer.h" @@ -68,6 +69,13 @@ } +CModTypeDlg::CModTypeDlg(CSoundFile &sf, CWnd *parent) + : DialogBase{IDD_MODDOC_MODTYPE, parent} + , sndFile{sf} +{ +} + + BOOL CModTypeDlg::OnInitDialog() { DialogBase::OnInitDialog(); @@ -526,6 +534,14 @@ } +CLegacyPlaybackSettingsDlg::CLegacyPlaybackSettingsDlg(CWnd *parent, PlayBehaviourSet &playBehaviour, MODTYPE modType) + : ResizableDialog{IDD_LEGACY_PLAYBACK, parent} + , m_playBehaviour{playBehaviour} + , m_modType{modType} +{ +} + + BOOL CLegacyPlaybackSettingsDlg::OnInitDialog() { ResizableDialog::OnInitDialog(); @@ -750,6 +766,15 @@ END_MESSAGE_MAP() +CRemoveChannelsDlg::CRemoveChannelsDlg(CSoundFile &sf, CHANNELINDEX toRemove, bool showCancel, CWnd *parent) + : DialogBase{IDD_REMOVECHANNELS, parent} + , sndFile{sf} + , m_bKeepMask(sf.GetNumChannels(), true) + , m_nRemove{toRemove} + , m_ShowCancel{showCancel} +{ +} + BOOL CRemoveChannelsDlg::OnInitDialog() { @@ -1122,6 +1147,14 @@ } +CSampleMapDlg::CSampleMapDlg(CSoundFile &sf, INSTRUMENTINDEX nInstr, CWnd *parent) + : DialogBase{IDD_EDITSAMPLEMAP, parent} + , sndFile{sf} + , m_nInstrument{nInstr} +{ +} + + BOOL CSampleMapDlg::OnInitDialog() { DialogBase::OnInitDialog(); @@ -1243,39 +1276,37 @@ { const uint32 note = static_cast<uint32>(baseOctave * 12 + lParam); - if(mouseAction == mouseUnknown) + if(mouseAction == MouseAction::Unknown) { // Mouse down -> decide if we are going to set or remove notes - mouseAction = mouseSet; + mouseAction = MouseAction::Set; if(KeyboardMap[note] == sample) { - mouseAction = (KeyboardMap[note] == pIns->Keyboard[note]) ? mouseZero : mouseUnset; + mouseAction = (KeyboardMap[note] == pIns->Keyboard[note]) ? MouseAction::Zero : MouseAction::Unset; } } switch(mouseAction) { - case mouseUnknown: - case mouseSet: + case MouseAction::Unknown: + case MouseAction::Set: KeyboardMap[note] = sample; break; - case mouseUnset: + case MouseAction::Unset: KeyboardMap[note] = pIns->Keyboard[note]; break; - case mouseZero: + case MouseAction::Zero: if(KeyboardMap[note] == sample) - { KeyboardMap[note] = 0; - } break; } OnUpdateKeyboard(); } } + if(wParam == KBDNOTIFY_LBUTTONUP) - { - mouseAction = mouseUnknown; - } + mouseAction = MouseAction::Unknown; + SetDlgItemText(IDC_TEXT2, s); return 0; } @@ -1313,6 +1344,13 @@ END_MESSAGE_MAP() +CEditHistoryDlg::CEditHistoryDlg(CWnd *parent, CModDoc &modDoc) + : ResizableDialog{IDD_EDITHISTORY, parent} + , m_modDoc{modDoc} +{ +} + + BOOL CEditHistoryDlg::OnInitDialog() { ResizableDialog::OnInitDialog(); @@ -1391,6 +1429,21 @@ } +CInputDlg::CInputDlg(CWnd *parent, const TCHAR *desc, const TCHAR *defaultString, int32 maxLength, double minValDbl, double maxValDbl, double defaultDbl, int32 minValInt, int32 maxValInt, int32 defaultInt) + : DialogBase{IDD_INPUT, parent} + , m_description{desc} + , m_minValueDbl{minValDbl} + , m_maxValueDbl{maxValDbl} + , m_minValueInt{minValInt} + , m_maxValueInt{maxValInt} + , m_maxLength{maxLength} + , resultAsInt{defaultInt} + , resultAsDouble{defaultDbl} + , resultAsString{defaultString} +{ +} + + BOOL CInputDlg::OnInitDialog() { DialogBase::OnInitDialog(); Modified: trunk/OpenMPT/mptrack/dlg_misc.h ============================================================================== --- trunk/OpenMPT/mptrack/dlg_misc.h Mon Sep 23 14:24:15 2024 (r21689) +++ trunk/OpenMPT/mptrack/dlg_misc.h Mon Sep 23 15:04:20 2024 (r21690) @@ -15,7 +15,6 @@ #include "CDecimalSupport.h" #include "DialogBase.h" #include "ResizableDialog.h" -#include "resource.h" #include "../soundlib/Sndfile.h" OPENMPT_NAMESPACE_BEGIN @@ -40,7 +39,7 @@ bool initialized = false; public: - CModTypeDlg(CSoundFile &sf, CWnd *parent) : DialogBase(IDD_MODDOC_MODTYPE, parent), sndFile(sf) { } + CModTypeDlg(CSoundFile &sf, CWnd *parent); bool VerifyData(); void UpdateDialog(); void OnPTModeChanged(); @@ -74,12 +73,7 @@ MODTYPE m_modType; public: - CLegacyPlaybackSettingsDlg(CWnd *parent, PlayBehaviourSet &playBehaviour, MODTYPE modType) - : ResizableDialog{IDD_LEGACY_PLAYBACK, parent} - , m_playBehaviour{playBehaviour} - , m_modType{modType} - { - } + CLegacyPlaybackSettingsDlg(CWnd *parent, PlayBehaviourSet &playBehaviour, MODTYPE modType); PlayBehaviourSet GetPlayBehaviour() const { return m_playBehaviour; } @@ -105,14 +99,7 @@ bool m_ShowCancel; public: - CRemoveChannelsDlg(CSoundFile &sf, CHANNELINDEX toRemove, bool showCancel = true, CWnd *parent = nullptr) - : DialogBase{IDD_REMOVECHANNELS, parent} - , sndFile{sf} - , m_bKeepMask(sf.GetNumChannels(), true) - , m_nRemove{toRemove} - , m_ShowCancel{showCancel} - { - } + CRemoveChannelsDlg(CSoundFile &sf, CHANNELINDEX toRemove, bool showCancel = true, CWnd *parent = nullptr); protected: //{{AFX_VIRTUAL(CRemoveChannelsDlg) @@ -210,25 +197,25 @@ class CSampleMapDlg : public DialogBase { protected: - enum MouseAction + enum class MouseAction { - mouseUnknown, // Didn't mouse-down yet - mouseSet, // Set selected sample - mouseUnset, // Unset (revert to original keymap) - mouseZero, // Set to zero + Unknown, // Didn't mouse-down yet + Set, // Set selected sample + Unset, // Unset (revert to original keymap) + Zero, // Set to zero }; CKeyboardControl m_Keyboard; CComboBox m_CbnSample; CSliderCtrl m_SbOctave; + CSoundFile &sndFile; - INSTRUMENTINDEX m_nInstrument; + const INSTRUMENTINDEX m_nInstrument; SAMPLEINDEX KeyboardMap[NOTE_MAX]; - MouseAction mouseAction; + MouseAction mouseAction = MouseAction::Unknown; public: - CSampleMapDlg(CSoundFile &sf, INSTRUMENTINDEX nInstr, CWnd *parent=NULL) : DialogBase(IDD_EDITSAMPLEMAP, parent), sndFile(sf), mouseAction(mouseUnknown) - { m_nInstrument = nInstr; } + CSampleMapDlg(CSoundFile &sf, INSTRUMENTINDEX nInstr, CWnd *parent = nullptr); protected: void DoDataExchange(CDataExchange* pDX) override; @@ -252,8 +239,7 @@ CModDoc &m_modDoc; public: - CEditHistoryDlg(CWnd *parent, CModDoc &modDoc) - : ResizableDialog(IDD_EDITHISTORY, parent), m_modDoc(modDoc) {} + CEditHistoryDlg(CWnd *parent, CModDoc &modDoc); protected: BOOL OnInitDialog() override; @@ -270,40 +256,27 @@ protected: CNumberEdit m_edit; CSpinButtonCtrl m_spin; - CString m_description; - double m_minValueDbl = 0.0, m_maxValueDbl = 0.0; - int32 m_minValueInt = 0, m_maxValueInt = 0; - int32 m_maxLength = 0; + const CString m_description; + const double m_minValueDbl = 0.0, m_maxValueDbl = 0.0; + const int32 m_minValueInt = 0, m_maxValueInt = 0; + const int32 m_maxLength = 0; public: int32 resultAsInt = 0; double resultAsDouble = 0.0; CString resultAsString; +protected: + CInputDlg(CWnd *parent, const TCHAR *desc, const TCHAR *defaultString, int32 maxLength, double minValDbl, double maxValDbl = 0.0, double defaultDbl = 0.0, int32 minValInt = 0, int32 maxValInt = 0, int32 defaultInt = 0); + public: // Initialize text input box - CInputDlg(CWnd *parent, const TCHAR *desc, const TCHAR *defaultString, int32 maxLength = -1) : DialogBase(IDD_INPUT, parent) - , m_description(desc) - , m_maxLength(maxLength) - , resultAsString(defaultString) - { } + CInputDlg(CWnd *parent, const TCHAR *desc, const TCHAR *defaultString, int32 maxLength = -1) : CInputDlg{parent, desc, defaultString, maxLength, 0.0} { } // Initialize numeric input box (float) - CInputDlg(CWnd *parent, const TCHAR *desc, double minVal, double maxVal, double defaultNumber) : DialogBase(IDD_INPUT, parent) - , m_description(desc) - , m_minValueDbl(minVal), m_maxValueDbl(maxVal) - , resultAsDouble(defaultNumber) - { } - CInputDlg(CWnd *parent, const TCHAR *desc, float minVal, float maxVal, float defaultNumber) : DialogBase(IDD_INPUT, parent) - , m_description(desc) - , m_minValueDbl(minVal), m_maxValueDbl(maxVal) - , resultAsDouble(defaultNumber) - { } + CInputDlg(CWnd *parent, const TCHAR *desc, double minVal, double maxVal, double defaultNumber) : CInputDlg{parent, desc, {}, -1, minVal, maxVal, defaultNumber} { } + CInputDlg(CWnd *parent, const TCHAR *desc, float minVal, float maxVal, float defaultNumber) : CInputDlg{parent, desc, {}, -1, minVal, maxVal, defaultNumber } { } // Initialize numeric input box (int) - CInputDlg(CWnd *parent, const TCHAR *desc, int32 minVal, int32 maxVal, int32 defaultNumber) : DialogBase(IDD_INPUT, parent) - , m_description(desc) - , m_minValueInt(minVal), m_maxValueInt(maxVal) - , resultAsInt(defaultNumber) - { } + CInputDlg(CWnd *parent, const TCHAR *desc, int32 minVal, int32 maxVal, int32 defaultNumber) : CInputDlg{parent, desc, {}, -1, 0.0, 0.0, 0.0, minVal, maxVal, defaultNumber } { } protected: void DoDataExchange(CDataExchange *pDX) override; |
|
From: <sv...@op...> - 2024-09-23 12:24:27
|
Author: sagamusix Date: Mon Sep 23 14:24:15 2024 New Revision: 21689 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21689 Log: [Fix] Prevent "Close All" keyboard shortcut from being activated when a dialog is open. It wasn't able to close the files anyway (due to using SafeFileClose call), but it reset the modified status of open files. [Fix] "Close All" menu item didn't show associated keyboard shortcut. [Mod] Make toolbar toggling menu entry titles more obvious, and show available keyboard shortcuts when opening via context menu. [Ref] Unify implementations for toolbar toggling menu. Modified: trunk/OpenMPT/mptrack/InputHandler.cpp trunk/OpenMPT/mptrack/MainFrm.cpp trunk/OpenMPT/mptrack/Mainfrm.h trunk/OpenMPT/mptrack/mptrack.rc trunk/OpenMPT/mptrack/resource.h Modified: trunk/OpenMPT/mptrack/InputHandler.cpp ============================================================================== --- trunk/OpenMPT/mptrack/InputHandler.cpp Mon Sep 23 01:29:09 2024 (r21688) +++ trunk/OpenMPT/mptrack/InputHandler.cpp Mon Sep 23 14:24:15 2024 (r21689) @@ -434,8 +434,8 @@ { ID_VIEW_INSTRUMENTS, kcViewInstruments, _T("&Instruments") }, { ID_VIEW_COMMENTS, kcViewComments, _T("&Comments") }, { ID_VIEW_OPTIONS, kcViewOptions, _T("S&etup") }, - { ID_VIEW_TOOLBAR, kcViewMain, _T("&Main") }, - { IDD_TREEVIEW, kcViewTree, _T("&Tree") }, + { ID_VIEW_TOOLBAR, kcViewMain, _T("Show &Main Toolbar") }, + { IDD_TREEVIEW, kcViewTree, _T("Show &Tree View") }, { ID_PLUGIN_SETUP, kcViewAddPlugin, _T("Pl&ugin Manager") }, { ID_CHANNEL_MANAGER, kcViewChannelManager, _T("Ch&annel Manager") }, { ID_CLIPBOARD_MANAGER, kcToggleClipboardManager, _T("C&lipboard Manager") }, @@ -474,6 +474,7 @@ ID_FILE_OPEN, ID_FILE_APPENDMODULE, ID_FILE_CLOSE, + ID_FILE_CLOSEALL, ID_FILE_SAVE, ID_FILE_SAVE_AS, ID_FILE_SAVEASWAVE, Modified: trunk/OpenMPT/mptrack/MainFrm.cpp ============================================================================== --- trunk/OpenMPT/mptrack/MainFrm.cpp Mon Sep 23 01:29:09 2024 (r21688) +++ trunk/OpenMPT/mptrack/MainFrm.cpp Mon Sep 23 14:24:15 2024 (r21689) @@ -547,24 +547,17 @@ BOOL CMainFrame::PreTranslateMessage(MSG* pMsg) { + // Right-click menu to disable/enable tree view and main toolbar when right-clicking on either the menu strip or main toolbar if((pMsg->message == WM_RBUTTONDOWN) || (pMsg->message == WM_NCRBUTTONDOWN)) { - CWnd* pWnd = CWnd::FromHandlePermanent(pMsg->hwnd); - CControlBar* pBar = NULL; - HWND hwnd = (pWnd) ? pWnd->m_hWnd : NULL; - - if ((hwnd) && (pMsg->message == WM_RBUTTONDOWN)) pBar = DYNAMIC_DOWNCAST(CControlBar, pWnd); - if ((pBar != NULL) || ((pMsg->message == WM_NCRBUTTONDOWN) && (pMsg->wParam == HTMENU))) + CControlBar *pBar = nullptr; + if(CWnd *pWnd = CWnd::FromHandlePermanent(pMsg->hwnd); pWnd && (pMsg->message == WM_RBUTTONDOWN)) + pBar = dynamic_cast<CControlBar *>(pWnd); + if(pBar != nullptr || (pMsg->message == WM_NCRBUTTONDOWN && pMsg->wParam == HTMENU)) { - CMenu Menu; CPoint pt; - GetCursorPos(&pt); - if (Menu.LoadMenu(IDR_TOOLBARS)) - { - CMenu* pSubMenu = Menu.GetSubMenu(0); - if (pSubMenu!=NULL) pSubMenu->TrackPopupMenu(TPM_LEFTALIGN | TPM_RIGHTBUTTON,pt.x,pt.y,this); - } + ShowToolbarMenu(pt); } } @@ -2468,13 +2461,19 @@ void CMainFrame::OnRButtonDown(UINT, CPoint pt) { - CMenu Menu; ClientToScreen(&pt); - if (Menu.LoadMenu(IDR_TOOLBARS)) - { - CMenu *pSubMenu = Menu.GetSubMenu(0); - if (pSubMenu != nullptr) pSubMenu->TrackPopupMenu(TPM_LEFTALIGN | TPM_RIGHTBUTTON, pt.x, pt.y, this); - } + ShowToolbarMenu(pt); +} + + +void CMainFrame::ShowToolbarMenu(CPoint screenPt) +{ + CMenu menu; + if(!menu.CreatePopupMenu()) + return; + menu.AppendMenu(MF_STRING, ID_VIEW_TOOLBAR, m_InputHandler->GetMenuText(ID_VIEW_TOOLBAR)); + menu.AppendMenu(MF_STRING, IDD_TREEVIEW, m_InputHandler->GetMenuText(IDD_TREEVIEW)); + menu.TrackPopupMenu(TPM_LEFTALIGN | TPM_RIGHTBUTTON, screenPt.x, screenPt.y, this); } @@ -2485,19 +2484,23 @@ case kcViewTree: OnBarCheck(IDD_TREEVIEW); break; case kcViewOptions: OnViewOptions(); break; case kcViewMain: OnBarCheck(ID_VIEW_TOOLBAR); break; - case kcFileImportMidiLib: OnImportMidiLib(); break; + case kcFileImportMidiLib: OnImportMidiLib(); break; case kcFileAddSoundBank: OnAddDlsBank(); break; - case kcPauseSong: OnPlayerPause(); break; - case kcPrevOctave: OnPrevOctave(); break; - case kcNextOctave: OnNextOctave(); break; - case kcFileNew: theApp.OnFileNew(); break; - case kcFileOpen: theApp.OnFileOpen(); break; - case kcMidiRecord: OnMidiRecord(); break; - case kcHelp: OnHelp(); break; + case kcPauseSong: OnPlayerPause(); break; + case kcPrevOctave: OnPrevOctave(); break; + case kcNextOctave: OnNextOctave(); break; + case kcFileNew: theApp.OnFileNew(); break; + case kcFileOpen: theApp.OnFileOpen(); break; + case kcMidiRecord: OnMidiRecord(); break; + case kcHelp: OnHelp(); break; case kcViewAddPlugin: OnPluginManager(); break; - case kcNextDocument: MDINext(); break; - case kcPrevDocument: MDIPrev(); break; - case kcFileCloseAll: theApp.OnFileCloseAll(); break; + case kcNextDocument: MDINext(); break; + case kcPrevDocument: MDIPrev(); break; + case kcFileCloseAll: + if(GetActiveWindow() != this) + return kcNull; + theApp.OnFileCloseAll(); + break; //D'oh!! moddoc isn't a CWnd so we have to handle its messages and pass them on. Modified: trunk/OpenMPT/mptrack/Mainfrm.h ============================================================================== --- trunk/OpenMPT/mptrack/Mainfrm.h Mon Sep 23 01:29:09 2024 (r21688) +++ trunk/OpenMPT/mptrack/Mainfrm.h Mon Sep 23 14:24:15 2024 (r21689) @@ -371,6 +371,8 @@ /// Opens either template or example menu item. void OpenMenuItemFile(const UINT nId, const bool isTemplateFile); + void ShowToolbarMenu(CPoint screenPt); + public: void UpdateMRUList(); Modified: trunk/OpenMPT/mptrack/mptrack.rc ============================================================================== --- trunk/OpenMPT/mptrack/mptrack.rc Mon Sep 23 01:29:09 2024 (r21688) +++ trunk/OpenMPT/mptrack/mptrack.rc Mon Sep 23 14:24:15 2024 (r21689) @@ -2875,15 +2875,6 @@ END END -IDR_TOOLBARS MENU -BEGIN - POPUP "&ToolBars" - BEGIN - MENUITEM "&Main", ID_VIEW_TOOLBAR - MENUITEM "&Tree", IDD_TREEVIEW - END -END - IDR_ENVELOPES MENU BEGIN POPUP "&Envelope" Modified: trunk/OpenMPT/mptrack/resource.h ============================================================================== --- trunk/OpenMPT/mptrack/resource.h Mon Sep 23 01:29:09 2024 (r21688) +++ trunk/OpenMPT/mptrack/resource.h Mon Sep 23 14:24:15 2024 (r21689) @@ -31,7 +31,6 @@ #define IDD_OPTIONS_EFFECTS 133 #define IDR_MAINFRAME 200 #define IDR_MODULETYPE 201 -#define IDR_TOOLBARS 202 #define ID_PATTERN_CHANNELMANAGER 202 #define IDR_ENVELOPES 203 #define ID_INDICATOR_CPU 203 |
|
From: <sv...@op...> - 2024-09-22 23:29:16
|
Author: sagamusix Date: Mon Sep 23 01:29:09 2024 New Revision: 21688 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21688 Log: [Imp] ULT: Try to preserve global commands if there's e.g. both a speed and tempo command in the same cell. Fixes trance mission.ult (https://www.un4seen.com/forum/?topic=15448.msg143764#msg143764). Modified: trunk/OpenMPT/soundlib/Load_ult.cpp Modified: trunk/OpenMPT/soundlib/Load_ult.cpp ============================================================================== --- trunk/OpenMPT/soundlib/Load_ult.cpp Mon Sep 23 00:37:23 2024 (r21687) +++ trunk/OpenMPT/soundlib/Load_ult.cpp Mon Sep 23 01:29:09 2024 (r21688) @@ -197,7 +197,9 @@ } -static uint8 ReadULTEvent(ModCommand &m, FileReader &file, uint8 version) +struct ULTEventResult { uint8 repeat = 0; ModCommand::COMMAND lostCommand = CMD_NONE; ModCommand::PARAM lostParam = 0; }; + +static ULTEventResult ReadULTEvent(ModCommand &m, FileReader &file, uint8 version) { uint8 repeat = 1; uint8 b = file.ReadUint8(); @@ -222,7 +224,7 @@ m.SetEffectCommand(CMD_OFFSET, static_cast<ModCommand::PARAM>(offset)); if(offset > 0xFF) m.SetVolumeCommand(VOLCMD_OFFSET, static_cast<ModCommand::VOL>(offset >> 8)); - return repeat; + return {repeat}; } else if(cmd1 == CMD_OFFSET) { uint32 offset = param1 * 4; @@ -231,7 +233,7 @@ { m.SetEffectCommand(CMD_OFFSET, static_cast<ModCommand::PARAM>(offset)); m.SetVolumeCommand(VOLCMD_OFFSET, static_cast<ModCommand::VOL>(offset >> 8)); - return repeat; + return {repeat}; } } else if(cmd2 == CMD_OFFSET) { @@ -241,7 +243,7 @@ { m.SetEffectCommand(CMD_OFFSET, static_cast<ModCommand::PARAM>(offset)); m.SetVolumeCommand(VOLCMD_OFFSET, static_cast<ModCommand::VOL>(offset >> 8)); - return repeat; + return {repeat}; } } else if(cmd1 == cmd2) { @@ -257,9 +259,8 @@ // Combine slide commands, if possible ModCommand::CombineEffects(cmd2, param2, cmd1, param1); - m.FillInTwoCommands(cmd1, param1, cmd2, param2); - - return repeat; + const auto lostCommand = m.FillInTwoCommands(cmd1, param1, cmd2, param2); + return {repeat, lostCommand.first, lostCommand.second}; } @@ -378,7 +379,10 @@ ROWINDEX row = 0; while(row < 64) { - int repeat = ReadULTEvent(evnote, file, fileHeader.version); + const ULTEventResult eventResult = ReadULTEvent(evnote, file, fileHeader.version); + if(eventResult.lostCommand != CMD_NONE && ModCommand::IsGlobalCommand(eventResult.lostCommand, eventResult.lostParam)) + Patterns[pat].WriteEffect(EffectWriter(eventResult.lostCommand, eventResult.lostParam).Row(row).RetryNextRow()); + int repeat = eventResult.repeat; if(repeat + row > 64) repeat = 64 - row; if(repeat == 0) |
|
From: <sv...@op...> - 2024-09-22 22:37:36
|
Author: sagamusix Date: Mon Sep 23 00:37:23 2024 New Revision: 21687 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21687 Log: Merged revision(s) 21685-21686 from trunk/OpenMPT: [Fix] OKT: Disable loop on type "B" samples if they're used on a mixed channel. Fixes sinfonia.okta (https://www.un4seen.com/forum/?topic=15448.msg143764#msg143764). ........ [Fix] PTM: Polytracker is another one of those trackers where offset command strength is halved by using 16-bit samples... fixes leveled.ptm (https://www.un4seen.com/forum/?topic=15448.msg143764#msg143764). ........ Modified: branches/OpenMPT-1.31/ (props changed) branches/OpenMPT-1.31/soundlib/Load_okt.cpp branches/OpenMPT-1.31/soundlib/Load_ptm.cpp branches/OpenMPT-1.31/soundlib/Snd_fx.cpp Modified: branches/OpenMPT-1.31/soundlib/Load_okt.cpp ============================================================================== --- branches/OpenMPT-1.31/soundlib/Load_okt.cpp Mon Sep 23 00:36:58 2024 (r21686) +++ branches/OpenMPT-1.31/soundlib/Load_okt.cpp Mon Sep 23 00:37:23 2024 (r21687) @@ -30,7 +30,7 @@ }; uint32be signature; // IFF chunk name - uint32be chunksize; // chunk size without header + uint32be chunkSize; // Chunk size without header }; MPT_BINARY_STRUCT(OktIffChunk, 8) @@ -38,11 +38,11 @@ struct OktSample { char name[20]; - uint32be length; // length in bytes + uint32be length; // Length in bytes uint16be loopStart; // *2 for real value uint16be loopLength; // ditto - uint16be volume; // default volume - uint16be type; // 7-/8-bit sample + uint16be volume; // Default volume + uint16be type; // 7-/8-bit sample (0: 7-bit, only usable on paired channels ["8" in GUI], 1: 8-bit, only usable on unpaired channels ["4" in GUI], 2: 7-bit, usable on all channels ["B" in GUI]) }; MPT_BINARY_STRUCT(OktSample, 32) @@ -124,20 +124,26 @@ if(note > 0 && note <= 36) { m.note = note + (NOTE_MIDDLEC - 13); + if(pairedChn[chn] && m.note >= NOTE_MIDDLEC + 22) + m.note = NOTE_MIDDLEC + 21; + m.instr = instr + 1; if(m.instr > 0 && m.instr <= sndFile.GetNumSamples()) { - const auto &sample = sndFile.GetSample(m.instr); + auto &sample = sndFile.GetSample(m.instr); // Default volume only works on raw Paula channels if(pairedChn[chn] && sample.nVolume < 256) - { m.SetVolumeCommand(VOLCMD_VOLUME, 64); - } + // Type "B" samples (can play on both paired and unpaired channels) can have loop information, + // which can only be used on unpaired channels. The correct fix would be to have a looped and unlooped variant of this sample, + // but it is probably quite unlikely that any module relies on this behaviour. + // On the other hand, sinfonia.okta has a type "B" sample with loop points set, and it only uses paired channels. + if(pairedChn[chn] && sample.uFlags[CHN_SUSTAINLOOP]) + sample.uFlags.reset(CHN_SUSTAINLOOP); + // If channel and sample type don't match, stop this channel (add 100 to the instrument number to make it understandable what happened during import) if((sample.cues[0] == 1 && pairedChn[chn] != 0) || (sample.cues[0] == 0 && pairedChn[chn] == 0)) - { m.instr += 100; - } } } @@ -330,7 +336,7 @@ if(!file.ReadStruct(iffHead)) break; - FileReader chunk = file.ReadChunk(iffHead.chunksize); + FileReader chunk = file.ReadChunk(iffHead.chunkSize); if(!chunk.IsValid()) continue; Modified: branches/OpenMPT-1.31/soundlib/Load_ptm.cpp ============================================================================== --- branches/OpenMPT-1.31/soundlib/Load_ptm.cpp Mon Sep 23 00:36:58 2024 (r21686) +++ branches/OpenMPT-1.31/soundlib/Load_ptm.cpp Mon Sep 23 00:37:23 2024 (r21687) @@ -273,6 +273,13 @@ case CMD_GLOBALVOLUME: m.param = std::min(m.param, uint8(0x40)) * 2u; break; +#ifdef MODPLUG_TRACKER + case CMD_OFFSET: + case CMD_REVERSEOFFSET: + if(m.instr && m.instr <= GetNumSamples() && Samples[m.instr].uFlags[CHN_16BIT]) + m.param /= 2; + break; +#endif // MODPLUG_TRACKER default: break; } Modified: branches/OpenMPT-1.31/soundlib/Snd_fx.cpp ============================================================================== --- branches/OpenMPT-1.31/soundlib/Snd_fx.cpp Mon Sep 23 00:36:58 2024 (r21686) +++ branches/OpenMPT-1.31/soundlib/Snd_fx.cpp Mon Sep 23 00:37:23 2024 (r21687) @@ -5451,9 +5451,9 @@ param = (param - chn.nLoopStart) % (chn.nLoopEnd - chn.nLoopStart) + chn.nLoopStart; } - if(GetType() == MOD_TYPE_MDL && chn.dwFlags[CHN_16BIT]) + if((GetType() & (MOD_TYPE_MDL | MOD_TYPE_PTM)) && chn.dwFlags[CHN_16BIT]) { - // Digitrakker really uses byte offsets, not sample offsets. WTF! + // Digitrakker and Polytracker use byte offsets, not sample offsets. param /= 2u; } @@ -5526,7 +5526,10 @@ chn.dwFlags.set(CHN_PINGPONGFLAG); chn.dwFlags.reset(CHN_LOOP); chn.nLength = chn.pModSample->nLength; // If there was a loop, extend sample to whole length. - chn.position.Set((chn.nLength - 1) - std::min(SmpLength(param) << 8, chn.nLength - SmpLength(1)), 0); + SmpLength offset = param << 8; + if(GetType() == MOD_TYPE_PTM && chn.dwFlags[CHN_16BIT]) + offset /= 2; + chn.position.Set((chn.nLength - 1) - std::min(offset, chn.nLength - SmpLength(1)), 0); } } |
|
From: <sv...@op...> - 2024-09-22 22:37:09
|
Author: sagamusix Date: Mon Sep 23 00:36:58 2024 New Revision: 21686 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21686 Log: [Fix] PTM: Polytracker is another one of those trackers where offset command strength is halved by using 16-bit samples... fixes leveled.ptm (https://www.un4seen.com/forum/?topic=15448.msg143764#msg143764). Modified: trunk/OpenMPT/soundlib/Load_ptm.cpp trunk/OpenMPT/soundlib/Snd_fx.cpp Modified: trunk/OpenMPT/soundlib/Load_ptm.cpp ============================================================================== --- trunk/OpenMPT/soundlib/Load_ptm.cpp Mon Sep 23 00:12:23 2024 (r21685) +++ trunk/OpenMPT/soundlib/Load_ptm.cpp Mon Sep 23 00:36:58 2024 (r21686) @@ -271,6 +271,13 @@ case CMD_GLOBALVOLUME: m.param = std::min(m.param, uint8(0x40)) * 2u; break; +#ifdef MODPLUG_TRACKER + case CMD_OFFSET: + case CMD_REVERSEOFFSET: + if(m.instr && m.instr <= GetNumSamples() && Samples[m.instr].uFlags[CHN_16BIT]) + m.param /= 2; + break; +#endif // MODPLUG_TRACKER default: break; } Modified: trunk/OpenMPT/soundlib/Snd_fx.cpp ============================================================================== --- trunk/OpenMPT/soundlib/Snd_fx.cpp Mon Sep 23 00:12:23 2024 (r21685) +++ trunk/OpenMPT/soundlib/Snd_fx.cpp Mon Sep 23 00:36:58 2024 (r21686) @@ -5805,9 +5805,9 @@ param = (param - chn.nLoopStart) % (chn.nLoopEnd - chn.nLoopStart) + chn.nLoopStart; } - if(GetType() == MOD_TYPE_MDL && chn.dwFlags[CHN_16BIT]) + if((GetType() & (MOD_TYPE_MDL | MOD_TYPE_PTM)) && chn.dwFlags[CHN_16BIT]) { - // Digitrakker really uses byte offsets, not sample offsets. WTF! + // Digitrakker and Polytracker use byte offsets, not sample offsets. param /= 2u; } @@ -5883,7 +5883,10 @@ chn.dwFlags.set(CHN_PINGPONGFLAG); chn.dwFlags.reset(CHN_LOOP); chn.nLength = chn.pModSample->nLength; // If there was a loop, extend sample to whole length. - chn.position.Set((chn.nLength - 1) - std::min(SmpLength(param) << 8, chn.nLength - SmpLength(1)), 0); + SmpLength offset = param << 8; + if(GetType() == MOD_TYPE_PTM && chn.dwFlags[CHN_16BIT]) + offset /= 2; + chn.position.Set((chn.nLength - 1) - std::min(offset, chn.nLength - SmpLength(1)), 0); } } |
|
From: <sv...@op...> - 2024-09-22 22:12:37
|
Author: sagamusix Date: Mon Sep 23 00:12:23 2024 New Revision: 21685 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21685 Log: [Fix] OKT: Disable loop on type "B" samples if they're used on a mixed channel. Fixes sinfonia.okta (https://www.un4seen.com/forum/?topic=15448.msg143764#msg143764). Modified: trunk/OpenMPT/soundlib/Load_okt.cpp Modified: trunk/OpenMPT/soundlib/Load_okt.cpp ============================================================================== --- trunk/OpenMPT/soundlib/Load_okt.cpp Sun Sep 22 16:33:38 2024 (r21684) +++ trunk/OpenMPT/soundlib/Load_okt.cpp Mon Sep 23 00:12:23 2024 (r21685) @@ -30,7 +30,7 @@ }; uint32be signature; // IFF chunk name - uint32be chunksize; // chunk size without header + uint32be chunkSize; // Chunk size without header }; MPT_BINARY_STRUCT(OktIffChunk, 8) @@ -38,11 +38,11 @@ struct OktSample { char name[20]; - uint32be length; // length in bytes + uint32be length; // Length in bytes uint16be loopStart; // *2 for real value uint16be loopLength; // ditto - uint16be volume; // default volume - uint16be type; // 7-/8-bit sample + uint16be volume; // Default volume + uint16be type; // 7-/8-bit sample (0: 7-bit, only usable on paired channels ["8" in GUI], 1: 8-bit, only usable on unpaired channels ["4" in GUI], 2: 7-bit, usable on all channels ["B" in GUI]) }; MPT_BINARY_STRUCT(OktSample, 32) @@ -124,20 +124,26 @@ if(note > 0 && note <= 36) { m.note = note + (NOTE_MIDDLEC - 13); + if(pairedChn[chn] && m.note >= NOTE_MIDDLEC + 22) + m.note = NOTE_MIDDLEC + 21; + m.instr = instr + 1; if(m.instr > 0 && m.instr <= sndFile.GetNumSamples()) { - const auto &sample = sndFile.GetSample(m.instr); + auto &sample = sndFile.GetSample(m.instr); // Default volume only works on raw Paula channels if(pairedChn[chn] && sample.nVolume < 256) - { m.SetVolumeCommand(VOLCMD_VOLUME, 64); - } + // Type "B" samples (can play on both paired and unpaired channels) can have loop information, + // which can only be used on unpaired channels. The correct fix would be to have a looped and unlooped variant of this sample, + // but it is probably quite unlikely that any module relies on this behaviour. + // On the other hand, sinfonia.okta has a type "B" sample with loop points set, and it only uses paired channels. + if(pairedChn[chn] && sample.uFlags[CHN_SUSTAINLOOP]) + sample.uFlags.reset(CHN_SUSTAINLOOP); + // If channel and sample type don't match, stop this channel (add 100 to the instrument number to make it understandable what happened during import) if((sample.cues[0] == 1 && pairedChn[chn] != 0) || (sample.cues[0] == 0 && pairedChn[chn] == 0)) - { m.instr += 100; - } } } @@ -330,7 +336,7 @@ if(!file.ReadStruct(iffHead)) break; - FileReader chunk = file.ReadChunk(iffHead.chunksize); + FileReader chunk = file.ReadChunk(iffHead.chunkSize); if(!chunk.IsValid()) continue; |
|
From: <sv...@op...> - 2024-09-22 14:33:45
|
Author: manx Date: Sun Sep 22 16:33:38 2024 New Revision: 21684 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21684 Log: [Ref] openmpt123: Move IsConsole and IsTerminal. Modified: trunk/OpenMPT/openmpt123/openmpt123.cpp trunk/OpenMPT/openmpt123/openmpt123.hpp Modified: trunk/OpenMPT/openmpt123/openmpt123.cpp ============================================================================== --- trunk/OpenMPT/openmpt123/openmpt123.cpp Sun Sep 22 16:31:49 2024 (r21683) +++ trunk/OpenMPT/openmpt123/openmpt123.cpp Sun Sep 22 16:33:38 2024 (r21684) @@ -152,37 +152,6 @@ constexpr auto libopenmpt_encoding = mpt::common_encoding::utf8; -#if MPT_OS_WINDOWS && !MPT_WINRT_BEFORE(MPT_WIN_10) -bool IsConsole( DWORD stdHandle ) { - HANDLE hStd = GetStdHandle( stdHandle ); - if ( ( hStd != NULL ) && ( hStd != INVALID_HANDLE_VALUE ) ) { - DWORD mode = 0; - if ( GetConsoleMode( hStd, &mode ) != FALSE ) { - return true; - } - } - return false; -} -#endif // MPT_OS_WINDOWS && !MPT_WINRT_BEFORE(MPT_WIN_10) - -bool IsTerminal( int fd ) { -#if MPT_OS_WINDOWS && !MPT_WINRT_BEFORE(MPT_WIN_10) - if ( !_isatty( fd ) ) { - return false; - } - DWORD stdHandle = 0; - if ( fd == 0 ) { - stdHandle = STD_INPUT_HANDLE; - } else if ( fd == 1 ) { - stdHandle = STD_OUTPUT_HANDLE; - } else if ( fd == 2 ) { - stdHandle = STD_ERROR_HANDLE; - } - return IsConsole( stdHandle ); -#else - return isatty( fd ) ? true : false; -#endif -} #if !MPT_OS_WINDOWS Modified: trunk/OpenMPT/openmpt123/openmpt123.hpp ============================================================================== --- trunk/OpenMPT/openmpt123/openmpt123.hpp Sun Sep 22 16:31:49 2024 (r21683) +++ trunk/OpenMPT/openmpt123/openmpt123.hpp Sun Sep 22 16:33:38 2024 (r21684) @@ -141,9 +141,36 @@ #if MPT_OS_WINDOWS && !MPT_WINRT_BEFORE(MPT_WIN_10) -bool IsConsole( DWORD stdHandle ); +inline bool IsConsole( DWORD stdHandle ) { + HANDLE hStd = GetStdHandle( stdHandle ); + if ( ( hStd != NULL ) && ( hStd != INVALID_HANDLE_VALUE ) ) { + DWORD mode = 0; + if ( GetConsoleMode( hStd, &mode ) != FALSE ) { + return true; + } + } + return false; +} +#endif // MPT_OS_WINDOWS && !MPT_WINRT_BEFORE(MPT_WIN_10) + +inline bool IsTerminal( int fd ) { +#if MPT_OS_WINDOWS && !MPT_WINRT_BEFORE(MPT_WIN_10) + if ( !_isatty( fd ) ) { + return false; + } + DWORD stdHandle = 0; + if ( fd == 0 ) { + stdHandle = STD_INPUT_HANDLE; + } else if ( fd == 1 ) { + stdHandle = STD_OUTPUT_HANDLE; + } else if ( fd == 2 ) { + stdHandle = STD_ERROR_HANDLE; + } + return IsConsole( stdHandle ); +#else + return isatty( fd ) ? true : false; #endif -bool IsTerminal( int fd ); +} class textout : public string_concat_stream<mpt::ustring> { |
|
From: <sv...@op...> - 2024-09-22 14:32:01
|
Author: manx Date: Sun Sep 22 16:31:49 2024 New Revision: 21683 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21683 Log: [Fix] openmpt123: We do only need IsConsole() if !MPT_WINRT_BEFORE(MPT_WIN_10). Modified: trunk/OpenMPT/openmpt123/openmpt123.hpp Modified: trunk/OpenMPT/openmpt123/openmpt123.hpp ============================================================================== --- trunk/OpenMPT/openmpt123/openmpt123.hpp Sun Sep 22 14:05:50 2024 (r21682) +++ trunk/OpenMPT/openmpt123/openmpt123.hpp Sun Sep 22 16:31:49 2024 (r21683) @@ -140,7 +140,7 @@ }; -#if MPT_OS_WINDOWS +#if MPT_OS_WINDOWS && !MPT_WINRT_BEFORE(MPT_WIN_10) bool IsConsole( DWORD stdHandle ); #endif bool IsTerminal( int fd ); |
|
From: <sv...@op...> - 2024-09-22 12:06:02
|
Author: manx Date: Sun Sep 22 14:05:50 2024 New Revision: 21682 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21682 Log: [Mod] OpenMPT: Version is now 1.31.10.01 Modified: branches/OpenMPT-1.31/common/versionNumber.h Modified: branches/OpenMPT-1.31/common/versionNumber.h ============================================================================== --- branches/OpenMPT-1.31/common/versionNumber.h Sun Sep 22 14:02:08 2024 (r21681) +++ branches/OpenMPT-1.31/common/versionNumber.h Sun Sep 22 14:05:50 2024 (r21682) @@ -18,6 +18,6 @@ #define VER_MAJORMAJOR 1 #define VER_MAJOR 31 #define VER_MINOR 10 -#define VER_MINORMINOR 00 +#define VER_MINORMINOR 01 OPENMPT_NAMESPACE_END |
|
From: <sv...@op...> - 2024-09-22 12:02:19
|
Author: manx Date: Sun Sep 22 14:02:07 2024 New Revision: 21680 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21680 Log: [Mod] libopenmpt: Bump patch version. Modified: branches/OpenMPT-1.28/libopenmpt/dox/changelog.md branches/OpenMPT-1.28/libopenmpt/libopenmpt_version.h branches/OpenMPT-1.28/libopenmpt/libopenmpt_version.mk Modified: branches/OpenMPT-1.28/libopenmpt/dox/changelog.md ============================================================================== --- branches/OpenMPT-1.28/libopenmpt/dox/changelog.md Sun Sep 22 14:02:07 2024 (r21679) +++ branches/OpenMPT-1.28/libopenmpt/dox/changelog.md Sun Sep 22 14:02:07 2024 (r21680) @@ -5,6 +5,8 @@ For fully detailed change log, please see the source repository directly. This is just a high-level summary. +### libopenmpt 0.4.46-pre + ### libopenmpt 0.4.45 (2024-09-22) * Fixed inconsistency in length calculation and actual playback length with Modified: branches/OpenMPT-1.28/libopenmpt/libopenmpt_version.h ============================================================================== --- branches/OpenMPT-1.28/libopenmpt/libopenmpt_version.h Sun Sep 22 14:02:07 2024 (r21679) +++ branches/OpenMPT-1.28/libopenmpt/libopenmpt_version.h Sun Sep 22 14:02:07 2024 (r21680) @@ -19,11 +19,11 @@ /*! \brief libopenmpt minor version number */ #define OPENMPT_API_VERSION_MINOR 4 /*! \brief libopenmpt patch version number */ -#define OPENMPT_API_VERSION_PATCH 45 +#define OPENMPT_API_VERSION_PATCH 46 /*! \brief libopenmpt pre-release tag */ -#define OPENMPT_API_VERSION_PREREL "" +#define OPENMPT_API_VERSION_PREREL "-pre.0" /*! \brief libopenmpt pre-release flag */ -#define OPENMPT_API_VERSION_IS_PREREL 0 +#define OPENMPT_API_VERSION_IS_PREREL 1 /*! \brief libopenmpt version number as a single integer value * \since 0.3 Modified: branches/OpenMPT-1.28/libopenmpt/libopenmpt_version.mk ============================================================================== --- branches/OpenMPT-1.28/libopenmpt/libopenmpt_version.mk Sun Sep 22 14:02:07 2024 (r21679) +++ branches/OpenMPT-1.28/libopenmpt/libopenmpt_version.mk Sun Sep 22 14:02:07 2024 (r21680) @@ -1,8 +1,8 @@ LIBOPENMPT_VERSION_MAJOR=0 LIBOPENMPT_VERSION_MINOR=4 -LIBOPENMPT_VERSION_PATCH=45 -LIBOPENMPT_VERSION_PREREL= +LIBOPENMPT_VERSION_PATCH=46 +LIBOPENMPT_VERSION_PREREL=-pre.0 LIBOPENMPT_LTVER_CURRENT=1 -LIBOPENMPT_LTVER_REVISION=45 +LIBOPENMPT_LTVER_REVISION=46 LIBOPENMPT_LTVER_AGE=1 |
|
From: <sv...@op...> - 2024-09-22 12:02:19
|
Author: manx Date: Sun Sep 22 14:02:08 2024 New Revision: 21681 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21681 Log: [Mod] OpenMPT: Version is now 1.28.10.69 Modified: branches/OpenMPT-1.28/common/versionNumber.h Modified: branches/OpenMPT-1.28/common/versionNumber.h ============================================================================== --- branches/OpenMPT-1.28/common/versionNumber.h Sun Sep 22 14:02:07 2024 (r21680) +++ branches/OpenMPT-1.28/common/versionNumber.h Sun Sep 22 14:02:08 2024 (r21681) @@ -21,7 +21,7 @@ #define VER_MAJORMAJOR 1 #define VER_MAJOR 28 #define VER_MINOR 10 -#define VER_MINORMINOR 68 +#define VER_MINORMINOR 69 //Numerical value of the version. #define MPT_VERSION_CURRENT MAKE_VERSION_NUMERIC(VER_MAJORMAJOR,VER_MAJOR,VER_MINOR,VER_MINORMINOR) |
|
From: <sv...@op...> - 2024-09-22 12:02:16
|
Author: manx Date: Sun Sep 22 14:02:05 2024 New Revision: 21677 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21677 Log: [Mod] OpenMPT: Version is now 1.28.10.68 Modified: branches/OpenMPT-1.28/common/versionNumber.h Modified: branches/OpenMPT-1.28/common/versionNumber.h ============================================================================== --- branches/OpenMPT-1.28/common/versionNumber.h Sun Sep 22 14:01:51 2024 (r21676) +++ branches/OpenMPT-1.28/common/versionNumber.h Sun Sep 22 14:02:05 2024 (r21677) @@ -21,7 +21,7 @@ #define VER_MAJORMAJOR 1 #define VER_MAJOR 28 #define VER_MINOR 10 -#define VER_MINORMINOR 67 +#define VER_MINORMINOR 68 //Numerical value of the version. #define MPT_VERSION_CURRENT MAKE_VERSION_NUMERIC(VER_MAJORMAJOR,VER_MAJOR,VER_MINOR,VER_MINORMINOR) |
|
From: <sv...@op...> - 2024-09-22 12:02:13
|
Author: manx Date: Sun Sep 22 14:02:07 2024 New Revision: 21679 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21679 Log: tag libopenmpt-0.4.45 Added: tags/libopenmpt-0.4.45/ - copied from r21678, branches/OpenMPT-1.28/ |
|
From: <sv...@op...> - 2024-09-22 12:02:12
|
Author: manx Date: Sun Sep 22 14:02:05 2024 New Revision: 21678 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21678 Log: [Mod] libopenmpt: Prepare for release. Modified: branches/OpenMPT-1.28/libopenmpt/dox/changelog.md branches/OpenMPT-1.28/libopenmpt/libopenmpt_version.h branches/OpenMPT-1.28/libopenmpt/libopenmpt_version.mk Modified: branches/OpenMPT-1.28/libopenmpt/dox/changelog.md ============================================================================== --- branches/OpenMPT-1.28/libopenmpt/dox/changelog.md Sun Sep 22 14:02:05 2024 (r21677) +++ branches/OpenMPT-1.28/libopenmpt/dox/changelog.md Sun Sep 22 14:02:05 2024 (r21678) @@ -5,7 +5,7 @@ For fully detailed change log, please see the source repository directly. This is just a high-level summary. -### libopenmpt 0.4.45-pre +### libopenmpt 0.4.45 (2024-09-22) * Fixed inconsistency in length calculation and actual playback length with tempo commands below 32 BPM in various formats (MDL among others). Modified: branches/OpenMPT-1.28/libopenmpt/libopenmpt_version.h ============================================================================== --- branches/OpenMPT-1.28/libopenmpt/libopenmpt_version.h Sun Sep 22 14:02:05 2024 (r21677) +++ branches/OpenMPT-1.28/libopenmpt/libopenmpt_version.h Sun Sep 22 14:02:05 2024 (r21678) @@ -21,9 +21,9 @@ /*! \brief libopenmpt patch version number */ #define OPENMPT_API_VERSION_PATCH 45 /*! \brief libopenmpt pre-release tag */ -#define OPENMPT_API_VERSION_PREREL "-pre.0" +#define OPENMPT_API_VERSION_PREREL "" /*! \brief libopenmpt pre-release flag */ -#define OPENMPT_API_VERSION_IS_PREREL 1 +#define OPENMPT_API_VERSION_IS_PREREL 0 /*! \brief libopenmpt version number as a single integer value * \since 0.3 Modified: branches/OpenMPT-1.28/libopenmpt/libopenmpt_version.mk ============================================================================== --- branches/OpenMPT-1.28/libopenmpt/libopenmpt_version.mk Sun Sep 22 14:02:05 2024 (r21677) +++ branches/OpenMPT-1.28/libopenmpt/libopenmpt_version.mk Sun Sep 22 14:02:05 2024 (r21678) @@ -1,7 +1,7 @@ LIBOPENMPT_VERSION_MAJOR=0 LIBOPENMPT_VERSION_MINOR=4 LIBOPENMPT_VERSION_PATCH=45 -LIBOPENMPT_VERSION_PREREL=-pre.0 +LIBOPENMPT_VERSION_PREREL= LIBOPENMPT_LTVER_CURRENT=1 LIBOPENMPT_LTVER_REVISION=45 |
3 messages has been excluded from this view by a project administrator.
