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
(65) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <sv...@op...> - 2025-05-25 11:24:02
|
Author: manx Date: Sun May 25 13:23:55 2025 New Revision: 23188 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=23188 Log: [Fix] build: CI: GitHub: OpenBSD: Fix package install on 7.7. Modified: trunk/OpenMPT/.github/workflows/OpenBSD-Autotools.yml trunk/OpenMPT/.github/workflows/OpenBSD-Makefile.yml Modified: trunk/OpenMPT/.github/workflows/OpenBSD-Autotools.yml ============================================================================== --- trunk/OpenMPT/.github/workflows/OpenBSD-Autotools.yml Sun May 25 13:16:09 2025 (r23187) +++ trunk/OpenMPT/.github/workflows/OpenBSD-Autotools.yml Sun May 25 13:23:55 2025 (r23188) @@ -50,8 +50,8 @@ shutdown_vm: false run: | sudo pkg_add -u - sudo pkg_add -I ${{ (matrix.version == '7.6') && 'ghostscript-10.03.1p2' || (matrix.version == '7.5') && 'ghostscript-10.03.1' || (matrix.version == '7.4') && 'ghostscript-10.02.0' || 'ghostscript' }} - sudo pkg_add -I ${{ (matrix.version == '7.6') && 'autoconf-2.72p0 automake-1.16.5' || (matrix.version == '7.5') && 'autoconf-2.71 automake-1.16.5' || (matrix.version == '7.4') && 'autoconf-2.71 automake-1.16.5' || 'autoconf automake' }} + sudo pkg_add -I ${{ (matrix.version == '7.7') && 'ghostscript-10.05.0' || (matrix.version == '7.6') && 'ghostscript-10.03.1p2' || (matrix.version == '7.5') && 'ghostscript-10.03.1' || (matrix.version == '7.4') && 'ghostscript-10.02.0' || 'ghostscript' }} + sudo pkg_add -I ${{ (matrix.version == '7.7') && 'autoconf-2.72p0 automake-1.17' || (matrix.version == '7.6') && 'autoconf-2.72p0 automake-1.16.5' || (matrix.version == '7.5') && 'autoconf-2.71 automake-1.16.5' || (matrix.version == '7.4') && 'autoconf-2.71 automake-1.16.5' || 'autoconf automake' }} sudo pkg_add -I subversion p5-XML-XPath git mawk gmake pkgconf autoconf-archive libtool libltdl help2man doxygen mpg123 libogg libvorbis flac libsndfile pulseaudio portaudio-svn sdl2 - name: Build uses: cross-platform-actions/action@v0.28.0 Modified: trunk/OpenMPT/.github/workflows/OpenBSD-Makefile.yml ============================================================================== --- trunk/OpenMPT/.github/workflows/OpenBSD-Makefile.yml Sun May 25 13:16:09 2025 (r23187) +++ trunk/OpenMPT/.github/workflows/OpenBSD-Makefile.yml Sun May 25 13:23:55 2025 (r23188) @@ -58,8 +58,8 @@ shutdown_vm: false run: | sudo pkg_add -u - sudo pkg_add -I ${{ (matrix.version == '7.6') && 'ghostscript-10.03.1p2' || (matrix.version == '7.5') && 'ghostscript-10.03.1' || (matrix.version == '7.4') && 'ghostscript-10.02.0' || 'ghostscript' }} - sudo pkg_add -I ${{ (matrix.version == '7.6') && 'autoconf-2.72p0 automake-1.16.5' || (matrix.version == '7.5') && 'autoconf-2.71 automake-1.16.5' || (matrix.version == '7.4') && 'autoconf-2.71 automake-1.16.5' || 'autoconf automake' }} + sudo pkg_add -I ${{ (matrix.version == '7.7') && 'ghostscript-10.05.0' || (matrix.version == '7.6') && 'ghostscript-10.03.1p2' || (matrix.version == '7.5') && 'ghostscript-10.03.1' || (matrix.version == '7.4') && 'ghostscript-10.02.0' || 'ghostscript' }} + sudo pkg_add -I ${{ (matrix.version == '7.7') && 'autoconf-2.72p0 automake-1.17' || (matrix.version == '7.6') && 'autoconf-2.72p0 automake-1.16.5' || (matrix.version == '7.5') && 'autoconf-2.71 automake-1.16.5' || (matrix.version == '7.4') && 'autoconf-2.71 automake-1.16.5' || 'autoconf automake' }} sudo pkg_add -I subversion p5-XML-XPath git mawk gmake pkgconf autoconf-archive libtool libltdl help2man doxygen mpg123 libogg libvorbis flac libsndfile pulseaudio portaudio-svn sdl2 - name: Build uses: cross-platform-actions/action@v0.28.0 |
|
From: <sv...@op...> - 2025-05-25 11:16:52
|
Author: manx Date: Sun May 25 13:16:09 2025 New Revision: 23187 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=23187 Log: Merged revision(s) 23181 from trunk/OpenMPT: [Ref] mpt/base/detect_compiler.hpp: Detect VS2022 17.14. ........ Modified: branches/OpenMPT-1.30/ (props changed) branches/OpenMPT-1.30/src/mpt/base/detect_compiler.hpp Modified: branches/OpenMPT-1.30/src/mpt/base/detect_compiler.hpp ============================================================================== --- branches/OpenMPT-1.30/src/mpt/base/detect_compiler.hpp Sun May 25 13:15:40 2025 (r23186) +++ branches/OpenMPT-1.30/src/mpt/base/detect_compiler.hpp Sun May 25 13:16:09 2025 (r23187) @@ -50,7 +50,9 @@ #elif defined(_MSC_VER) #define MPT_COMPILER_MSVC 1 -#if (_MSC_VER >= 1943) +#if (_MSC_VER >= 1944) +#define MPT_COMPILER_MSVC_VERSION MPT_COMPILER_MAKE_VERSION2(2022, 14) +#elif (_MSC_VER >= 1943) #define MPT_COMPILER_MSVC_VERSION MPT_COMPILER_MAKE_VERSION2(2022, 13) #elif (_MSC_VER >= 1942) #define MPT_COMPILER_MSVC_VERSION MPT_COMPILER_MAKE_VERSION2(2022, 12) |
|
From: <sv...@op...> - 2025-05-25 11:16:18
|
Author: manx Date: Sun May 25 13:15:40 2025 New Revision: 23186 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=23186 Log: Merged revision(s) 23182 from trunk/OpenMPT: [Fix] mpt/base/detect_quirks.hpp: Also apply MPT_LIBCXX_QUIRK_CHRONO_TZ_MEMLEAK for VS2022.14. It's still not fixed. ........ Modified: branches/OpenMPT-1.31/ (props changed) branches/OpenMPT-1.31/src/mpt/base/detect_quirks.hpp Modified: branches/OpenMPT-1.31/src/mpt/base/detect_quirks.hpp ============================================================================== --- branches/OpenMPT-1.31/src/mpt/base/detect_quirks.hpp Sun May 25 13:15:00 2025 (r23185) +++ branches/OpenMPT-1.31/src/mpt/base/detect_quirks.hpp Sun May 25 13:15:40 2025 (r23186) @@ -276,7 +276,7 @@ #elif MPT_LIBCXX_GNU #define MPT_LIBCXX_QUIRK_NO_CHRONO_DATE_PARSE #endif -#if MPT_LIBCXX_MS && (MPT_MSVC_BEFORE(2022, 14) || !MPT_COMPILER_MSVC) +#if MPT_LIBCXX_MS && (MPT_MSVC_BEFORE(2022, 15) || !MPT_COMPILER_MSVC) // Causes massive memory leaks. // See // <https://developercommunity.visualstudio.com/t/stdchronoget-tzdb-list-memory-leak/1644641> |
|
From: <sv...@op...> - 2025-05-25 11:15:45
|
Author: manx Date: Sun May 25 13:14:02 2025 New Revision: 23183 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=23183 Log: Merged revision(s) 23181 from trunk/OpenMPT: [Ref] mpt/base/detect_compiler.hpp: Detect VS2022 17.14. ........ Modified: branches/OpenMPT-1.32/ (props changed) branches/OpenMPT-1.32/src/mpt/base/detect_compiler.hpp Modified: branches/OpenMPT-1.32/src/mpt/base/detect_compiler.hpp ============================================================================== --- branches/OpenMPT-1.32/src/mpt/base/detect_compiler.hpp Sun May 25 13:13:25 2025 (r23182) +++ branches/OpenMPT-1.32/src/mpt/base/detect_compiler.hpp Sun May 25 13:14:02 2025 (r23183) @@ -50,7 +50,9 @@ #elif defined(_MSC_VER) #define MPT_COMPILER_MSVC 1 -#if (_MSC_VER >= 1943) +#if (_MSC_VER >= 1944) +#define MPT_COMPILER_MSVC_VERSION MPT_COMPILER_MAKE_VERSION2(2022, 14) +#elif (_MSC_VER >= 1943) #define MPT_COMPILER_MSVC_VERSION MPT_COMPILER_MAKE_VERSION2(2022, 13) #elif (_MSC_VER >= 1942) #define MPT_COMPILER_MSVC_VERSION MPT_COMPILER_MAKE_VERSION2(2022, 12) |
|
From: <sv...@op...> - 2025-05-25 11:15:16
|
Author: manx Date: Sun May 25 13:15:00 2025 New Revision: 23185 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=23185 Log: Merged revision(s) 23181 from trunk/OpenMPT: [Ref] mpt/base/detect_compiler.hpp: Detect VS2022 17.14. ........ Modified: branches/OpenMPT-1.31/ (props changed) branches/OpenMPT-1.31/src/mpt/base/detect_compiler.hpp Modified: branches/OpenMPT-1.31/src/mpt/base/detect_compiler.hpp ============================================================================== --- branches/OpenMPT-1.31/src/mpt/base/detect_compiler.hpp Sun May 25 13:14:30 2025 (r23184) +++ branches/OpenMPT-1.31/src/mpt/base/detect_compiler.hpp Sun May 25 13:15:00 2025 (r23185) @@ -50,7 +50,9 @@ #elif defined(_MSC_VER) #define MPT_COMPILER_MSVC 1 -#if (_MSC_VER >= 1943) +#if (_MSC_VER >= 1944) +#define MPT_COMPILER_MSVC_VERSION MPT_COMPILER_MAKE_VERSION2(2022, 14) +#elif (_MSC_VER >= 1943) #define MPT_COMPILER_MSVC_VERSION MPT_COMPILER_MAKE_VERSION2(2022, 13) #elif (_MSC_VER >= 1942) #define MPT_COMPILER_MSVC_VERSION MPT_COMPILER_MAKE_VERSION2(2022, 12) |
|
From: <sv...@op...> - 2025-05-25 11:15:07
|
Author: manx Date: Sun May 25 13:14:30 2025 New Revision: 23184 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=23184 Log: Merged revision(s) 23182 from trunk/OpenMPT: [Fix] mpt/base/detect_quirks.hpp: Also apply MPT_LIBCXX_QUIRK_CHRONO_TZ_MEMLEAK for VS2022.14. It's still not fixed. ........ Modified: branches/OpenMPT-1.32/ (props changed) branches/OpenMPT-1.32/src/mpt/base/detect_quirks.hpp Modified: branches/OpenMPT-1.32/src/mpt/base/detect_quirks.hpp ============================================================================== --- branches/OpenMPT-1.32/src/mpt/base/detect_quirks.hpp Sun May 25 13:14:02 2025 (r23183) +++ branches/OpenMPT-1.32/src/mpt/base/detect_quirks.hpp Sun May 25 13:14:30 2025 (r23184) @@ -333,7 +333,7 @@ #elif MPT_LIBCXX_GNU #define MPT_LIBCXX_QUIRK_NO_CHRONO_DATE_PARSE #endif -#if MPT_LIBCXX_MS && (MPT_MSVC_BEFORE(2022, 14) || !MPT_COMPILER_MSVC) +#if MPT_LIBCXX_MS && (MPT_MSVC_BEFORE(2022, 15) || !MPT_COMPILER_MSVC) // Causes massive memory leaks. // See // <https://developercommunity.visualstudio.com/t/stdchronoget-tzdb-list-memory-leak/1644641> |
|
From: <sv...@op...> - 2025-05-25 11:14:07
|
Author: manx Date: Sun May 25 13:13:25 2025 New Revision: 23182 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=23182 Log: [Fix] mpt/base/detect_quirks.hpp: Also apply MPT_LIBCXX_QUIRK_CHRONO_TZ_MEMLEAK for VS2022.14. It's still not fixed. Modified: trunk/OpenMPT/src/mpt/base/detect_quirks.hpp Modified: trunk/OpenMPT/src/mpt/base/detect_quirks.hpp ============================================================================== --- trunk/OpenMPT/src/mpt/base/detect_quirks.hpp Sun May 25 13:12:16 2025 (r23181) +++ trunk/OpenMPT/src/mpt/base/detect_quirks.hpp Sun May 25 13:13:25 2025 (r23182) @@ -333,7 +333,7 @@ #elif MPT_LIBCXX_GNU #define MPT_LIBCXX_QUIRK_NO_CHRONO_DATE_PARSE #endif -#if MPT_LIBCXX_MS && (MPT_MSVC_BEFORE(2022, 14) || !MPT_COMPILER_MSVC) +#if MPT_LIBCXX_MS && (MPT_MSVC_BEFORE(2022, 15) || !MPT_COMPILER_MSVC) // Causes massive memory leaks. // See // <https://developercommunity.visualstudio.com/t/stdchronoget-tzdb-list-memory-leak/1644641> |
|
From: <sv...@op...> - 2025-05-25 11:12:28
|
Author: manx Date: Sun May 25 13:12:16 2025 New Revision: 23181 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=23181 Log: [Ref] mpt/base/detect_compiler.hpp: Detect VS2022 17.14. Modified: trunk/OpenMPT/src/mpt/base/detect_compiler.hpp Modified: trunk/OpenMPT/src/mpt/base/detect_compiler.hpp ============================================================================== --- trunk/OpenMPT/src/mpt/base/detect_compiler.hpp Sun May 25 13:10:47 2025 (r23180) +++ trunk/OpenMPT/src/mpt/base/detect_compiler.hpp Sun May 25 13:12:16 2025 (r23181) @@ -50,7 +50,9 @@ #elif defined(_MSC_VER) #define MPT_COMPILER_MSVC 1 -#if (_MSC_VER >= 1943) +#if (_MSC_VER >= 1944) +#define MPT_COMPILER_MSVC_VERSION MPT_COMPILER_MAKE_VERSION2(2022, 14) +#elif (_MSC_VER >= 1943) #define MPT_COMPILER_MSVC_VERSION MPT_COMPILER_MAKE_VERSION2(2022, 13) #elif (_MSC_VER >= 1942) #define MPT_COMPILER_MSVC_VERSION MPT_COMPILER_MAKE_VERSION2(2022, 12) |
|
From: <sv...@op...> - 2025-05-25 11:10:55
|
Author: manx Date: Sun May 25 13:10:47 2025 New Revision: 23180 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=23180 Log: Merged revision(s) 23179 from trunk/OpenMPT: [Var] InnoSetup: Update to 6.4.3. ........ Modified: branches/OpenMPT-1.32/ (props changed) branches/OpenMPT-1.32/build/download_externals.cmd branches/OpenMPT-1.32/build/download_externals.txt Modified: branches/OpenMPT-1.32/build/download_externals.cmd ============================================================================== --- branches/OpenMPT-1.32/build/download_externals.cmd Sun May 25 13:08:40 2025 (r23179) +++ branches/OpenMPT-1.32/build/download_externals.cmd Sun May 25 13:10:47 2025 (r23180) @@ -52,7 +52,7 @@ call :killdir "build\tools\innosetup" || goto error mkdir "build\tools\innosetup" || goto error -"build\externals\innosetup-6.4.2.exe" /PORTABLE=1 /CURRENTUSER /DIR="%CD%\build\tools\innosetup\{app}" /LOG="%CD%\build\tools\innosetup\setup.log" /SILENT || goto error +"build\externals\innosetup-6.4.3.exe" /PORTABLE=1 /CURRENTUSER /DIR="%CD%\build\tools\innosetup\{app}" /LOG="%CD%\build\tools\innosetup\setup.log" /SILENT || goto error call :killdir "build\tools\innounp" || goto error call :killdir "build\tools\innosetup5" || goto error Modified: branches/OpenMPT-1.32/build/download_externals.txt ============================================================================== --- branches/OpenMPT-1.32/build/download_externals.txt Sun May 25 13:08:40 2025 (r23179) +++ branches/OpenMPT-1.32/build/download_externals.txt Sun May 25 13:10:47 2025 (r23180) @@ -6,7 +6,7 @@ "build/externals/htmlhelp.exe" 3509072 d91371244ea98c691b4674ee266c4a2496a296800c176adae069d21f5c52c0763b21cc7859cfffa865b89e50171a2c99a6d14620c32f7d72c0ef04045348f856 "https://web.archive.org/web/20200918004813id_/https://download.microsoft.com/download/0/A/9/0A939EF6-E31C-430F-A3DF-DFAE7960D564/htmlhelp.exe" "https://web.archive.org/web/20200918004813id_/http://download.microsoft.com/download/0/A/9/0A939EF6-E31C-430F-A3DF-DFAE7960D564/htmlhelp.exe" "build/externals/python-3.13.3-embed-amd64.zip" 10885425 03415a37049606b0d9d78c5d8b0467b704d3b3d2577c4bf7fca83baa4eb51b4951170f6050f8591bf1720f91cd53435184545a6273285ebb88524d07e230f74e "https://www.python.org/ftp/python/3.13.3/python-3.13.3-embed-amd64.zip" "build/externals/innounp050.rar" 141621 dbbc809308267a866db9d6b751fdeda6d179e1a65d8ddb14bb51984431ae91493f9a76105e1789b245732043a2c696c869ed10964b48cf59f81e55bd52f85330 "https://netcologne.dl.sourceforge.net/project/innounp/innounp/innounp 0.50/innounp050.rar" "https://deac-fra.dl.sourceforge.net/project/innounp/innounp/innounp 0.50/innounp050.rar" -"build/externals/innosetup-6.4.2.exe" 6310880 ff1522e05e59a41c8705d5da072a187eb0a414b670f1538e6d2b634a6f64a2b386f95b6cefc191fecc3673b25bdf2901f547c0b6cd725d9796e214db7ac0af86 "https://files.jrsoftware.org/is/6/innosetup-6.4.2.exe" "https://files.innosetup.nl/innosetup-6.4.2.exe" +"build/externals/innosetup-6.4.3.exe" 6454616 b4c635b17f18d3c2aafa23fb7f7ca7c82748bed3c4ffd5585001f22ed14e0d23ef77d94826e3fdef7ddab2f3000aadf75e4a69171d3cf856146f7e73f1a89341 "https://files.jrsoftware.org/is/6/innosetup-6.4.3.exe" "https://files.innosetup.nl/innosetup-6.4.3.exe" "build/externals/isetup-5.5.8-unicode.exe" 2342456 da7e27d85caec85b4194c7b1412c5a64c0ae12f22d903b94f2f4ee9ea0cb99c91b2d1dbb49262eefae8129e6b91f5c46f26f353011076e77e75f9c955fc5e1cb "https://files.jrsoftware.org/is/5/isetup-5.5.8-unicode.exe" "https://web.archive.org/web/20230523165634id_/https://files.jrsoftware.org/is/5/isetup-5.5.8-unicode.exe" "build/externals/example_songs_ompt_1_30.7z" 4881392 bfecf7f97fd71bd52bcfb38307ccb98c751e6a0fa0c1f31208b22b9392f03ea3da8f9271327df2de4fc2e463e0c13c6a24107fbe18caf8f446b7e7cf93073fa5 "https://download.openmpt.org/resources/modules/example_songs_ompt_1_30.7z" "build/externals/allegro-4.2.3.1-hg.8+r8500.zip" 3872466 46cd8d4d7138b795dbc66994e953d0abc578c6d3c00615e3580237458529d33d7ad9d269a9778918d4b3719d75750d5cca74ff6bf38ad357a766472799ee9e7b "https://lib.openmpt.org/files/libopenmpt/contrib/allegro/allegro-4.2.3.1-hg.8+r8500.zip" "https://mercury.sexy/members/manx/liballegro-4.2/allegro-4.2.3.1-hg.8+r8500.zip" |
|
From: <sv...@op...> - 2025-05-25 11:09:18
|
Author: manx Date: Sun May 25 13:08:40 2025 New Revision: 23179 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=23179 Log: [Var] InnoSetup: Update to 6.4.3. Modified: trunk/OpenMPT/build/download_externals.cmd trunk/OpenMPT/build/download_externals.txt Modified: trunk/OpenMPT/build/download_externals.cmd ============================================================================== --- trunk/OpenMPT/build/download_externals.cmd Sun May 25 13:07:33 2025 (r23178) +++ trunk/OpenMPT/build/download_externals.cmd Sun May 25 13:08:40 2025 (r23179) @@ -52,7 +52,7 @@ call :killdir "build\tools\innosetup" || goto error mkdir "build\tools\innosetup" || goto error -"build\externals\innosetup-6.4.2.exe" /PORTABLE=1 /CURRENTUSER /DIR="%CD%\build\tools\innosetup\{app}" /LOG="%CD%\build\tools\innosetup\setup.log" /SILENT || goto error +"build\externals\innosetup-6.4.3.exe" /PORTABLE=1 /CURRENTUSER /DIR="%CD%\build\tools\innosetup\{app}" /LOG="%CD%\build\tools\innosetup\setup.log" /SILENT || goto error call :killdir "build\tools\innounp" || goto error call :killdir "build\tools\innosetup5" || goto error Modified: trunk/OpenMPT/build/download_externals.txt ============================================================================== --- trunk/OpenMPT/build/download_externals.txt Sun May 25 13:07:33 2025 (r23178) +++ trunk/OpenMPT/build/download_externals.txt Sun May 25 13:08:40 2025 (r23179) @@ -6,7 +6,7 @@ "build/externals/htmlhelp.exe" 3509072 d91371244ea98c691b4674ee266c4a2496a296800c176adae069d21f5c52c0763b21cc7859cfffa865b89e50171a2c99a6d14620c32f7d72c0ef04045348f856 "https://web.archive.org/web/20200918004813id_/https://download.microsoft.com/download/0/A/9/0A939EF6-E31C-430F-A3DF-DFAE7960D564/htmlhelp.exe" "https://web.archive.org/web/20200918004813id_/http://download.microsoft.com/download/0/A/9/0A939EF6-E31C-430F-A3DF-DFAE7960D564/htmlhelp.exe" "build/externals/python-3.13.3-embed-amd64.zip" 10885425 03415a37049606b0d9d78c5d8b0467b704d3b3d2577c4bf7fca83baa4eb51b4951170f6050f8591bf1720f91cd53435184545a6273285ebb88524d07e230f74e "https://www.python.org/ftp/python/3.13.3/python-3.13.3-embed-amd64.zip" "build/externals/innounp050.rar" 141621 dbbc809308267a866db9d6b751fdeda6d179e1a65d8ddb14bb51984431ae91493f9a76105e1789b245732043a2c696c869ed10964b48cf59f81e55bd52f85330 "https://netcologne.dl.sourceforge.net/project/innounp/innounp/innounp 0.50/innounp050.rar" "https://deac-fra.dl.sourceforge.net/project/innounp/innounp/innounp 0.50/innounp050.rar" -"build/externals/innosetup-6.4.2.exe" 6310880 ff1522e05e59a41c8705d5da072a187eb0a414b670f1538e6d2b634a6f64a2b386f95b6cefc191fecc3673b25bdf2901f547c0b6cd725d9796e214db7ac0af86 "https://files.jrsoftware.org/is/6/innosetup-6.4.2.exe" "https://files.innosetup.nl/innosetup-6.4.2.exe" +"build/externals/innosetup-6.4.3.exe" 6454616 b4c635b17f18d3c2aafa23fb7f7ca7c82748bed3c4ffd5585001f22ed14e0d23ef77d94826e3fdef7ddab2f3000aadf75e4a69171d3cf856146f7e73f1a89341 "https://files.jrsoftware.org/is/6/innosetup-6.4.3.exe" "https://files.innosetup.nl/innosetup-6.4.3.exe" "build/externals/isetup-5.5.8-unicode.exe" 2342456 da7e27d85caec85b4194c7b1412c5a64c0ae12f22d903b94f2f4ee9ea0cb99c91b2d1dbb49262eefae8129e6b91f5c46f26f353011076e77e75f9c955fc5e1cb "https://files.jrsoftware.org/is/5/isetup-5.5.8-unicode.exe" "https://web.archive.org/web/20230523165634id_/https://files.jrsoftware.org/is/5/isetup-5.5.8-unicode.exe" "build/externals/example_songs_ompt_1_30.7z" 4881392 bfecf7f97fd71bd52bcfb38307ccb98c751e6a0fa0c1f31208b22b9392f03ea3da8f9271327df2de4fc2e463e0c13c6a24107fbe18caf8f446b7e7cf93073fa5 "https://download.openmpt.org/resources/modules/example_songs_ompt_1_30.7z" "build/externals/allegro-4.2.3.1-hg.8+r8500.zip" 3872466 46cd8d4d7138b795dbc66994e953d0abc578c6d3c00615e3580237458529d33d7ad9d269a9778918d4b3719d75750d5cca74ff6bf38ad357a766472799ee9e7b "https://lib.openmpt.org/files/libopenmpt/contrib/allegro/allegro-4.2.3.1-hg.8+r8500.zip" "https://mercury.sexy/members/manx/liballegro-4.2/allegro-4.2.3.1-hg.8+r8500.zip" |
|
From: <sv...@op...> - 2025-05-25 11:07:44
|
Author: manx Date: Sun May 25 13:07:33 2025 New Revision: 23178 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=23178 Log: Merged revision(s) 23177 from branches/OpenMPT-1.29: Merged revision(s) 23176 from branches/OpenMPT-1.30: [Var] build: CI: GitHub: CPA: Update to 0.28.0. ........ ........ Modified: branches/OpenMPT-1.28/ (props changed) branches/OpenMPT-1.28/.github/workflows/FreeBSD-13.5-Makefile.yml Modified: branches/OpenMPT-1.28/.github/workflows/FreeBSD-13.5-Makefile.yml ============================================================================== --- branches/OpenMPT-1.28/.github/workflows/FreeBSD-13.5-Makefile.yml Sun May 25 13:07:09 2025 (r23177) +++ branches/OpenMPT-1.28/.github/workflows/FreeBSD-13.5-Makefile.yml Sun May 25 13:07:33 2025 (r23178) @@ -17,7 +17,7 @@ - name: Checkout uses: actions/checkout@v4 - name: Startup VM - uses: cross-platform-actions/action@2d97d42e1972a17b045fd709a422f7e55a86230d + uses: cross-platform-actions/action@v0.28.0 with: architecture: x86_64 memory: 4G @@ -28,7 +28,7 @@ shutdown_vm: false run: true - name: Install dependencies - uses: cross-platform-actions/action@2d97d42e1972a17b045fd709a422f7e55a86230d + uses: cross-platform-actions/action@v0.28.0 with: architecture: x86_64 memory: 4G @@ -41,7 +41,7 @@ sudo pkg upgrade -y sudo pkg install -y subversion p5-XML-XPath git mawk gmake pkgconf autoconf autoconf-archive automake libtool help2man doxygen mpg123 libogg libvorbis flac libsndfile pulseaudio portaudio sdl2 - name: Build - uses: cross-platform-actions/action@2d97d42e1972a17b045fd709a422f7e55a86230d + uses: cross-platform-actions/action@v0.28.0 with: architecture: x86_64 memory: 4G @@ -53,7 +53,7 @@ run: | gmake -j$(sysctl -n hw.ncpu) STRICT=1 VERBOSE=1 AUTO_DEPS=1 - name: Test - uses: cross-platform-actions/action@2d97d42e1972a17b045fd709a422f7e55a86230d + uses: cross-platform-actions/action@v0.28.0 with: architecture: x86_64 memory: 4G @@ -65,7 +65,7 @@ run: | gmake -j$(sysctl -n hw.ncpu) STRICT=1 VERBOSE=1 AUTO_DEPS=1 check - name: Shutdown VM - uses: cross-platform-actions/action@2d97d42e1972a17b045fd709a422f7e55a86230d + uses: cross-platform-actions/action@v0.28.0 with: architecture: x86_64 memory: 4G |
|
From: <sv...@op...> - 2025-05-25 11:07:20
|
Author: manx Date: Sun May 25 13:07:09 2025 New Revision: 23177 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=23177 Log: Merged revision(s) 23176 from branches/OpenMPT-1.30: [Var] build: CI: GitHub: CPA: Update to 0.28.0. ........ Modified: branches/OpenMPT-1.29/ (props changed) branches/OpenMPT-1.29/.github/workflows/FreeBSD-13.5-Makefile.yml Modified: branches/OpenMPT-1.29/.github/workflows/FreeBSD-13.5-Makefile.yml ============================================================================== --- branches/OpenMPT-1.29/.github/workflows/FreeBSD-13.5-Makefile.yml Sun May 25 13:06:15 2025 (r23176) +++ branches/OpenMPT-1.29/.github/workflows/FreeBSD-13.5-Makefile.yml Sun May 25 13:07:09 2025 (r23177) @@ -17,7 +17,7 @@ - name: Checkout uses: actions/checkout@v4 - name: Startup VM - uses: cross-platform-actions/action@2d97d42e1972a17b045fd709a422f7e55a86230d + uses: cross-platform-actions/action@v0.28.0 with: architecture: x86_64 memory: 4G @@ -28,7 +28,7 @@ shutdown_vm: false run: true - name: Install dependencies - uses: cross-platform-actions/action@2d97d42e1972a17b045fd709a422f7e55a86230d + uses: cross-platform-actions/action@v0.28.0 with: architecture: x86_64 memory: 4G @@ -41,7 +41,7 @@ sudo pkg upgrade -y sudo pkg install -y subversion p5-XML-XPath git mawk gmake pkgconf autoconf autoconf-archive automake libtool help2man doxygen mpg123 libogg libvorbis flac libsndfile pulseaudio portaudio sdl2 - name: Build - uses: cross-platform-actions/action@2d97d42e1972a17b045fd709a422f7e55a86230d + uses: cross-platform-actions/action@v0.28.0 with: architecture: x86_64 memory: 4G @@ -53,7 +53,7 @@ run: | gmake -j$(sysctl -n hw.ncpu) STRICT=1 VERBOSE=1 AUTO_DEPS=1 - name: Test - uses: cross-platform-actions/action@2d97d42e1972a17b045fd709a422f7e55a86230d + uses: cross-platform-actions/action@v0.28.0 with: architecture: x86_64 memory: 4G @@ -65,7 +65,7 @@ run: | gmake -j$(sysctl -n hw.ncpu) STRICT=1 VERBOSE=1 AUTO_DEPS=1 check - name: Shutdown VM - uses: cross-platform-actions/action@2d97d42e1972a17b045fd709a422f7e55a86230d + uses: cross-platform-actions/action@v0.28.0 with: architecture: x86_64 memory: 4G |
|
From: <sv...@op...> - 2025-05-25 11:06:27
|
Author: manx Date: Sun May 25 13:06:15 2025 New Revision: 23176 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=23176 Log: [Var] build: CI: GitHub: CPA: Update to 0.28.0. Modified: branches/OpenMPT-1.30/.github/workflows/FreeBSD-13.5-Makefile.yml branches/OpenMPT-1.30/.github/workflows/FreeBSD-14.2-Makefile.yml branches/OpenMPT-1.30/.github/workflows/OpenBSD-7.4-Makefile.yml branches/OpenMPT-1.30/.github/workflows/OpenBSD-7.5-Makefile.yml branches/OpenMPT-1.30/.github/workflows/OpenBSD-7.6-Makefile.yml Modified: branches/OpenMPT-1.30/.github/workflows/FreeBSD-13.5-Makefile.yml ============================================================================== --- branches/OpenMPT-1.30/.github/workflows/FreeBSD-13.5-Makefile.yml Sun May 25 13:04:52 2025 (r23175) +++ branches/OpenMPT-1.30/.github/workflows/FreeBSD-13.5-Makefile.yml Sun May 25 13:06:15 2025 (r23176) @@ -17,7 +17,7 @@ - name: Checkout uses: actions/checkout@v4 - name: Startup VM - uses: cross-platform-actions/action@2d97d42e1972a17b045fd709a422f7e55a86230d + uses: cross-platform-actions/action@v0.28.0 with: architecture: x86_64 memory: 4G @@ -28,7 +28,7 @@ shutdown_vm: false run: true - name: Install dependencies - uses: cross-platform-actions/action@2d97d42e1972a17b045fd709a422f7e55a86230d + uses: cross-platform-actions/action@v0.28.0 with: architecture: x86_64 memory: 4G @@ -41,7 +41,7 @@ sudo pkg upgrade -y sudo pkg install -y subversion p5-XML-XPath git mawk gmake pkgconf autoconf autoconf-archive automake libtool help2man doxygen mpg123 libogg libvorbis flac libsndfile pulseaudio portaudio sdl2 - name: Build - uses: cross-platform-actions/action@2d97d42e1972a17b045fd709a422f7e55a86230d + uses: cross-platform-actions/action@v0.28.0 with: architecture: x86_64 memory: 4G @@ -53,7 +53,7 @@ run: | gmake -j$(sysctl -n hw.ncpu) STRICT=1 VERBOSE=1 AUTO_DEPS=1 - name: Test - uses: cross-platform-actions/action@2d97d42e1972a17b045fd709a422f7e55a86230d + uses: cross-platform-actions/action@v0.28.0 with: architecture: x86_64 memory: 4G @@ -65,7 +65,7 @@ run: | gmake -j$(sysctl -n hw.ncpu) STRICT=1 VERBOSE=1 AUTO_DEPS=1 check - name: Shutdown VM - uses: cross-platform-actions/action@2d97d42e1972a17b045fd709a422f7e55a86230d + uses: cross-platform-actions/action@v0.28.0 with: architecture: x86_64 memory: 4G Modified: branches/OpenMPT-1.30/.github/workflows/FreeBSD-14.2-Makefile.yml ============================================================================== --- branches/OpenMPT-1.30/.github/workflows/FreeBSD-14.2-Makefile.yml Sun May 25 13:04:52 2025 (r23175) +++ branches/OpenMPT-1.30/.github/workflows/FreeBSD-14.2-Makefile.yml Sun May 25 13:06:15 2025 (r23176) @@ -17,7 +17,7 @@ - name: Checkout uses: actions/checkout@v4 - name: Startup VM - uses: cross-platform-actions/action@v0.27.0 + uses: cross-platform-actions/action@v0.28.0 with: architecture: x86_64 memory: 4G @@ -28,7 +28,7 @@ shutdown_vm: false run: true - name: Install dependencies - uses: cross-platform-actions/action@v0.27.0 + uses: cross-platform-actions/action@v0.28.0 with: architecture: x86_64 memory: 4G @@ -41,7 +41,7 @@ sudo pkg upgrade -y sudo pkg install -y subversion p5-XML-XPath git mawk gmake pkgconf autoconf autoconf-archive automake libtool help2man doxygen mpg123 libogg libvorbis flac libsndfile pulseaudio portaudio sdl2 - name: Build - uses: cross-platform-actions/action@v0.27.0 + uses: cross-platform-actions/action@v0.28.0 with: architecture: x86_64 memory: 4G @@ -53,7 +53,7 @@ run: | gmake -j$(sysctl -n hw.ncpu) STRICT=1 VERBOSE=1 AUTO_DEPS=1 - name: Test - uses: cross-platform-actions/action@v0.27.0 + uses: cross-platform-actions/action@v0.28.0 with: architecture: x86_64 memory: 4G @@ -65,7 +65,7 @@ run: | gmake -j$(sysctl -n hw.ncpu) STRICT=1 VERBOSE=1 AUTO_DEPS=1 check - name: Shutdown VM - uses: cross-platform-actions/action@v0.27.0 + uses: cross-platform-actions/action@v0.28.0 with: architecture: x86_64 memory: 4G Modified: branches/OpenMPT-1.30/.github/workflows/OpenBSD-7.4-Makefile.yml ============================================================================== --- branches/OpenMPT-1.30/.github/workflows/OpenBSD-7.4-Makefile.yml Sun May 25 13:04:52 2025 (r23175) +++ branches/OpenMPT-1.30/.github/workflows/OpenBSD-7.4-Makefile.yml Sun May 25 13:06:15 2025 (r23176) @@ -17,7 +17,7 @@ - name: Checkout uses: actions/checkout@v4 - name: Startup VM - uses: cross-platform-actions/action@v0.27.0 + uses: cross-platform-actions/action@v0.28.0 with: architecture: x86_64 memory: 4G @@ -28,7 +28,7 @@ shutdown_vm: false run: true - name: Install dependencies - uses: cross-platform-actions/action@v0.27.0 + uses: cross-platform-actions/action@v0.28.0 with: architecture: x86_64 memory: 4G @@ -43,7 +43,7 @@ sudo pkg_add -I autoconf-2.71 automake-1.16.5 sudo pkg_add -I subversion p5-XML-XPath git mawk gmake pkgconf autoconf-archive libtool libltdl help2man doxygen mpg123 libogg libvorbis flac libsndfile pulseaudio portaudio-svn sdl2 - name: Build - uses: cross-platform-actions/action@v0.27.0 + uses: cross-platform-actions/action@v0.28.0 with: architecture: x86_64 memory: 4G @@ -55,7 +55,7 @@ run: | gmake -j$(sysctl -n hw.ncpu) STRICT=1 VERBOSE=1 AUTO_DEPS=1 - name: Test - uses: cross-platform-actions/action@v0.27.0 + uses: cross-platform-actions/action@v0.28.0 with: architecture: x86_64 memory: 4G @@ -67,7 +67,7 @@ run: | gmake -j$(sysctl -n hw.ncpu) STRICT=1 VERBOSE=1 AUTO_DEPS=1 check - name: Shutdown VM - uses: cross-platform-actions/action@v0.27.0 + uses: cross-platform-actions/action@v0.28.0 with: architecture: x86_64 memory: 4G Modified: branches/OpenMPT-1.30/.github/workflows/OpenBSD-7.5-Makefile.yml ============================================================================== --- branches/OpenMPT-1.30/.github/workflows/OpenBSD-7.5-Makefile.yml Sun May 25 13:04:52 2025 (r23175) +++ branches/OpenMPT-1.30/.github/workflows/OpenBSD-7.5-Makefile.yml Sun May 25 13:06:15 2025 (r23176) @@ -17,7 +17,7 @@ - name: Checkout uses: actions/checkout@v4 - name: Startup VM - uses: cross-platform-actions/action@v0.27.0 + uses: cross-platform-actions/action@v0.28.0 with: architecture: x86_64 memory: 4G @@ -28,7 +28,7 @@ shutdown_vm: false run: true - name: Install dependencies - uses: cross-platform-actions/action@v0.27.0 + uses: cross-platform-actions/action@v0.28.0 with: architecture: x86_64 memory: 4G @@ -43,7 +43,7 @@ sudo pkg_add -I autoconf-2.71 automake-1.16.5 sudo pkg_add -I subversion p5-XML-XPath git mawk gmake pkgconf autoconf-archive libtool libltdl help2man doxygen mpg123 libogg libvorbis flac libsndfile pulseaudio portaudio-svn sdl2 - name: Build - uses: cross-platform-actions/action@v0.27.0 + uses: cross-platform-actions/action@v0.28.0 with: architecture: x86_64 memory: 4G @@ -55,7 +55,7 @@ run: | gmake -j$(sysctl -n hw.ncpu) STRICT=1 VERBOSE=1 AUTO_DEPS=1 - name: Test - uses: cross-platform-actions/action@v0.27.0 + uses: cross-platform-actions/action@v0.28.0 with: architecture: x86_64 memory: 4G @@ -67,7 +67,7 @@ run: | gmake -j$(sysctl -n hw.ncpu) STRICT=1 VERBOSE=1 AUTO_DEPS=1 check - name: Shutdown VM - uses: cross-platform-actions/action@v0.27.0 + uses: cross-platform-actions/action@v0.28.0 with: architecture: x86_64 memory: 4G Modified: branches/OpenMPT-1.30/.github/workflows/OpenBSD-7.6-Makefile.yml ============================================================================== --- branches/OpenMPT-1.30/.github/workflows/OpenBSD-7.6-Makefile.yml Sun May 25 13:04:52 2025 (r23175) +++ branches/OpenMPT-1.30/.github/workflows/OpenBSD-7.6-Makefile.yml Sun May 25 13:06:15 2025 (r23176) @@ -17,7 +17,7 @@ - name: Checkout uses: actions/checkout@v4 - name: Startup VM - uses: cross-platform-actions/action@v0.27.0 + uses: cross-platform-actions/action@v0.28.0 with: architecture: x86_64 memory: 4G @@ -28,7 +28,7 @@ shutdown_vm: false run: true - name: Install dependencies - uses: cross-platform-actions/action@v0.27.0 + uses: cross-platform-actions/action@v0.28.0 with: architecture: x86_64 memory: 4G @@ -43,7 +43,7 @@ sudo pkg_add -I autoconf-2.72p0 automake-1.16.5 sudo pkg_add -I subversion p5-XML-XPath git mawk gmake pkgconf autoconf-archive libtool libltdl help2man doxygen mpg123 libogg libvorbis flac libsndfile pulseaudio portaudio-svn sdl2 - name: Build - uses: cross-platform-actions/action@v0.27.0 + uses: cross-platform-actions/action@v0.28.0 with: architecture: x86_64 memory: 4G @@ -55,7 +55,7 @@ run: | gmake -j$(sysctl -n hw.ncpu) STRICT=1 VERBOSE=1 AUTO_DEPS=1 - name: Test - uses: cross-platform-actions/action@v0.27.0 + uses: cross-platform-actions/action@v0.28.0 with: architecture: x86_64 memory: 4G @@ -67,7 +67,7 @@ run: | gmake -j$(sysctl -n hw.ncpu) STRICT=1 VERBOSE=1 AUTO_DEPS=1 check - name: Shutdown VM - uses: cross-platform-actions/action@v0.27.0 + uses: cross-platform-actions/action@v0.28.0 with: architecture: x86_64 memory: 4G |
|
From: <sv...@op...> - 2025-05-25 11:05:51
|
Author: manx Date: Sun May 25 13:04:04 2025 New Revision: 23173 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=23173 Log: Merged revision(s) 23171 from trunk/OpenMPT: [Imp] build: CI: GitHub: Add OpenBSD 7.7. ........ Modified: branches/OpenMPT-1.32/ (props changed) branches/OpenMPT-1.32/.github/workflows/OpenBSD-Autotools.yml branches/OpenMPT-1.32/.github/workflows/OpenBSD-Makefile.yml Modified: branches/OpenMPT-1.32/.github/workflows/OpenBSD-Autotools.yml ============================================================================== --- branches/OpenMPT-1.32/.github/workflows/OpenBSD-Autotools.yml Sun May 25 13:03:37 2025 (r23172) +++ branches/OpenMPT-1.32/.github/workflows/OpenBSD-Autotools.yml Sun May 25 13:04:04 2025 (r23173) @@ -11,6 +11,7 @@ fail-fast: false matrix: include: + - { version: '7.7' } - { version: '7.6' } - { version: '7.5' } - { version: '7.4' } Modified: branches/OpenMPT-1.32/.github/workflows/OpenBSD-Makefile.yml ============================================================================== --- branches/OpenMPT-1.32/.github/workflows/OpenBSD-Makefile.yml Sun May 25 13:03:37 2025 (r23172) +++ branches/OpenMPT-1.32/.github/workflows/OpenBSD-Makefile.yml Sun May 25 13:04:04 2025 (r23173) @@ -11,6 +11,9 @@ fail-fast: false matrix: include: + - { version: '7.7', deps: sys } + - { version: '7.7', deps: local } + - { version: '7.7', deps: small } - { version: '7.6', deps: sys } - { version: '7.6', deps: local } - { version: '7.6', deps: small } |
|
From: <sv...@op...> - 2025-05-25 11:05:03
|
Author: manx Date: Sun May 25 13:04:52 2025 New Revision: 23175 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=23175 Log: Merged revision(s) 23171 from trunk/OpenMPT: [Imp] build: CI: GitHub: Add OpenBSD 7.7. ........ Modified: branches/OpenMPT-1.31/ (props changed) branches/OpenMPT-1.31/.github/workflows/OpenBSD-Autotools.yml branches/OpenMPT-1.31/.github/workflows/OpenBSD-Makefile.yml Modified: branches/OpenMPT-1.31/.github/workflows/OpenBSD-Autotools.yml ============================================================================== --- branches/OpenMPT-1.31/.github/workflows/OpenBSD-Autotools.yml Sun May 25 13:04:31 2025 (r23174) +++ branches/OpenMPT-1.31/.github/workflows/OpenBSD-Autotools.yml Sun May 25 13:04:52 2025 (r23175) @@ -11,6 +11,7 @@ fail-fast: false matrix: include: + - { version: '7.7' } - { version: '7.6' } - { version: '7.5' } - { version: '7.4' } Modified: branches/OpenMPT-1.31/.github/workflows/OpenBSD-Makefile.yml ============================================================================== --- branches/OpenMPT-1.31/.github/workflows/OpenBSD-Makefile.yml Sun May 25 13:04:31 2025 (r23174) +++ branches/OpenMPT-1.31/.github/workflows/OpenBSD-Makefile.yml Sun May 25 13:04:52 2025 (r23175) @@ -11,6 +11,9 @@ fail-fast: false matrix: include: + - { version: '7.7', deps: sys } + - { version: '7.7', deps: local } + - { version: '7.7', deps: small } - { version: '7.6', deps: sys } - { version: '7.6', deps: local } - { version: '7.6', deps: small } |
|
From: <sv...@op...> - 2025-05-25 11:04:38
|
Author: manx Date: Sun May 25 13:04:31 2025 New Revision: 23174 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=23174 Log: Merged revision(s) 23170 from trunk/OpenMPT: [Var] build: CI: GitHub: CPA: Update to 0.28.0. ........ Modified: branches/OpenMPT-1.31/ (props changed) branches/OpenMPT-1.31/.github/workflows/FreeBSD-Autotools.yml branches/OpenMPT-1.31/.github/workflows/FreeBSD-Makefile.yml branches/OpenMPT-1.31/.github/workflows/NetBSD-Autotools.yml branches/OpenMPT-1.31/.github/workflows/NetBSD-Makefile.yml branches/OpenMPT-1.31/.github/workflows/OpenBSD-Autotools.yml branches/OpenMPT-1.31/.github/workflows/OpenBSD-Makefile.yml Modified: branches/OpenMPT-1.31/.github/workflows/FreeBSD-Autotools.yml ============================================================================== --- branches/OpenMPT-1.31/.github/workflows/FreeBSD-Autotools.yml Sun May 25 13:04:04 2025 (r23173) +++ branches/OpenMPT-1.31/.github/workflows/FreeBSD-Autotools.yml Sun May 25 13:04:31 2025 (r23174) @@ -24,7 +24,7 @@ - name: Checkout uses: actions/checkout@v4 - name: Startup VM - uses: cross-platform-actions/action@2d97d42e1972a17b045fd709a422f7e55a86230d + uses: cross-platform-actions/action@v0.28.0 with: architecture: x86_64 memory: 4G @@ -35,7 +35,7 @@ shutdown_vm: false run: true - name: Install dependencies - uses: cross-platform-actions/action@2d97d42e1972a17b045fd709a422f7e55a86230d + uses: cross-platform-actions/action@v0.28.0 with: architecture: x86_64 memory: 4G @@ -48,7 +48,7 @@ sudo pkg upgrade -y sudo pkg install -y subversion p5-XML-XPath git mawk gmake pkgconf autoconf autoconf-archive automake libtool help2man doxygen mpg123 libogg libvorbis flac libsndfile pulseaudio portaudio sdl2 - name: Build - uses: cross-platform-actions/action@2d97d42e1972a17b045fd709a422f7e55a86230d + uses: cross-platform-actions/action@v0.28.0 with: architecture: x86_64 memory: 4G @@ -60,7 +60,7 @@ run: | export MAKEFLAGS="-j$(sysctl -n hw.ncpu)"; ./build/autotools/autoconfiscate.sh - name: Shutdown VM - uses: cross-platform-actions/action@2d97d42e1972a17b045fd709a422f7e55a86230d + uses: cross-platform-actions/action@v0.28.0 with: architecture: x86_64 memory: 4G Modified: branches/OpenMPT-1.31/.github/workflows/FreeBSD-Makefile.yml ============================================================================== --- branches/OpenMPT-1.31/.github/workflows/FreeBSD-Makefile.yml Sun May 25 13:04:04 2025 (r23173) +++ branches/OpenMPT-1.31/.github/workflows/FreeBSD-Makefile.yml Sun May 25 13:04:31 2025 (r23174) @@ -28,7 +28,7 @@ - name: Checkout uses: actions/checkout@v4 - name: Startup VM - uses: cross-platform-actions/action@2d97d42e1972a17b045fd709a422f7e55a86230d + uses: cross-platform-actions/action@v0.28.0 with: architecture: x86_64 memory: 4G @@ -39,7 +39,7 @@ shutdown_vm: false run: true - name: Install dependencies - uses: cross-platform-actions/action@2d97d42e1972a17b045fd709a422f7e55a86230d + uses: cross-platform-actions/action@v0.28.0 with: architecture: x86_64 memory: 4G @@ -52,7 +52,7 @@ sudo pkg upgrade -y sudo pkg install -y subversion p5-XML-XPath git mawk gmake pkgconf autoconf autoconf-archive automake libtool help2man doxygen mpg123 libogg libvorbis flac libsndfile pulseaudio portaudio sdl2 - name: Build - uses: cross-platform-actions/action@2d97d42e1972a17b045fd709a422f7e55a86230d + uses: cross-platform-actions/action@v0.28.0 with: architecture: x86_64 memory: 4G @@ -64,7 +64,7 @@ run: | gmake -j$(sysctl -n hw.ncpu) STRICT=1 VERBOSE=1 ${{ (matrix.deps == 'sys') && 'AUTO_DEPS=1' || (matrix.deps == 'local') && 'LOCAL_ZLIB=1 LOCAL_MPG123=1 LOCAL_OGG=1 LOCAL_VORBIS=1 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_FLAC=1 NO_SNDFILE=1' || 'NO_ZLIB=1 NO_MPG123=1 NO_OGG=1 NO_VORBIS=1 NO_VORBISFILE=1 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_FLAC=1 NO_SNDFILE=1' }} - name: Test - uses: cross-platform-actions/action@2d97d42e1972a17b045fd709a422f7e55a86230d + uses: cross-platform-actions/action@v0.28.0 with: architecture: x86_64 memory: 4G @@ -76,7 +76,7 @@ run: | gmake -j$(sysctl -n hw.ncpu) STRICT=1 VERBOSE=1 ${{ (matrix.deps == 'sys') && 'AUTO_DEPS=1' || (matrix.deps == 'local') && 'LOCAL_ZLIB=1 LOCAL_MPG123=1 LOCAL_OGG=1 LOCAL_VORBIS=1 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_FLAC=1 NO_SNDFILE=1' || 'NO_ZLIB=1 NO_MPG123=1 NO_OGG=1 NO_VORBIS=1 NO_VORBISFILE=1 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_FLAC=1 NO_SNDFILE=1' }} check - name: Shutdown VM - uses: cross-platform-actions/action@2d97d42e1972a17b045fd709a422f7e55a86230d + uses: cross-platform-actions/action@v0.28.0 with: architecture: x86_64 memory: 4G Modified: branches/OpenMPT-1.31/.github/workflows/NetBSD-Autotools.yml ============================================================================== --- branches/OpenMPT-1.31/.github/workflows/NetBSD-Autotools.yml Sun May 25 13:04:04 2025 (r23173) +++ branches/OpenMPT-1.31/.github/workflows/NetBSD-Autotools.yml Sun May 25 13:04:31 2025 (r23174) @@ -24,7 +24,7 @@ - name: Checkout uses: actions/checkout@v4 - name: Startup VM - uses: cross-platform-actions/action@v0.27.0 + uses: cross-platform-actions/action@v0.28.0 with: architecture: x86_64 memory: 4G @@ -35,7 +35,7 @@ shutdown_vm: false run: true - name: Install dependencies - uses: cross-platform-actions/action@v0.27.0 + uses: cross-platform-actions/action@v0.28.0 with: architecture: x86_64 memory: 4G @@ -53,7 +53,7 @@ sudo pkgin -y install autoconf autoconf-archive automake libtool libltdl sudo pkgin -y install doxygen help2man - name: Build - uses: cross-platform-actions/action@v0.27.0 + uses: cross-platform-actions/action@v0.28.0 with: architecture: x86_64 memory: 4G @@ -65,7 +65,7 @@ run: | export MAKEFLAGS="-j4"; ./build/autotools/autoconfiscate.sh - name: Shutdown VM - uses: cross-platform-actions/action@v0.27.0 + uses: cross-platform-actions/action@v0.28.0 with: architecture: x86_64 memory: 4G Modified: branches/OpenMPT-1.31/.github/workflows/NetBSD-Makefile.yml ============================================================================== --- branches/OpenMPT-1.31/.github/workflows/NetBSD-Makefile.yml Sun May 25 13:04:04 2025 (r23173) +++ branches/OpenMPT-1.31/.github/workflows/NetBSD-Makefile.yml Sun May 25 13:04:31 2025 (r23174) @@ -28,7 +28,7 @@ - name: Checkout uses: actions/checkout@v4 - name: Startup VM - uses: cross-platform-actions/action@v0.27.0 + uses: cross-platform-actions/action@v0.28.0 with: architecture: x86_64 memory: 4G @@ -39,7 +39,7 @@ shutdown_vm: false run: true - name: Install dependencies - uses: cross-platform-actions/action@v0.27.0 + uses: cross-platform-actions/action@v0.28.0 with: architecture: x86_64 memory: 4G @@ -57,7 +57,7 @@ sudo pkgin -y install autoconf autoconf-archive automake libtool libltdl sudo pkgin -y install doxygen help2man - name: Build - uses: cross-platform-actions/action@v0.27.0 + uses: cross-platform-actions/action@v0.28.0 with: architecture: x86_64 memory: 4G @@ -69,7 +69,7 @@ run: | gmake -j4 STRICT=1 VERBOSE=1 ${{ (matrix.deps == 'sys') && 'AUTO_DEPS=1' || (matrix.deps == 'local') && 'LOCAL_ZLIB=1 LOCAL_MPG123=1 LOCAL_OGG=1 LOCAL_VORBIS=1 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_FLAC=1 NO_SNDFILE=1' || 'NO_ZLIB=1 NO_MPG123=1 NO_OGG=1 NO_VORBIS=1 NO_VORBISFILE=1 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_FLAC=1 NO_SNDFILE=1' }} - name: Test - uses: cross-platform-actions/action@v0.27.0 + uses: cross-platform-actions/action@v0.28.0 with: architecture: x86_64 memory: 4G @@ -81,7 +81,7 @@ run: | gmake -j4 STRICT=1 VERBOSE=1 ${{ (matrix.deps == 'sys') && 'AUTO_DEPS=1' || (matrix.deps == 'local') && 'LOCAL_ZLIB=1 LOCAL_MPG123=1 LOCAL_OGG=1 LOCAL_VORBIS=1 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_FLAC=1 NO_SNDFILE=1' || 'NO_ZLIB=1 NO_MPG123=1 NO_OGG=1 NO_VORBIS=1 NO_VORBISFILE=1 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_FLAC=1 NO_SNDFILE=1' }} check - name: Shutdown VM - uses: cross-platform-actions/action@v0.27.0 + uses: cross-platform-actions/action@v0.28.0 with: architecture: x86_64 memory: 4G Modified: branches/OpenMPT-1.31/.github/workflows/OpenBSD-Autotools.yml ============================================================================== --- branches/OpenMPT-1.31/.github/workflows/OpenBSD-Autotools.yml Sun May 25 13:04:04 2025 (r23173) +++ branches/OpenMPT-1.31/.github/workflows/OpenBSD-Autotools.yml Sun May 25 13:04:31 2025 (r23174) @@ -25,7 +25,7 @@ - name: Checkout uses: actions/checkout@v4 - name: Startup VM - uses: cross-platform-actions/action@v0.27.0 + uses: cross-platform-actions/action@v0.28.0 with: architecture: x86_64 memory: 4G @@ -36,7 +36,7 @@ shutdown_vm: false run: true - name: Install dependencies - uses: cross-platform-actions/action@v0.27.0 + uses: cross-platform-actions/action@v0.28.0 with: architecture: x86_64 memory: 4G @@ -51,7 +51,7 @@ sudo pkg_add -I ${{ (matrix.version == '7.6') && 'autoconf-2.72p0 automake-1.16.5' || (matrix.version == '7.5') && 'autoconf-2.71 automake-1.16.5' || (matrix.version == '7.4') && 'autoconf-2.71 automake-1.16.5' || 'autoconf automake' }} sudo pkg_add -I subversion p5-XML-XPath git mawk gmake pkgconf autoconf-archive libtool libltdl help2man doxygen mpg123 libogg libvorbis flac libsndfile pulseaudio portaudio-svn sdl2 - name: Build - uses: cross-platform-actions/action@v0.27.0 + uses: cross-platform-actions/action@v0.28.0 with: architecture: x86_64 memory: 4G @@ -63,7 +63,7 @@ run: | export MAKEFLAGS="-j$(sysctl -n hw.ncpu)"; ${{ (matrix.version == '7.6') && 'export AUTOCONF_VERSION=2.72' || (matrix.version == '7.5') && 'export AUTOCONF_VERSION=2.71' || (matrix.version == '7.4') && 'export AUTOCONF_VERSION=2.71' || '' }} ; ${{ (matrix.version == '7.6') && 'export AUTOMAKE_VERSION=1.16' || (matrix.version == '7.5') && 'export AUTOMAKE_VERSION=1.16' || (matrix.version == '7.4') && 'export AUTOMAKE_VERSION=1.16' || '' }} ;./build/autotools/autoconfiscate.sh - name: Shutdown VM - uses: cross-platform-actions/action@v0.27.0 + uses: cross-platform-actions/action@v0.28.0 with: architecture: x86_64 memory: 4G Modified: branches/OpenMPT-1.31/.github/workflows/OpenBSD-Makefile.yml ============================================================================== --- branches/OpenMPT-1.31/.github/workflows/OpenBSD-Makefile.yml Sun May 25 13:04:04 2025 (r23173) +++ branches/OpenMPT-1.31/.github/workflows/OpenBSD-Makefile.yml Sun May 25 13:04:31 2025 (r23174) @@ -31,7 +31,7 @@ - name: Checkout uses: actions/checkout@v4 - name: Startup VM - uses: cross-platform-actions/action@v0.27.0 + uses: cross-platform-actions/action@v0.28.0 with: architecture: x86_64 memory: 4G @@ -42,7 +42,7 @@ shutdown_vm: false run: true - name: Install dependencies - uses: cross-platform-actions/action@v0.27.0 + uses: cross-platform-actions/action@v0.28.0 with: architecture: x86_64 memory: 4G @@ -57,7 +57,7 @@ sudo pkg_add -I ${{ (matrix.version == '7.6') && 'autoconf-2.72p0 automake-1.16.5' || (matrix.version == '7.5') && 'autoconf-2.71 automake-1.16.5' || (matrix.version == '7.4') && 'autoconf-2.71 automake-1.16.5' || 'autoconf automake' }} sudo pkg_add -I subversion p5-XML-XPath git mawk gmake pkgconf autoconf-archive libtool libltdl help2man doxygen mpg123 libogg libvorbis flac libsndfile pulseaudio portaudio-svn sdl2 - name: Build - uses: cross-platform-actions/action@v0.27.0 + uses: cross-platform-actions/action@v0.28.0 with: architecture: x86_64 memory: 4G @@ -69,7 +69,7 @@ run: | gmake -j$(sysctl -n hw.ncpu) STRICT=1 VERBOSE=1 ${{ (matrix.deps == 'sys') && 'AUTO_DEPS=1' || (matrix.deps == 'local') && 'LOCAL_ZLIB=1 LOCAL_MPG123=1 LOCAL_OGG=1 LOCAL_VORBIS=1 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_FLAC=1 NO_SNDFILE=1' || 'NO_ZLIB=1 NO_MPG123=1 NO_OGG=1 NO_VORBIS=1 NO_VORBISFILE=1 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_FLAC=1 NO_SNDFILE=1' }} - name: Test - uses: cross-platform-actions/action@v0.27.0 + uses: cross-platform-actions/action@v0.28.0 with: architecture: x86_64 memory: 4G @@ -81,7 +81,7 @@ run: | gmake -j$(sysctl -n hw.ncpu) STRICT=1 VERBOSE=1 ${{ (matrix.deps == 'sys') && 'AUTO_DEPS=1' || (matrix.deps == 'local') && 'LOCAL_ZLIB=1 LOCAL_MPG123=1 LOCAL_OGG=1 LOCAL_VORBIS=1 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_FLAC=1 NO_SNDFILE=1' || 'NO_ZLIB=1 NO_MPG123=1 NO_OGG=1 NO_VORBIS=1 NO_VORBISFILE=1 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_FLAC=1 NO_SNDFILE=1' }} check - name: Shutdown VM - uses: cross-platform-actions/action@v0.27.0 + uses: cross-platform-actions/action@v0.28.0 with: architecture: x86_64 memory: 4G |
|
From: <sv...@op...> - 2025-05-25 11:03:49
|
Author: manx Date: Sun May 25 13:03:37 2025 New Revision: 23172 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=23172 Log: Merged revision(s) 23170 from trunk/OpenMPT: [Var] build: CI: GitHub: CPA: Update to 0.28.0. ........ Modified: branches/OpenMPT-1.32/ (props changed) branches/OpenMPT-1.32/.github/workflows/FreeBSD-Autotools.yml branches/OpenMPT-1.32/.github/workflows/FreeBSD-Makefile.yml branches/OpenMPT-1.32/.github/workflows/NetBSD-Autotools.yml branches/OpenMPT-1.32/.github/workflows/NetBSD-Makefile.yml branches/OpenMPT-1.32/.github/workflows/OpenBSD-Autotools.yml branches/OpenMPT-1.32/.github/workflows/OpenBSD-Makefile.yml Modified: branches/OpenMPT-1.32/.github/workflows/FreeBSD-Autotools.yml ============================================================================== --- branches/OpenMPT-1.32/.github/workflows/FreeBSD-Autotools.yml Sun May 25 13:02:22 2025 (r23171) +++ branches/OpenMPT-1.32/.github/workflows/FreeBSD-Autotools.yml Sun May 25 13:03:37 2025 (r23172) @@ -24,7 +24,7 @@ - name: Checkout uses: actions/checkout@v4 - name: Startup VM - uses: cross-platform-actions/action@2d97d42e1972a17b045fd709a422f7e55a86230d + uses: cross-platform-actions/action@v0.28.0 with: architecture: x86_64 memory: 4G @@ -35,7 +35,7 @@ shutdown_vm: false run: true - name: Install dependencies - uses: cross-platform-actions/action@2d97d42e1972a17b045fd709a422f7e55a86230d + uses: cross-platform-actions/action@v0.28.0 with: architecture: x86_64 memory: 4G @@ -48,7 +48,7 @@ sudo pkg upgrade -y sudo pkg install -y subversion p5-XML-XPath git mawk gmake pkgconf autoconf autoconf-archive automake libtool help2man doxygen mpg123 libogg libvorbis flac libsndfile pulseaudio portaudio sdl2 - name: Build - uses: cross-platform-actions/action@2d97d42e1972a17b045fd709a422f7e55a86230d + uses: cross-platform-actions/action@v0.28.0 with: architecture: x86_64 memory: 4G @@ -60,7 +60,7 @@ run: | export MAKEFLAGS="-j$(sysctl -n hw.ncpu)"; ./build/autotools/autoconfiscate.sh - name: Shutdown VM - uses: cross-platform-actions/action@2d97d42e1972a17b045fd709a422f7e55a86230d + uses: cross-platform-actions/action@v0.28.0 with: architecture: x86_64 memory: 4G Modified: branches/OpenMPT-1.32/.github/workflows/FreeBSD-Makefile.yml ============================================================================== --- branches/OpenMPT-1.32/.github/workflows/FreeBSD-Makefile.yml Sun May 25 13:02:22 2025 (r23171) +++ branches/OpenMPT-1.32/.github/workflows/FreeBSD-Makefile.yml Sun May 25 13:03:37 2025 (r23172) @@ -28,7 +28,7 @@ - name: Checkout uses: actions/checkout@v4 - name: Startup VM - uses: cross-platform-actions/action@2d97d42e1972a17b045fd709a422f7e55a86230d + uses: cross-platform-actions/action@v0.28.0 with: architecture: x86_64 memory: 4G @@ -39,7 +39,7 @@ shutdown_vm: false run: true - name: Install dependencies - uses: cross-platform-actions/action@2d97d42e1972a17b045fd709a422f7e55a86230d + uses: cross-platform-actions/action@v0.28.0 with: architecture: x86_64 memory: 4G @@ -52,7 +52,7 @@ sudo pkg upgrade -y sudo pkg install -y subversion p5-XML-XPath git mawk gmake pkgconf autoconf autoconf-archive automake libtool help2man doxygen mpg123 libogg libvorbis flac libsndfile pulseaudio portaudio sdl2 - name: Build - uses: cross-platform-actions/action@2d97d42e1972a17b045fd709a422f7e55a86230d + uses: cross-platform-actions/action@v0.28.0 with: architecture: x86_64 memory: 4G @@ -64,7 +64,7 @@ run: | gmake -j$(sysctl -n hw.ncpu) STRICT=1 VERBOSE=1 ${{ (matrix.deps == 'sys') && 'AUTO_DEPS=1' || (matrix.deps == 'local') && 'LOCAL_ZLIB=1 LOCAL_MPG123=1 LOCAL_OGG=1 LOCAL_VORBIS=1 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_FLAC=1 NO_SNDFILE=1' || 'NO_ZLIB=1 NO_MPG123=1 NO_OGG=1 NO_VORBIS=1 NO_VORBISFILE=1 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_FLAC=1 NO_SNDFILE=1' }} - name: Test - uses: cross-platform-actions/action@2d97d42e1972a17b045fd709a422f7e55a86230d + uses: cross-platform-actions/action@v0.28.0 with: architecture: x86_64 memory: 4G @@ -76,7 +76,7 @@ run: | gmake -j$(sysctl -n hw.ncpu) STRICT=1 VERBOSE=1 ${{ (matrix.deps == 'sys') && 'AUTO_DEPS=1' || (matrix.deps == 'local') && 'LOCAL_ZLIB=1 LOCAL_MPG123=1 LOCAL_OGG=1 LOCAL_VORBIS=1 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_FLAC=1 NO_SNDFILE=1' || 'NO_ZLIB=1 NO_MPG123=1 NO_OGG=1 NO_VORBIS=1 NO_VORBISFILE=1 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_FLAC=1 NO_SNDFILE=1' }} check - name: Shutdown VM - uses: cross-platform-actions/action@2d97d42e1972a17b045fd709a422f7e55a86230d + uses: cross-platform-actions/action@v0.28.0 with: architecture: x86_64 memory: 4G Modified: branches/OpenMPT-1.32/.github/workflows/NetBSD-Autotools.yml ============================================================================== --- branches/OpenMPT-1.32/.github/workflows/NetBSD-Autotools.yml Sun May 25 13:02:22 2025 (r23171) +++ branches/OpenMPT-1.32/.github/workflows/NetBSD-Autotools.yml Sun May 25 13:03:37 2025 (r23172) @@ -24,7 +24,7 @@ - name: Checkout uses: actions/checkout@v4 - name: Startup VM - uses: cross-platform-actions/action@v0.27.0 + uses: cross-platform-actions/action@v0.28.0 with: architecture: x86_64 memory: 4G @@ -35,7 +35,7 @@ shutdown_vm: false run: true - name: Install dependencies - uses: cross-platform-actions/action@v0.27.0 + uses: cross-platform-actions/action@v0.28.0 with: architecture: x86_64 memory: 4G @@ -53,7 +53,7 @@ sudo pkgin -y install autoconf autoconf-archive automake libtool libltdl sudo pkgin -y install doxygen help2man - name: Build - uses: cross-platform-actions/action@v0.27.0 + uses: cross-platform-actions/action@v0.28.0 with: architecture: x86_64 memory: 4G @@ -65,7 +65,7 @@ run: | export MAKEFLAGS="-j4"; ./build/autotools/autoconfiscate.sh - name: Shutdown VM - uses: cross-platform-actions/action@v0.27.0 + uses: cross-platform-actions/action@v0.28.0 with: architecture: x86_64 memory: 4G Modified: branches/OpenMPT-1.32/.github/workflows/NetBSD-Makefile.yml ============================================================================== --- branches/OpenMPT-1.32/.github/workflows/NetBSD-Makefile.yml Sun May 25 13:02:22 2025 (r23171) +++ branches/OpenMPT-1.32/.github/workflows/NetBSD-Makefile.yml Sun May 25 13:03:37 2025 (r23172) @@ -28,7 +28,7 @@ - name: Checkout uses: actions/checkout@v4 - name: Startup VM - uses: cross-platform-actions/action@v0.27.0 + uses: cross-platform-actions/action@v0.28.0 with: architecture: x86_64 memory: 4G @@ -39,7 +39,7 @@ shutdown_vm: false run: true - name: Install dependencies - uses: cross-platform-actions/action@v0.27.0 + uses: cross-platform-actions/action@v0.28.0 with: architecture: x86_64 memory: 4G @@ -57,7 +57,7 @@ sudo pkgin -y install autoconf autoconf-archive automake libtool libltdl sudo pkgin -y install doxygen help2man - name: Build - uses: cross-platform-actions/action@v0.27.0 + uses: cross-platform-actions/action@v0.28.0 with: architecture: x86_64 memory: 4G @@ -69,7 +69,7 @@ run: | gmake -j4 STRICT=1 VERBOSE=1 ${{ (matrix.deps == 'sys') && 'AUTO_DEPS=1' || (matrix.deps == 'local') && 'LOCAL_ZLIB=1 LOCAL_MPG123=1 LOCAL_OGG=1 LOCAL_VORBIS=1 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_FLAC=1 NO_SNDFILE=1' || 'NO_ZLIB=1 NO_MPG123=1 NO_OGG=1 NO_VORBIS=1 NO_VORBISFILE=1 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_FLAC=1 NO_SNDFILE=1' }} - name: Test - uses: cross-platform-actions/action@v0.27.0 + uses: cross-platform-actions/action@v0.28.0 with: architecture: x86_64 memory: 4G @@ -81,7 +81,7 @@ run: | gmake -j4 STRICT=1 VERBOSE=1 ${{ (matrix.deps == 'sys') && 'AUTO_DEPS=1' || (matrix.deps == 'local') && 'LOCAL_ZLIB=1 LOCAL_MPG123=1 LOCAL_OGG=1 LOCAL_VORBIS=1 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_FLAC=1 NO_SNDFILE=1' || 'NO_ZLIB=1 NO_MPG123=1 NO_OGG=1 NO_VORBIS=1 NO_VORBISFILE=1 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_FLAC=1 NO_SNDFILE=1' }} check - name: Shutdown VM - uses: cross-platform-actions/action@v0.27.0 + uses: cross-platform-actions/action@v0.28.0 with: architecture: x86_64 memory: 4G Modified: branches/OpenMPT-1.32/.github/workflows/OpenBSD-Autotools.yml ============================================================================== --- branches/OpenMPT-1.32/.github/workflows/OpenBSD-Autotools.yml Sun May 25 13:02:22 2025 (r23171) +++ branches/OpenMPT-1.32/.github/workflows/OpenBSD-Autotools.yml Sun May 25 13:03:37 2025 (r23172) @@ -25,7 +25,7 @@ - name: Checkout uses: actions/checkout@v4 - name: Startup VM - uses: cross-platform-actions/action@v0.27.0 + uses: cross-platform-actions/action@v0.28.0 with: architecture: x86_64 memory: 4G @@ -36,7 +36,7 @@ shutdown_vm: false run: true - name: Install dependencies - uses: cross-platform-actions/action@v0.27.0 + uses: cross-platform-actions/action@v0.28.0 with: architecture: x86_64 memory: 4G @@ -51,7 +51,7 @@ sudo pkg_add -I ${{ (matrix.version == '7.6') && 'autoconf-2.72p0 automake-1.16.5' || (matrix.version == '7.5') && 'autoconf-2.71 automake-1.16.5' || (matrix.version == '7.4') && 'autoconf-2.71 automake-1.16.5' || 'autoconf automake' }} sudo pkg_add -I subversion p5-XML-XPath git mawk gmake pkgconf autoconf-archive libtool libltdl help2man doxygen mpg123 libogg libvorbis flac libsndfile pulseaudio portaudio-svn sdl2 - name: Build - uses: cross-platform-actions/action@v0.27.0 + uses: cross-platform-actions/action@v0.28.0 with: architecture: x86_64 memory: 4G @@ -63,7 +63,7 @@ run: | export MAKEFLAGS="-j$(sysctl -n hw.ncpu)"; ${{ (matrix.version == '7.6') && 'export AUTOCONF_VERSION=2.72' || (matrix.version == '7.5') && 'export AUTOCONF_VERSION=2.71' || (matrix.version == '7.4') && 'export AUTOCONF_VERSION=2.71' || '' }} ; ${{ (matrix.version == '7.6') && 'export AUTOMAKE_VERSION=1.16' || (matrix.version == '7.5') && 'export AUTOMAKE_VERSION=1.16' || (matrix.version == '7.4') && 'export AUTOMAKE_VERSION=1.16' || '' }} ;./build/autotools/autoconfiscate.sh - name: Shutdown VM - uses: cross-platform-actions/action@v0.27.0 + uses: cross-platform-actions/action@v0.28.0 with: architecture: x86_64 memory: 4G Modified: branches/OpenMPT-1.32/.github/workflows/OpenBSD-Makefile.yml ============================================================================== --- branches/OpenMPT-1.32/.github/workflows/OpenBSD-Makefile.yml Sun May 25 13:02:22 2025 (r23171) +++ branches/OpenMPT-1.32/.github/workflows/OpenBSD-Makefile.yml Sun May 25 13:03:37 2025 (r23172) @@ -31,7 +31,7 @@ - name: Checkout uses: actions/checkout@v4 - name: Startup VM - uses: cross-platform-actions/action@v0.27.0 + uses: cross-platform-actions/action@v0.28.0 with: architecture: x86_64 memory: 4G @@ -42,7 +42,7 @@ shutdown_vm: false run: true - name: Install dependencies - uses: cross-platform-actions/action@v0.27.0 + uses: cross-platform-actions/action@v0.28.0 with: architecture: x86_64 memory: 4G @@ -57,7 +57,7 @@ sudo pkg_add -I ${{ (matrix.version == '7.6') && 'autoconf-2.72p0 automake-1.16.5' || (matrix.version == '7.5') && 'autoconf-2.71 automake-1.16.5' || (matrix.version == '7.4') && 'autoconf-2.71 automake-1.16.5' || 'autoconf automake' }} sudo pkg_add -I subversion p5-XML-XPath git mawk gmake pkgconf autoconf-archive libtool libltdl help2man doxygen mpg123 libogg libvorbis flac libsndfile pulseaudio portaudio-svn sdl2 - name: Build - uses: cross-platform-actions/action@v0.27.0 + uses: cross-platform-actions/action@v0.28.0 with: architecture: x86_64 memory: 4G @@ -69,7 +69,7 @@ run: | gmake -j$(sysctl -n hw.ncpu) STRICT=1 VERBOSE=1 ${{ (matrix.deps == 'sys') && 'AUTO_DEPS=1' || (matrix.deps == 'local') && 'LOCAL_ZLIB=1 LOCAL_MPG123=1 LOCAL_OGG=1 LOCAL_VORBIS=1 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_FLAC=1 NO_SNDFILE=1' || 'NO_ZLIB=1 NO_MPG123=1 NO_OGG=1 NO_VORBIS=1 NO_VORBISFILE=1 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_FLAC=1 NO_SNDFILE=1' }} - name: Test - uses: cross-platform-actions/action@v0.27.0 + uses: cross-platform-actions/action@v0.28.0 with: architecture: x86_64 memory: 4G @@ -81,7 +81,7 @@ run: | gmake -j$(sysctl -n hw.ncpu) STRICT=1 VERBOSE=1 ${{ (matrix.deps == 'sys') && 'AUTO_DEPS=1' || (matrix.deps == 'local') && 'LOCAL_ZLIB=1 LOCAL_MPG123=1 LOCAL_OGG=1 LOCAL_VORBIS=1 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_FLAC=1 NO_SNDFILE=1' || 'NO_ZLIB=1 NO_MPG123=1 NO_OGG=1 NO_VORBIS=1 NO_VORBISFILE=1 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_FLAC=1 NO_SNDFILE=1' }} check - name: Shutdown VM - uses: cross-platform-actions/action@v0.27.0 + uses: cross-platform-actions/action@v0.28.0 with: architecture: x86_64 memory: 4G |
|
From: <sv...@op...> - 2025-05-25 11:03:01
|
Author: manx Date: Sun May 25 13:02:22 2025 New Revision: 23171 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=23171 Log: [Imp] build: CI: GitHub: Add OpenBSD 7.7. Modified: trunk/OpenMPT/.github/workflows/OpenBSD-Autotools.yml trunk/OpenMPT/.github/workflows/OpenBSD-Makefile.yml Modified: trunk/OpenMPT/.github/workflows/OpenBSD-Autotools.yml ============================================================================== --- trunk/OpenMPT/.github/workflows/OpenBSD-Autotools.yml Sun May 25 13:01:38 2025 (r23170) +++ trunk/OpenMPT/.github/workflows/OpenBSD-Autotools.yml Sun May 25 13:02:22 2025 (r23171) @@ -13,6 +13,7 @@ fail-fast: false matrix: include: + - { version: '7.7' } - { version: '7.6' } - { version: '7.5' } - { version: '7.4' } Modified: trunk/OpenMPT/.github/workflows/OpenBSD-Makefile.yml ============================================================================== --- trunk/OpenMPT/.github/workflows/OpenBSD-Makefile.yml Sun May 25 13:01:38 2025 (r23170) +++ trunk/OpenMPT/.github/workflows/OpenBSD-Makefile.yml Sun May 25 13:02:22 2025 (r23171) @@ -13,6 +13,9 @@ fail-fast: false matrix: include: + - { version: '7.7', deps: sys } + - { version: '7.7', deps: local } + - { version: '7.7', deps: small } - { version: '7.6', deps: sys } - { version: '7.6', deps: local } - { version: '7.6', deps: small } |
|
From: <sv...@op...> - 2025-05-25 11:01:50
|
Author: manx Date: Sun May 25 13:01:38 2025 New Revision: 23170 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=23170 Log: [Var] build: CI: GitHub: CPA: Update to 0.28.0. Modified: trunk/OpenMPT/.github/workflows/FreeBSD-Autotools.yml trunk/OpenMPT/.github/workflows/FreeBSD-Makefile.yml trunk/OpenMPT/.github/workflows/NetBSD-Autotools.yml trunk/OpenMPT/.github/workflows/NetBSD-Makefile.yml trunk/OpenMPT/.github/workflows/OpenBSD-Autotools.yml trunk/OpenMPT/.github/workflows/OpenBSD-Makefile.yml Modified: trunk/OpenMPT/.github/workflows/FreeBSD-Autotools.yml ============================================================================== --- trunk/OpenMPT/.github/workflows/FreeBSD-Autotools.yml Sat May 24 23:56:37 2025 (r23169) +++ trunk/OpenMPT/.github/workflows/FreeBSD-Autotools.yml Sun May 25 13:01:38 2025 (r23170) @@ -26,7 +26,7 @@ - name: Checkout uses: actions/checkout@v4 - name: Startup VM - uses: cross-platform-actions/action@2d97d42e1972a17b045fd709a422f7e55a86230d + uses: cross-platform-actions/action@v0.28.0 with: architecture: x86_64 memory: 4G @@ -37,7 +37,7 @@ shutdown_vm: false run: true - name: Install dependencies - uses: cross-platform-actions/action@2d97d42e1972a17b045fd709a422f7e55a86230d + uses: cross-platform-actions/action@v0.28.0 with: architecture: x86_64 memory: 4G @@ -50,7 +50,7 @@ sudo pkg upgrade -y sudo pkg install -y subversion p5-XML-XPath git mawk gmake pkgconf autoconf autoconf-archive automake libtool help2man doxygen mpg123 libogg libvorbis flac libsndfile pulseaudio portaudio sdl2 - name: Build - uses: cross-platform-actions/action@2d97d42e1972a17b045fd709a422f7e55a86230d + uses: cross-platform-actions/action@v0.28.0 with: architecture: x86_64 memory: 4G @@ -62,7 +62,7 @@ run: | export MAKEFLAGS="-j$(sysctl -n hw.ncpu)"; ./build/autotools/autoconfiscate.sh - name: Shutdown VM - uses: cross-platform-actions/action@2d97d42e1972a17b045fd709a422f7e55a86230d + uses: cross-platform-actions/action@v0.28.0 with: architecture: x86_64 memory: 4G Modified: trunk/OpenMPT/.github/workflows/FreeBSD-Makefile.yml ============================================================================== --- trunk/OpenMPT/.github/workflows/FreeBSD-Makefile.yml Sat May 24 23:56:37 2025 (r23169) +++ trunk/OpenMPT/.github/workflows/FreeBSD-Makefile.yml Sun May 25 13:01:38 2025 (r23170) @@ -30,7 +30,7 @@ - name: Checkout uses: actions/checkout@v4 - name: Startup VM - uses: cross-platform-actions/action@2d97d42e1972a17b045fd709a422f7e55a86230d + uses: cross-platform-actions/action@v0.28.0 with: architecture: x86_64 memory: 4G @@ -41,7 +41,7 @@ shutdown_vm: false run: true - name: Install dependencies - uses: cross-platform-actions/action@2d97d42e1972a17b045fd709a422f7e55a86230d + uses: cross-platform-actions/action@v0.28.0 with: architecture: x86_64 memory: 4G @@ -54,7 +54,7 @@ sudo pkg upgrade -y sudo pkg install -y subversion p5-XML-XPath git mawk gmake pkgconf autoconf autoconf-archive automake libtool help2man doxygen mpg123 libogg libvorbis flac libsndfile pulseaudio portaudio sdl2 - name: Build - uses: cross-platform-actions/action@2d97d42e1972a17b045fd709a422f7e55a86230d + uses: cross-platform-actions/action@v0.28.0 with: architecture: x86_64 memory: 4G @@ -66,7 +66,7 @@ run: | gmake -j$(sysctl -n hw.ncpu) STRICT=1 VERBOSE=1 ${{ (matrix.deps == 'sys') && 'AUTO_DEPS=1' || (matrix.deps == 'local') && 'LOCAL_ZLIB=1 LOCAL_MPG123=1 LOCAL_OGG=1 LOCAL_VORBIS=1 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_FLAC=1 NO_SNDFILE=1' || 'NO_ZLIB=1 NO_MPG123=1 NO_OGG=1 NO_VORBIS=1 NO_VORBISFILE=1 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_FLAC=1 NO_SNDFILE=1' }} - name: Test - uses: cross-platform-actions/action@2d97d42e1972a17b045fd709a422f7e55a86230d + uses: cross-platform-actions/action@v0.28.0 with: architecture: x86_64 memory: 4G @@ -78,7 +78,7 @@ run: | gmake -j$(sysctl -n hw.ncpu) STRICT=1 VERBOSE=1 ${{ (matrix.deps == 'sys') && 'AUTO_DEPS=1' || (matrix.deps == 'local') && 'LOCAL_ZLIB=1 LOCAL_MPG123=1 LOCAL_OGG=1 LOCAL_VORBIS=1 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_FLAC=1 NO_SNDFILE=1' || 'NO_ZLIB=1 NO_MPG123=1 NO_OGG=1 NO_VORBIS=1 NO_VORBISFILE=1 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_FLAC=1 NO_SNDFILE=1' }} check - name: Shutdown VM - uses: cross-platform-actions/action@2d97d42e1972a17b045fd709a422f7e55a86230d + uses: cross-platform-actions/action@v0.28.0 with: architecture: x86_64 memory: 4G Modified: trunk/OpenMPT/.github/workflows/NetBSD-Autotools.yml ============================================================================== --- trunk/OpenMPT/.github/workflows/NetBSD-Autotools.yml Sat May 24 23:56:37 2025 (r23169) +++ trunk/OpenMPT/.github/workflows/NetBSD-Autotools.yml Sun May 25 13:01:38 2025 (r23170) @@ -26,7 +26,7 @@ - name: Checkout uses: actions/checkout@v4 - name: Startup VM - uses: cross-platform-actions/action@v0.27.0 + uses: cross-platform-actions/action@v0.28.0 with: architecture: x86_64 memory: 4G @@ -37,7 +37,7 @@ shutdown_vm: false run: true - name: Install dependencies - uses: cross-platform-actions/action@v0.27.0 + uses: cross-platform-actions/action@v0.28.0 with: architecture: x86_64 memory: 4G @@ -55,7 +55,7 @@ sudo pkgin -y install autoconf autoconf-archive automake libtool libltdl sudo pkgin -y install doxygen help2man - name: Build - uses: cross-platform-actions/action@v0.27.0 + uses: cross-platform-actions/action@v0.28.0 with: architecture: x86_64 memory: 4G @@ -67,7 +67,7 @@ run: | export MAKEFLAGS="-j4"; ./build/autotools/autoconfiscate.sh - name: Shutdown VM - uses: cross-platform-actions/action@v0.27.0 + uses: cross-platform-actions/action@v0.28.0 with: architecture: x86_64 memory: 4G Modified: trunk/OpenMPT/.github/workflows/NetBSD-Makefile.yml ============================================================================== --- trunk/OpenMPT/.github/workflows/NetBSD-Makefile.yml Sat May 24 23:56:37 2025 (r23169) +++ trunk/OpenMPT/.github/workflows/NetBSD-Makefile.yml Sun May 25 13:01:38 2025 (r23170) @@ -30,7 +30,7 @@ - name: Checkout uses: actions/checkout@v4 - name: Startup VM - uses: cross-platform-actions/action@v0.27.0 + uses: cross-platform-actions/action@v0.28.0 with: architecture: x86_64 memory: 4G @@ -41,7 +41,7 @@ shutdown_vm: false run: true - name: Install dependencies - uses: cross-platform-actions/action@v0.27.0 + uses: cross-platform-actions/action@v0.28.0 with: architecture: x86_64 memory: 4G @@ -59,7 +59,7 @@ sudo pkgin -y install autoconf autoconf-archive automake libtool libltdl sudo pkgin -y install doxygen help2man - name: Build - uses: cross-platform-actions/action@v0.27.0 + uses: cross-platform-actions/action@v0.28.0 with: architecture: x86_64 memory: 4G @@ -71,7 +71,7 @@ run: | gmake -j4 STRICT=1 VERBOSE=1 ${{ (matrix.deps == 'sys') && 'AUTO_DEPS=1' || (matrix.deps == 'local') && 'LOCAL_ZLIB=1 LOCAL_MPG123=1 LOCAL_OGG=1 LOCAL_VORBIS=1 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_FLAC=1 NO_SNDFILE=1' || 'NO_ZLIB=1 NO_MPG123=1 NO_OGG=1 NO_VORBIS=1 NO_VORBISFILE=1 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_FLAC=1 NO_SNDFILE=1' }} - name: Test - uses: cross-platform-actions/action@v0.27.0 + uses: cross-platform-actions/action@v0.28.0 with: architecture: x86_64 memory: 4G @@ -83,7 +83,7 @@ run: | gmake -j4 STRICT=1 VERBOSE=1 ${{ (matrix.deps == 'sys') && 'AUTO_DEPS=1' || (matrix.deps == 'local') && 'LOCAL_ZLIB=1 LOCAL_MPG123=1 LOCAL_OGG=1 LOCAL_VORBIS=1 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_FLAC=1 NO_SNDFILE=1' || 'NO_ZLIB=1 NO_MPG123=1 NO_OGG=1 NO_VORBIS=1 NO_VORBISFILE=1 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_FLAC=1 NO_SNDFILE=1' }} check - name: Shutdown VM - uses: cross-platform-actions/action@v0.27.0 + uses: cross-platform-actions/action@v0.28.0 with: architecture: x86_64 memory: 4G Modified: trunk/OpenMPT/.github/workflows/OpenBSD-Autotools.yml ============================================================================== --- trunk/OpenMPT/.github/workflows/OpenBSD-Autotools.yml Sat May 24 23:56:37 2025 (r23169) +++ trunk/OpenMPT/.github/workflows/OpenBSD-Autotools.yml Sun May 25 13:01:38 2025 (r23170) @@ -27,7 +27,7 @@ - name: Checkout uses: actions/checkout@v4 - name: Startup VM - uses: cross-platform-actions/action@v0.27.0 + uses: cross-platform-actions/action@v0.28.0 with: architecture: x86_64 memory: 4G @@ -38,7 +38,7 @@ shutdown_vm: false run: true - name: Install dependencies - uses: cross-platform-actions/action@v0.27.0 + uses: cross-platform-actions/action@v0.28.0 with: architecture: x86_64 memory: 4G @@ -53,7 +53,7 @@ sudo pkg_add -I ${{ (matrix.version == '7.6') && 'autoconf-2.72p0 automake-1.16.5' || (matrix.version == '7.5') && 'autoconf-2.71 automake-1.16.5' || (matrix.version == '7.4') && 'autoconf-2.71 automake-1.16.5' || 'autoconf automake' }} sudo pkg_add -I subversion p5-XML-XPath git mawk gmake pkgconf autoconf-archive libtool libltdl help2man doxygen mpg123 libogg libvorbis flac libsndfile pulseaudio portaudio-svn sdl2 - name: Build - uses: cross-platform-actions/action@v0.27.0 + uses: cross-platform-actions/action@v0.28.0 with: architecture: x86_64 memory: 4G @@ -65,7 +65,7 @@ run: | export MAKEFLAGS="-j$(sysctl -n hw.ncpu)"; ${{ (matrix.version == '7.6') && 'export AUTOCONF_VERSION=2.72' || (matrix.version == '7.5') && 'export AUTOCONF_VERSION=2.71' || (matrix.version == '7.4') && 'export AUTOCONF_VERSION=2.71' || '' }} ; ${{ (matrix.version == '7.6') && 'export AUTOMAKE_VERSION=1.16' || (matrix.version == '7.5') && 'export AUTOMAKE_VERSION=1.16' || (matrix.version == '7.4') && 'export AUTOMAKE_VERSION=1.16' || '' }} ;./build/autotools/autoconfiscate.sh - name: Shutdown VM - uses: cross-platform-actions/action@v0.27.0 + uses: cross-platform-actions/action@v0.28.0 with: architecture: x86_64 memory: 4G Modified: trunk/OpenMPT/.github/workflows/OpenBSD-Makefile.yml ============================================================================== --- trunk/OpenMPT/.github/workflows/OpenBSD-Makefile.yml Sat May 24 23:56:37 2025 (r23169) +++ trunk/OpenMPT/.github/workflows/OpenBSD-Makefile.yml Sun May 25 13:01:38 2025 (r23170) @@ -33,7 +33,7 @@ - name: Checkout uses: actions/checkout@v4 - name: Startup VM - uses: cross-platform-actions/action@v0.27.0 + uses: cross-platform-actions/action@v0.28.0 with: architecture: x86_64 memory: 4G @@ -44,7 +44,7 @@ shutdown_vm: false run: true - name: Install dependencies - uses: cross-platform-actions/action@v0.27.0 + uses: cross-platform-actions/action@v0.28.0 with: architecture: x86_64 memory: 4G @@ -59,7 +59,7 @@ sudo pkg_add -I ${{ (matrix.version == '7.6') && 'autoconf-2.72p0 automake-1.16.5' || (matrix.version == '7.5') && 'autoconf-2.71 automake-1.16.5' || (matrix.version == '7.4') && 'autoconf-2.71 automake-1.16.5' || 'autoconf automake' }} sudo pkg_add -I subversion p5-XML-XPath git mawk gmake pkgconf autoconf-archive libtool libltdl help2man doxygen mpg123 libogg libvorbis flac libsndfile pulseaudio portaudio-svn sdl2 - name: Build - uses: cross-platform-actions/action@v0.27.0 + uses: cross-platform-actions/action@v0.28.0 with: architecture: x86_64 memory: 4G @@ -71,7 +71,7 @@ run: | gmake -j$(sysctl -n hw.ncpu) STRICT=1 VERBOSE=1 ${{ (matrix.deps == 'sys') && 'AUTO_DEPS=1' || (matrix.deps == 'local') && 'LOCAL_ZLIB=1 LOCAL_MPG123=1 LOCAL_OGG=1 LOCAL_VORBIS=1 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_FLAC=1 NO_SNDFILE=1' || 'NO_ZLIB=1 NO_MPG123=1 NO_OGG=1 NO_VORBIS=1 NO_VORBISFILE=1 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_FLAC=1 NO_SNDFILE=1' }} - name: Test - uses: cross-platform-actions/action@v0.27.0 + uses: cross-platform-actions/action@v0.28.0 with: architecture: x86_64 memory: 4G @@ -83,7 +83,7 @@ run: | gmake -j$(sysctl -n hw.ncpu) STRICT=1 VERBOSE=1 ${{ (matrix.deps == 'sys') && 'AUTO_DEPS=1' || (matrix.deps == 'local') && 'LOCAL_ZLIB=1 LOCAL_MPG123=1 LOCAL_OGG=1 LOCAL_VORBIS=1 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_FLAC=1 NO_SNDFILE=1' || 'NO_ZLIB=1 NO_MPG123=1 NO_OGG=1 NO_VORBIS=1 NO_VORBISFILE=1 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_FLAC=1 NO_SNDFILE=1' }} check - name: Shutdown VM - uses: cross-platform-actions/action@v0.27.0 + uses: cross-platform-actions/action@v0.28.0 with: architecture: x86_64 memory: 4G |
|
From: <sv...@op...> - 2025-05-24 21:56:49
|
Author: sagamusix Date: Sat May 24 23:56:37 2025 New Revision: 23169 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=23169 Log: Merged revision(s) 23168 from trunk/OpenMPT: [Imp] Avoid clicks on sample transition e.g. when doing a portamento between two different samples. The old note doesn't get an NNA channel assigned in this case, so the end-of-sample fade-out was missing. ........ Modified: branches/OpenMPT-1.32/ (props changed) branches/OpenMPT-1.32/soundlib/Snd_fx.cpp Modified: branches/OpenMPT-1.32/soundlib/Snd_fx.cpp ============================================================================== --- branches/OpenMPT-1.32/soundlib/Snd_fx.cpp Sat May 24 23:56:21 2025 (r23168) +++ branches/OpenMPT-1.32/soundlib/Snd_fx.cpp Sat May 24 23:56:37 2025 (r23169) @@ -3098,6 +3098,15 @@ if(!m_playBehaviour[kITInstrWithNoteOff] || ModCommand::IsNote(note)) chn.nNewIns = 0; } + // When swapping samples without explicit note change (e.g. during portamento), avoid clicks at end of sample (as there won't be an NNA channel to fade the sample out) + if(oldSample != nullptr && oldSample != chn.pModSample) + { + m_dryLOfsVol += chn.nLOfs; + m_dryROfsVol += chn.nROfs; + chn.nLOfs = 0; + chn.nROfs = 0; + } + if(m_playBehaviour[kITPortamentoSwapResetsPos]) { // Test cases: PortaInsNum.it, PortaSample.it |
|
From: <sv...@op...> - 2025-05-24 21:56:34
|
Author: sagamusix Date: Sat May 24 23:56:21 2025 New Revision: 23168 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=23168 Log: [Imp] Avoid clicks on sample transition e.g. when doing a portamento between two different samples. The old note doesn't get an NNA channel assigned in this case, so the end-of-sample fade-out was missing. Modified: trunk/OpenMPT/soundlib/Snd_fx.cpp Modified: trunk/OpenMPT/soundlib/Snd_fx.cpp ============================================================================== --- trunk/OpenMPT/soundlib/Snd_fx.cpp Sat May 17 21:51:38 2025 (r23167) +++ trunk/OpenMPT/soundlib/Snd_fx.cpp Sat May 24 23:56:21 2025 (r23168) @@ -3098,6 +3098,15 @@ if(!m_playBehaviour[kITInstrWithNoteOff] || ModCommand::IsNote(note)) chn.nNewIns = 0; } + // When swapping samples without explicit note change (e.g. during portamento), avoid clicks at end of sample (as there won't be an NNA channel to fade the sample out) + if(oldSample != nullptr && oldSample != chn.pModSample) + { + m_dryLOfsVol += chn.nLOfs; + m_dryROfsVol += chn.nROfs; + chn.nLOfs = 0; + chn.nROfs = 0; + } + if(m_playBehaviour[kITPortamentoSwapResetsPos]) { // Test cases: PortaInsNum.it, PortaSample.it |
|
From: <sv...@op...> - 2025-05-17 19:51:51
|
Author: sagamusix Date: Sat May 17 21:51:38 2025 New Revision: 23167 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=23167 Log: Merged revision(s) 23166 from trunk/OpenMPT: [Mod] Pattern Properties: Place input fields more uniformly. ........ Modified: branches/OpenMPT-1.32/ (props changed) branches/OpenMPT-1.32/mptrack/mptrack.rc Modified: branches/OpenMPT-1.32/mptrack/mptrack.rc ============================================================================== --- branches/OpenMPT-1.32/mptrack/mptrack.rc Sat May 17 21:51:11 2025 (r23166) +++ branches/OpenMPT-1.32/mptrack/mptrack.rc Sat May 17 21:51:38 2025 (r23167) @@ -683,483 +683,6 @@ PUSHBUTTON "&Browse...",IDC_BUTTON2,210,156,50,12 END - -///////////////////////////////////////////////////////////////////////////// -// -// DESIGNINFO -// - -#ifdef APSTUDIO_INVOKED -GUIDELINES DESIGNINFO -BEGIN - IDD_MISSINGSAMPLES, DIALOG - BEGIN - LEFTMARGIN, 7 - RIGHTMARGIN, 312 - TOPMARGIN, 7 - BOTTOMMARGIN, 178 - END - - IDD_CLEANUP_SONG, DIALOG - BEGIN - LEFTMARGIN, 7 - RIGHTMARGIN, 387 - TOPMARGIN, 7 - BOTTOMMARGIN, 147 - END - - IDD_KEYBOARD_SPLIT, DIALOG - BEGIN - LEFTMARGIN, 7 - RIGHTMARGIN, 177 - TOPMARGIN, 7 - BOTTOMMARGIN, 130 - END - - IDD_SAMPLE_GENERATOR, DIALOG - BEGIN - LEFTMARGIN, 7 - RIGHTMARGIN, 297 - TOPMARGIN, 7 - BOTTOMMARGIN, 184 - END - - IDD_SAMPLE_GENERATOR_PRESETS, DIALOG - BEGIN - LEFTMARGIN, 7 - RIGHTMARGIN, 309 - TOPMARGIN, 7 - BOTTOMMARGIN, 94 - END - - IDD_MIXSAMPLES, DIALOG - BEGIN - LEFTMARGIN, 7 - RIGHTMARGIN, 189 - TOPMARGIN, 7 - BOTTOMMARGIN, 82 - END - - IDD_OPTIONS_SAMPLEEDITOR, DIALOG - BEGIN - LEFTMARGIN, 7 - RIGHTMARGIN, 318 - TOPMARGIN, 7 - END - - IDD_EDITHISTORY, DIALOG - BEGIN - LEFTMARGIN, 7 - RIGHTMARGIN, 309 - TOPMARGIN, 7 - BOTTOMMARGIN, 178 - END - - IDD_SAMPLE_GRID_SIZE, DIALOG - BEGIN - LEFTMARGIN, 7 - RIGHTMARGIN, 147 - TOPMARGIN, 7 - BOTTOMMARGIN, 64 - END - - IDD_SAMPLE_XFADE, DIALOG - BEGIN - LEFTMARGIN, 7 - RIGHTMARGIN, 285 - TOPMARGIN, 7 - BOTTOMMARGIN, 94 - END - - IDD_OPTIONS_UPDATE, DIALOG - BEGIN - LEFTMARGIN, 7 - RIGHTMARGIN, 318 - TOPMARGIN, 7 - BOTTOMMARGIN, 307 - END - - IDD_CLOSEDOCUMENTS, DIALOG - BEGIN - LEFTMARGIN, 7 - RIGHTMARGIN, 363 - TOPMARGIN, 7 - BOTTOMMARGIN, 190 - END - - IDD_AUTOTUNE, DIALOG - BEGIN - LEFTMARGIN, 7 - RIGHTMARGIN, 159 - TOPMARGIN, 7 - BOTTOMMARGIN, 75 - END - - IDD_CHANNELSETTINGS, DIALOG - BEGIN - LEFTMARGIN, 7 - RIGHTMARGIN, 237 - TOPMARGIN, 7 - BOTTOMMARGIN, 88 - END - - IDD_CLIPBOARD, DIALOG - BEGIN - LEFTMARGIN, 7 - RIGHTMARGIN, 176 - TOPMARGIN, 7 - BOTTOMMARGIN, 194 - END - - IDD_INPUT, DIALOG - BEGIN - LEFTMARGIN, 7 - RIGHTMARGIN, 159 - TOPMARGIN, 7 - BOTTOMMARGIN, 59 - END - - IDD_OPTIONS_ADVANCED, DIALOG - BEGIN - LEFTMARGIN, 7 - RIGHTMARGIN, 318 - TOPMARGIN, 7 - BOTTOMMARGIN, 274 - END - - IDD_SCANPLUGINS, DIALOG - BEGIN - LEFTMARGIN, 7 - RIGHTMARGIN, 309 - TOPMARGIN, 7 - BOTTOMMARGIN, 27 - END - - IDD_RESAMPLE, DIALOG - BEGIN - LEFTMARGIN, 7 - RIGHTMARGIN, 190 - TOPMARGIN, 7 - BOTTOMMARGIN, 115 - END - - IDD_WECLOME, DIALOG - BEGIN - LEFTMARGIN, 7 - RIGHTMARGIN, 250 - TOPMARGIN, 7 - BOTTOMMARGIN, 259 - END - - IDD_UPDATE, DIALOG - BEGIN - LEFTMARGIN, 7 - RIGHTMARGIN, 189 - TOPMARGIN, 7 - BOTTOMMARGIN, 131 - END - - IDD_TEMPO_SWING, DIALOG - BEGIN - LEFTMARGIN, 7 - RIGHTMARGIN, 239 - TOPMARGIN, 7 - BOTTOMMARGIN, 136 - END - - IDD_LEGACY_PLAYBACK, DIALOG - BEGIN - LEFTMARGIN, 7 - RIGHTMARGIN, 382 - TOPMARGIN, 7 - BOTTOMMARGIN, 237 - END - - IDD_FIND_RANGE, DIALOG - BEGIN - LEFTMARGIN, 7 - RIGHTMARGIN, 249 - TOPMARGIN, 7 - BOTTOMMARGIN, 46 - END - - IDD_MIDI_IO_PLUGIN, DIALOG - BEGIN - LEFTMARGIN, 7 - RIGHTMARGIN, 245 - TOPMARGIN, 7 - BOTTOMMARGIN, 208 - END - - IDD_OPTIONS_WINE, DIALOG - BEGIN - LEFTMARGIN, 7 - RIGHTMARGIN, 319 - TOPMARGIN, 7 - BOTTOMMARGIN, 304 - END - - IDD_LFOPLUGIN, DIALOG - BEGIN - LEFTMARGIN, 7 - RIGHTMARGIN, 296 - TOPMARGIN, 7 - BOTTOMMARGIN, 194 - END - - IDD_OPL_PARAMS, DIALOG - BEGIN - LEFTMARGIN, 7 - RIGHTMARGIN, 403 - TOPMARGIN, 7 - BOTTOMMARGIN, 211 - END - - IDD_MISSINGPLUGS, DIALOG - BEGIN - LEFTMARGIN, 7 - RIGHTMARGIN, 300 - TOPMARGIN, 7 - BOTTOMMARGIN, 163 - END - - IDD_MODIFIEDSAMPLES, DIALOG - BEGIN - LEFTMARGIN, 7 - RIGHTMARGIN, 312 - TOPMARGIN, 7 - BOTTOMMARGIN, 178 - END - - IDD_OPLEXPORT, DIALOG - BEGIN - LEFTMARGIN, 7 - RIGHTMARGIN, 302 - TOPMARGIN, 7 - BOTTOMMARGIN, 151 - END - - IDD_METRONOME_SETTINGS, DIALOG - BEGIN - LEFTMARGIN, 7 - RIGHTMARGIN, 272 - TOPMARGIN, 7 - BOTTOMMARGIN, 200 - END -END -#endif // APSTUDIO_INVOKED - - -///////////////////////////////////////////////////////////////////////////// -// -// Icon -// - -// Icon with lowest ID value placed first to ensure application icon -// remains consistent on all systems. -IDR_MODULETYPE ICON "res\\moddoc.ico" - - -///////////////////////////////////////////////////////////////////////////// -// -// PNG -// - -IDB_ENVTOOLBAR PNG "res\\envelope_toolbar.png" - -IDB_IMAGELIST PNG "res\\icons.png" - -IDB_MAINBAR PNG "res\\main_toolbar.png" - -IDB_PATTERNS PNG "res\\pattern_toolbar.png" - -IDB_SMPTOOLBAR PNG "res\\sample_toolbar.png" - -IDB_SPLASHNOFOLDFIN PNG "res\\Splash.png" - -IDB_MPTRACK PNG "res\\About.png" - -IDB_NEW_BIG PNG "res\\New32.png" - -IDB_OPEN_BIG PNG "res\\Open32.png" - - -///////////////////////////////////////////////////////////////////////////// -// -// AFX_DIALOG_LAYOUT -// - -IDD_MIDI_IO_PLUGIN AFX_DIALOG_LAYOUT -BEGIN - 0, - 0, 0, 100, 0, - 0, 0, 100, 0, - 0, 0, 100, 0, - 0, 0, 100, 0, - 0, 0, 0, 0, - 0, 0, 0, 0, - 0, 0, 0, 0, - 0, 0, 0, 0, - 0, 0, 0, 0, - 0, 0, 100, 100, - 0, 0, 100, 100, - 0, 100, 0, 0, - 100, 100, 0, 0, - 100, 100, 0, 0, - 0, 100, 100, 0, - 0, 100, 0, 0, - 0, 100, 100, 0 -END - -IDD_LFOPLUGIN AFX_DIALOG_LAYOUT -BEGIN - 0 -END - -IDD_OPTIONS_SAMPLEEDITOR AFX_DIALOG_LAYOUT -BEGIN - 0 -END - -IDD_OPTIONS_WINE AFX_DIALOG_LAYOUT -BEGIN - 0 -END - -IDD_CLIPBOARD AFX_DIALOG_LAYOUT -BEGIN - 0, - 0, 0, 100, 100, - 0, 100, 0, 0, - 0, 100, 0, 0, - 0, 100, 0, 0, - 0, 100, 0, 0 -END - -IDD_OPL_PARAMS AFX_DIALOG_LAYOUT -BEGIN - 0 -END - -IDD_CLOSEDOCUMENTS AFX_DIALOG_LAYOUT -BEGIN - 0, - 100, 100, 0, 0, - 100, 100, 0, 0, - 0, 0, 100, 100, - 0, 100, 0, 0, - 100, 100, 0, 0, - 100, 100, 0, 0 -END - -IDD_MISSINGPLUGS AFX_DIALOG_LAYOUT -BEGIN - 0, - 100, 100, 0, 0, - 0, 0, 0, 0, - 0, 0, 100, 100, - 100, 100, 0, 0 -END - -IDD_MISSINGSAMPLES AFX_DIALOG_LAYOUT -BEGIN - 0, - 100, 100, 0, 0, - 0, 0, 0, 0, - 0, 0, 100, 100, - 0, 100, 0, 0, - 0, 100, 100, 0 -END - -IDD_OPTIONS_UPDATE AFX_DIALOG_LAYOUT -BEGIN - 0 -END - -IDD_WECLOME AFX_DIALOG_LAYOUT -BEGIN - 0 -END - -IDD_LEGACY_PLAYBACK AFX_DIALOG_LAYOUT -BEGIN - 0, - 100, 100, 0, 0, - 100, 100, 0, 0, - 0, 0, 0, 0, - 0, 0, 0, 0, - 0, 0, 100, 0, - 0, 0, 100, 100, - 0, 100, 0, 0, - 0, 100, 0, 0 -END - -IDD_EDITHISTORY AFX_DIALOG_LAYOUT -BEGIN - 0, - 100, 100, 0, 0, - 0, 100, 0, 0, - 0, 0, 100, 100, - 0, 100, 100, 0 -END - -IDD_MODIFIEDSAMPLES AFX_DIALOG_LAYOUT -BEGIN - 0, - 100, 100, 0, 0, - 0, 0, 0, 0, - 0, 0, 100, 100, - 100, 100, 0, 0, - 100, 100, 0, 0, - 0, 100, 100, 0 -END - -IDD_UPDATE AFX_DIALOG_LAYOUT -BEGIN - 0 -END - -IDD_CHANNELSETTINGS AFX_DIALOG_LAYOUT -BEGIN - 0 -END - -IDD_RESAMPLE AFX_DIALOG_LAYOUT -BEGIN - 0 -END - -IDD_OPLEXPORT AFX_DIALOG_LAYOUT -BEGIN - 0 -END - -IDD_OPTIONS_ADVANCED AFX_DIALOG_LAYOUT -BEGIN - 0 -END - -IDD_METRONOME_SETTINGS AFX_DIALOG_LAYOUT -BEGIN - 0 -END - -#endif // German (Germany) resources -///////////////////////////////////////////////////////////////////////////// - - -///////////////////////////////////////////////////////////////////////////// -// English (United States) resources - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US -#pragma code_page(1252) - -///////////////////////////////////////////////////////////////////////////// -// -// Dialog -// - IDD_ABOUTBOX DIALOGEX 0, 0, 340, 266 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "About OpenMPT" @@ -1926,24 +1449,24 @@ LTEXT "Name:",IDC_STATIC,6,26,36,8 EDITTEXT IDC_EDIT2,42,24,84,12,ES_AUTOHSCROLL CONTROL "",IDC_STATIC,"Static",SS_ETCHEDFRAME,6,48,184,1 - LTEXT "&Rows:",IDC_STATIC,12,54,108,8 - COMBOBOX IDC_COMBO1,12,66,48,93,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "&/2",IDC_BUTTON_HALF,66,66,18,12 - PUSHBUTTON "&x2",IDC_BUTTON_DOUBLE,90,66,18,12 - LTEXT "Remove rows from / Add rows at:",IDC_STATIC,12,84,126,8 - CONTROL "&Top of Pattern",IDC_RADIO1,"Button",BS_AUTORADIOBUTTON,12,96,84,12 - CONTROL "&Bottom of Pattern",IDC_RADIO2,"Button",BS_AUTORADIOBUTTON,96,96,84,12 + LTEXT "&Rows:",IDC_STATIC,6,56,36,8 + COMBOBOX IDC_COMBO1,42,54,48,93,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "&/2",IDC_BUTTON_HALF,96,54,18,12 + PUSHBUTTON "&x2",IDC_BUTTON_DOUBLE,120,54,18,12 + LTEXT "Remove rows from / Add rows at:",IDC_STATIC,6,78,126,8 + CONTROL "&Top of Pattern",IDC_RADIO1,"Button",BS_AUTORADIOBUTTON,6,90,84,12 + CONTROL "&Bottom of Pattern",IDC_RADIO2,"Button",BS_AUTORADIOBUTTON,90,90,84,12 CONTROL "Repeat pattern contents when &adding rows",IDC_CHECK2, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,114,168,10 - CONTROL "",IDC_STATIC,"Static",SS_ETCHEDFRAME,6,132,184,1 - CONTROL "Override &song signature:",IDC_CHECK1,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,138,108,12 - PUSHBUTTON "Configure S&wing",IDC_BUTTON1,124,138,66,12 - LTEXT "Rows per b&eat",IDC_STATIC,64,159,126,8 - EDITTEXT IDC_ROWSPERBEAT,24,156,30,12,ES_AUTOHSCROLL | ES_NUMBER - CONTROL "",IDC_SPIN2,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS,48,159,11,14 - LTEXT "Rows per &measure",IDC_STATIC,64,176,126,8 - EDITTEXT IDC_ROWSPERMEASURE,24,175,30,12,ES_AUTOHSCROLL | ES_NUMBER - CONTROL "",IDC_SPIN3,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS,48,173,11,14 + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,108,168,10 + CONTROL "",IDC_STATIC,"Static",SS_ETCHEDFRAME,6,126,184,1 + CONTROL "Override &song signature:",IDC_CHECK1,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,132,114,12 + PUSHBUTTON "Configure S&wing",IDC_BUTTON1,124,132,66,12 + LTEXT "Rows per b&eat",IDC_STATIC,58,153,128,8 + EDITTEXT IDC_ROWSPERBEAT,18,151,30,12,ES_AUTOHSCROLL | ES_NUMBER + CONTROL "",IDC_SPIN2,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS,42,153,11,14 + LTEXT "Rows per &measure",IDC_STATIC,58,170,128,8 + EDITTEXT IDC_ROWSPERMEASURE,18,169,30,12,ES_AUTOHSCROLL | ES_NUMBER + CONTROL "",IDC_SPIN3,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS,42,167,11,14 DEFPUSHBUTTON "&OK",IDOK,140,6,50,14 PUSHBUTTON "&Cancel",IDCANCEL,140,24,50,14 END @@ -2405,273 +1928,263 @@ #ifdef APSTUDIO_INVOKED GUIDELINES DESIGNINFO BEGIN - IDD_ABOUTBOX, DIALOG + IDD_MISSINGSAMPLES, DIALOG BEGIN - RIGHTMARGIN, 334 - BOTTOMMARGIN, 261 + LEFTMARGIN, 7 + RIGHTMARGIN, 312 + TOPMARGIN, 7 + BOTTOMMARGIN, 178 END - IDD_OPTIONS_PLAYER, DIALOG + IDD_CLEANUP_SONG, DIALOG BEGIN - LEFTMARGIN, 6 - RIGHTMARGIN, 318 - VERTGUIDE, 50 - VERTGUIDE, 169 + LEFTMARGIN, 7 + RIGHTMARGIN, 387 + TOPMARGIN, 7 + BOTTOMMARGIN, 147 END - IDD_WAVECONVERT, DIALOG + IDD_KEYBOARD_SPLIT, DIALOG BEGIN - RIGHTMARGIN, 338 - BOTTOMMARGIN, 281 + LEFTMARGIN, 7 + RIGHTMARGIN, 177 + TOPMARGIN, 7 + BOTTOMMARGIN, 130 END - IDD_PROGRESS, DIALOG + IDD_SAMPLE_GENERATOR, DIALOG BEGIN - RIGHTMARGIN, 186 + LEFTMARGIN, 7 + RIGHTMARGIN, 297 + TOPMARGIN, 7 + BOTTOMMARGIN, 184 END - IDD_OPTIONS_KEYBOARD, DIALOG + IDD_SAMPLE_GENERATOR_PRESETS, DIALOG BEGIN - LEFTMARGIN, 5 - RIGHTMARGIN, 320 - TOPMARGIN, 5 + LEFTMARGIN, 7 + RIGHTMARGIN, 309 + TOPMARGIN, 7 + BOTTOMMARGIN, 94 END - IDD_OPTIONS_COLORS, DIALOG + IDD_MIXSAMPLES, DIALOG BEGIN - LEFTMARGIN, 6 - RIGHTMARGIN, 318 - TOPMARGIN, 6 + LEFTMARGIN, 7 + RIGHTMARGIN, 189 + TOPMARGIN, 7 + BOTTOMMARGIN, 82 END - IDD_OPTIONS_MIDI, DIALOG + IDD_OPTIONS_SAMPLEEDITOR, DIALOG BEGIN - LEFTMARGIN, 6 + LEFTMARGIN, 7 RIGHTMARGIN, 318 - TOPMARGIN, 6 - END - - IDD_LOADRAWSAMPLE, DIALOG - BEGIN - RIGHTMARGIN, 227 - BOTTOMMARGIN, 127 - END - - IDD_CONTROL_GLOBALS, DIALOG - BEGIN - RIGHTMARGIN, 374 - BOTTOMMARGIN, 118 + TOPMARGIN, 7 END - IDD_CONTROL_COMMENTS, DIALOG + IDD_EDITHISTORY, DIALOG BEGIN - RIGHTMARGIN, 348 + LEFTMARGIN, 7 + RIGHTMARGIN, 309 + TOPMARGIN, 7 + BOTTOMMARGIN, 178 END - IDD_CONTROL_PATTERNS, DIALOG + IDD_SAMPLE_GRID_SIZE, DIALOG BEGIN - RIGHTMARGIN, 554 - VERTGUIDE, 39 - VERTGUIDE, 134 - BOTTOMMARGIN, 76 - HORZGUIDE, 37 - HORZGUIDE, 61 - HORZGUIDE, 73 + LEFTMARGIN, 7 + RIGHTMARGIN, 147 + TOPMARGIN, 7 + BOTTOMMARGIN, 64 END - IDD_CONTROL_SAMPLES, DIALOG + IDD_SAMPLE_XFADE, DIALOG BEGIN - LEFTMARGIN, 2 - RIGHTMARGIN, 552 - BOTTOMMARGIN, 104 + LEFTMARGIN, 7 + RIGHTMARGIN, 285 + TOPMARGIN, 7 + BOTTOMMARGIN, 94 END - IDD_CONTROL_INSTRUMENTS, DIALOG + IDD_OPTIONS_UPDATE, DIALOG BEGIN - RIGHTMARGIN, 506 - BOTTOMMARGIN, 165 + LEFTMARGIN, 7 + RIGHTMARGIN, 318 + TOPMARGIN, 7 + BOTTOMMARGIN, 307 END - IDD_MODDOC_MODTYPE, DIALOG + IDD_CLOSEDOCUMENTS, DIALOG BEGIN - RIGHTMARGIN, 248 - BOTTOMMARGIN, 280 + LEFTMARGIN, 7 + RIGHTMARGIN, 363 + TOPMARGIN, 7 + BOTTOMMARGIN, 190 END - IDD_REMOVECHANNELS, DIALOG + IDD_AUTOTUNE, DIALOG BEGIN - RIGHTMARGIN, 163 - BOTTOMMARGIN, 219 + LEFTMARGIN, 7 + RIGHTMARGIN, 159 + TOPMARGIN, 7 + BOTTOMMARGIN, 75 END - IDD_VIEW_GLOBALS, DIALOG + IDD_CHANNELSETTINGS, DIALOG BEGIN - BOTTOMMARGIN, 324 + LEFTMARGIN, 7 + RIGHTMARGIN, 237 + TOPMARGIN, 7 + BOTTOMMARGIN, 88 END - IDD_EDIT_FIND, DIALOG + IDD_CLIPBOARD, DIALOG BEGIN + LEFTMARGIN, 7 RIGHTMARGIN, 176 - BOTTOMMARGIN, 146 - END - - IDD_EDIT_REPLACE, DIALOG - BEGIN - RIGHTMARGIN, 182 - BOTTOMMARGIN, 148 - END - - IDD_PATTERN_PROPERTIES, DIALOG - BEGIN - LEFTMARGIN, 6 - RIGHTMARGIN, 190 - TOPMARGIN, 6 - BOTTOMMARGIN, 187 - END - - IDD_PATTERN_EDITCOMMAND, DIALOG - BEGIN - RIGHTMARGIN, 244 - BOTTOMMARGIN, 47 - END - - IDD_SAMPLE_AMPLIFY, DIALOG - BEGIN - RIGHTMARGIN, 184 - BOTTOMMARGIN, 89 + TOPMARGIN, 7 + BOTTOMMARGIN, 194 END - IDD_INFO_BOX, DIALOG + IDD_INPUT, DIALOG BEGIN LEFTMARGIN, 7 - RIGHTMARGIN, 266 + RIGHTMARGIN, 159 TOPMARGIN, 7 - BOTTOMMARGIN, 166 + BOTTOMMARGIN, 59 END - IDD_OPTIONS_GENERAL, DIALOG + IDD_OPTIONS_ADVANCED, DIALOG BEGIN - LEFTMARGIN, 4 + LEFTMARGIN, 7 RIGHTMARGIN, 318 - TOPMARGIN, 6 - BOTTOMMARGIN, 313 + TOPMARGIN, 7 + BOTTOMMARGIN, 274 END - IDD_OPTIONS_SOUNDCARD, DIALOG + IDD_SCANPLUGINS, DIALOG BEGIN - LEFTMARGIN, 6 - RIGHTMARGIN, 318 - TOPMARGIN, 6 - BOTTOMMARGIN, 306 + LEFTMARGIN, 7 + RIGHTMARGIN, 309 + TOPMARGIN, 7 + BOTTOMMARGIN, 27 END - IDD_MIDIMACRO, DIALOG + IDD_RESAMPLE, DIALOG BEGIN - LEFTMARGIN, 4 - RIGHTMARGIN, 365 - TOPMARGIN, 4 - BOTTOMMARGIN, 330 + LEFTMARGIN, 7 + RIGHTMARGIN, 190 + TOPMARGIN, 7 + BOTTOMMARGIN, 115 END - IDD_CHORDEDIT, DIALOG + IDD_WECLOME, DIALOG BEGIN - LEFTMARGIN, 4 - RIGHTMARGIN, 317 - TOPMARGIN, 4 - BOTTOMMARGIN, 120 + LEFTMARGIN, 7 + RIGHTMARGIN, 250 + TOPMARGIN, 7 + BOTTOMMARGIN, 259 END - IDD_SPLASHSCREEN, DIALOG + IDD_UPDATE, DIALOG BEGIN + LEFTMARGIN, 7 + RIGHTMARGIN, 189 + TOPMARGIN, 7 + BOTTOMMARGIN, 131 END - IDD_MOD2MIDI, DIALOG + IDD_TEMPO_SWING, DIALOG BEGIN - LEFTMARGIN, 4 - RIGHTMARGIN, 263 - TOPMARGIN, 4 - BOTTOMMARGIN, 190 + LEFTMARGIN, 7 + RIGHTMARGIN, 239 + TOPMARGIN, 7 + BOTTOMMARGIN, 136 END - IDD_SAVEPRESET, DIALOG + IDD_LEGACY_PLAYBACK, DIALOG BEGIN LEFTMARGIN, 7 - RIGHTMARGIN, 147 - BOTTOMMARGIN, 52 + RIGHTMARGIN, 382 + TOPMARGIN, 7 + BOTTOMMARGIN, 237 END - IDD_EDITSAMPLEMAP, DIALOG + IDD_FIND_RANGE, DIALOG BEGIN - LEFTMARGIN, 4 - RIGHTMARGIN, 283 - TOPMARGIN, 4 + LEFTMARGIN, 7 + RIGHTMARGIN, 249 + TOPMARGIN, 7 + BOTTOMMARGIN, 46 END - IDD_SELECTMIXPLUGIN, DIALOG + IDD_MIDI_IO_PLUGIN, DIALOG BEGIN LEFTMARGIN, 7 - RIGHTMARGIN, 246 + RIGHTMARGIN, 245 TOPMARGIN, 7 - BOTTOMMARGIN, 278 + BOTTOMMARGIN, 208 END - IDD_PLUGINEDITOR, DIALOG + IDD_OPTIONS_WINE, DIALOG BEGIN - LEFTMARGIN, 4 - RIGHTMARGIN, 481 - TOPMARGIN, 4 - BOTTOMMARGIN, 149 + LEFTMARGIN, 7 + RIGHTMARGIN, 319 + TOPMARGIN, 7 + BOTTOMMARGIN, 304 END - IDD_EFFECTVISUALIZER, DIALOG + IDD_LFOPLUGIN, DIALOG BEGIN - LEFTMARGIN, 4 - RIGHTMARGIN, 418 - TOPMARGIN, 3 - BOTTOMMARGIN, 104 + LEFTMARGIN, 7 + RIGHTMARGIN, 296 + TOPMARGIN, 7 + BOTTOMMARGIN, 194 END - IDD_PITCHSHIFT, DIALOG + IDD_OPL_PARAMS, DIALOG BEGIN + LEFTMARGIN, 7 + RIGHTMARGIN, 403 + TOPMARGIN, 7 + BOTTOMMARGIN, 211 END - IDD_OPTIONS_AUTOSAVE, DIALOG + IDD_MISSINGPLUGS, DIALOG BEGIN - LEFTMARGIN, 6 - RIGHTMARGIN, 319 - TOPMARGIN, 6 - BOTTOMMARGIN, 306 + LEFTMARGIN, 7 + RIGHTMARGIN, 300 + TOPMARGIN, 7 + BOTTOMMARGIN, 163 END - IDD_EDIT_GOTO, DIALOG + IDD_MODIFIEDSAMPLES, DIALOG BEGIN - LEFTMARGIN, 6 - RIGHTMARGIN, 116 - TOPMARGIN, 4 - BOTTOMMARGIN, 117 + LEFTMARGIN, 7 + RIGHTMARGIN, 312 + TOPMARGIN, 7 + BOTTOMMARGIN, 178 END - IDD_ADDSILENCE, DIALOG + IDD_OPLEXPORT, DIALOG BEGIN LEFTMARGIN, 7 - RIGHTMARGIN, 188 + RIGHTMARGIN, 302 TOPMARGIN, 7 - BOTTOMMARGIN, 86 + BOTTOMMARGIN, 151 END - IDD_OPTIONS_MIXER, DIALOG + IDD_METRONOME_SETTINGS, DIALOG BEGIN LEFTMARGIN, 7 - RIGHTMARGIN, 318 + RIGHTMARGIN, 272 TOPMARGIN, 7 + BOTTOMMARGIN, 200 END - IDD_QUICKSTART, DIALOG + IDD_PATTERN_PROPERTIES, DIALOG BEGIN - LEFTMARGIN, 10 - RIGHTMARGIN, 321 - TOPMARGIN, 9 - BOTTOMMARGIN, 202 END END #endif // APSTUDIO_INVOKED @@ -2686,12 +2199,193 @@ // remains consistent on all systems. IDR_MAINFRAME ICON "res\\mptrack.ico" +IDR_MODULETYPE ICON "res\\moddoc.ico" + + +///////////////////////////////////////////////////////////////////////////// +// +// PNG +// + +IDB_ENVTOOLBAR PNG "res\\envelope_toolbar.png" + +IDB_IMAGELIST PNG "res\\icons.png" + +IDB_MAINBAR PNG "res\\main_toolbar.png" + +IDB_PATTERNS PNG "res\\pattern_toolbar.png" + +IDB_SMPTOOLBAR PNG "res\\sample_toolbar.png" + +IDB_SPLASHNOFOLDFIN PNG "res\\Splash.png" + +IDB_MPTRACK PNG "res\\About.png" + +IDB_NEW_BIG PNG "res\\New32.png" + +IDB_OPEN_BIG PNG "res\\Open32.png" + ///////////////////////////////////////////////////////////////////////////// // // AFX_DIALOG_LAYOUT // +IDD_MIDI_IO_PLUGIN AFX_DIALOG_LAYOUT +BEGIN + 0, + 0, 0, 100, 0, + 0, 0, 100, 0, + 0, 0, 100, 0, + 0, 0, 100, 0, + 0, 0, 0, 0, + 0, 0, 0, 0, + 0, 0, 0, 0, + 0, 0, 0, 0, + 0, 0, 0, 0, + 0, 0, 100, 100, + 0, 0, 100, 100, + 0, 100, 0, 0, + 100, 100, 0, 0, + 100, 100, 0, 0, + 0, 100, 100, 0, + 0, 100, 0, 0, + 0, 100, 100, 0 +END + +IDD_LFOPLUGIN AFX_DIALOG_LAYOUT +BEGIN + 0 +END + +IDD_OPTIONS_SAMPLEEDITOR AFX_DIALOG_LAYOUT +BEGIN + 0 +END + +IDD_OPTIONS_WINE AFX_DIALOG_LAYOUT +BEGIN + 0 +END + +IDD_CLIPBOARD AFX_DIALOG_LAYOUT +BEGIN + 0, + 0, 0, 100, 100, + 0, 100, 0, 0, + 0, 100, 0, 0, + 0, 100, 0, 0, + 0, 100, 0, 0 +END + +IDD_OPL_PARAMS AFX_DIALOG_LAYOUT +BEGIN + 0 +END + +IDD_CLOSEDOCUMENTS AFX_DIALOG_LAYOUT +BEGIN + 0, + 100, 100, 0, 0, + 100, 100, 0, 0, + 0, 0, 100, 100, + 0, 100, 0, 0, + 100, 100, 0, 0, + 100, 100, 0, 0 +END + +IDD_MISSINGPLUGS AFX_DIALOG_LAYOUT +BEGIN + 0, + 100, 100, 0, 0, + 0, 0, 0, 0, + 0, 0, 100, 100, + 100, 100, 0, 0 +END + +IDD_MISSINGSAMPLES AFX_DIALOG_LAYOUT +BEGIN + 0, + 100, 100, 0, 0, + 0, 0, 0, 0, + 0, 0, 100, 100, + 0, 100, 0, 0, + 0, 100, 100, 0 +END + +IDD_OPTIONS_UPDATE AFX_DIALOG_LAYOUT +BEGIN + 0 +END + +IDD_WECLOME AFX_DIALOG_LAYOUT +BEGIN + 0 +END + +IDD_LEGACY_PLAYBACK AFX_DIALOG_LAYOUT +BEGIN + 0, + 100, 100, 0, 0, + 100, 100, 0, 0, + 0, 0, 0, 0, + 0, 0, 0, 0, + 0, 0, 100, 0, + 0, 0, 100, 100, + 0, 100, 0, 0, + 0, 100, 0, 0 +END + +IDD_EDITHISTORY AFX_DIALOG_LAYOUT +BEGIN + 0, + 100, 100, 0, 0, + 0, 100, 0, 0, + 0, 0, 100, 100, + 0, 100, 100, 0 +END + +IDD_MODIFIEDSAMPLES AFX_DIALOG_LAYOUT +BEGIN + 0, + 100, 100, 0, 0, + 0, 0, 0, 0, + 0, 0, 100, 100, + 100, 100, 0, 0, + 100, 100, 0, 0, + 0, 100, 100, 0 +END + +IDD_UPDATE AFX_DIALOG_LAYOUT +BEGIN + 0 +END + +IDD_CHANNELSETTINGS AFX_DIALOG_LAYOUT +BEGIN + 0 +END + +IDD_RESAMPLE AFX_DIALOG_LAYOUT +BEGIN + 0 +END + +IDD_OPLEXPORT AFX_DIALOG_LAYOUT +BEGIN + 0 +END + +IDD_OPTIONS_ADVANCED AFX_DIALOG_LAYOUT +BEGIN + 0 +END + +IDD_METRONOME_SETTINGS AFX_DIALOG_LAYOUT +BEGIN + 0 +END + IDD_MIDIMACRO AFX_DIALOG_LAYOUT BEGIN 0 |
|
From: <sv...@op...> - 2025-05-17 19:51:20
|
Author: sagamusix Date: Sat May 17 21:51:11 2025 New Revision: 23166 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=23166 Log: [Mod] Pattern Properties: Place input fields more uniformly. Modified: trunk/OpenMPT/mptrack/mptrack.rc Modified: trunk/OpenMPT/mptrack/mptrack.rc ============================================================================== --- trunk/OpenMPT/mptrack/mptrack.rc Fri May 16 21:48:54 2025 (r23165) +++ trunk/OpenMPT/mptrack/mptrack.rc Sat May 17 21:51:11 2025 (r23166) @@ -683,483 +683,6 @@ PUSHBUTTON "&Browse...",IDC_BUTTON2,210,156,50,12 END - -///////////////////////////////////////////////////////////////////////////// -// -// DESIGNINFO -// - -#ifdef APSTUDIO_INVOKED -GUIDELINES DESIGNINFO -BEGIN - IDD_MISSINGSAMPLES, DIALOG - BEGIN - LEFTMARGIN, 7 - RIGHTMARGIN, 312 - TOPMARGIN, 7 - BOTTOMMARGIN, 178 - END - - IDD_CLEANUP_SONG, DIALOG - BEGIN - LEFTMARGIN, 7 - RIGHTMARGIN, 387 - TOPMARGIN, 7 - BOTTOMMARGIN, 147 - END - - IDD_KEYBOARD_SPLIT, DIALOG - BEGIN - LEFTMARGIN, 7 - RIGHTMARGIN, 177 - TOPMARGIN, 7 - BOTTOMMARGIN, 130 - END - - IDD_SAMPLE_GENERATOR, DIALOG - BEGIN - LEFTMARGIN, 7 - RIGHTMARGIN, 297 - TOPMARGIN, 7 - BOTTOMMARGIN, 184 - END - - IDD_SAMPLE_GENERATOR_PRESETS, DIALOG - BEGIN - LEFTMARGIN, 7 - RIGHTMARGIN, 309 - TOPMARGIN, 7 - BOTTOMMARGIN, 94 - END - - IDD_MIXSAMPLES, DIALOG - BEGIN - LEFTMARGIN, 7 - RIGHTMARGIN, 189 - TOPMARGIN, 7 - BOTTOMMARGIN, 82 - END - - IDD_OPTIONS_SAMPLEEDITOR, DIALOG - BEGIN - LEFTMARGIN, 7 - RIGHTMARGIN, 318 - TOPMARGIN, 7 - END - - IDD_EDITHISTORY, DIALOG - BEGIN - LEFTMARGIN, 7 - RIGHTMARGIN, 309 - TOPMARGIN, 7 - BOTTOMMARGIN, 178 - END - - IDD_SAMPLE_GRID_SIZE, DIALOG - BEGIN - LEFTMARGIN, 7 - RIGHTMARGIN, 147 - TOPMARGIN, 7 - BOTTOMMARGIN, 64 - END - - IDD_SAMPLE_XFADE, DIALOG - BEGIN - LEFTMARGIN, 7 - RIGHTMARGIN, 285 - TOPMARGIN, 7 - BOTTOMMARGIN, 94 - END - - IDD_OPTIONS_UPDATE, DIALOG - BEGIN - LEFTMARGIN, 7 - RIGHTMARGIN, 318 - TOPMARGIN, 7 - BOTTOMMARGIN, 307 - END - - IDD_CLOSEDOCUMENTS, DIALOG - BEGIN - LEFTMARGIN, 7 - RIGHTMARGIN, 363 - TOPMARGIN, 7 - BOTTOMMARGIN, 190 - END - - IDD_AUTOTUNE, DIALOG - BEGIN - LEFTMARGIN, 7 - RIGHTMARGIN, 159 - TOPMARGIN, 7 - BOTTOMMARGIN, 75 - END - - IDD_CHANNELSETTINGS, DIALOG - BEGIN - LEFTMARGIN, 7 - RIGHTMARGIN, 237 - TOPMARGIN, 7 - BOTTOMMARGIN, 88 - END - - IDD_CLIPBOARD, DIALOG - BEGIN - LEFTMARGIN, 7 - RIGHTMARGIN, 176 - TOPMARGIN, 7 - BOTTOMMARGIN, 194 - END - - IDD_INPUT, DIALOG - BEGIN - LEFTMARGIN, 7 - RIGHTMARGIN, 159 - TOPMARGIN, 7 - BOTTOMMARGIN, 59 - END - - IDD_OPTIONS_ADVANCED, DIALOG - BEGIN - LEFTMARGIN, 7 - RIGHTMARGIN, 318 - TOPMARGIN, 7 - BOTTOMMARGIN, 274 - END - - IDD_SCANPLUGINS, DIALOG - BEGIN - LEFTMARGIN, 7 - RIGHTMARGIN, 309 - TOPMARGIN, 7 - BOTTOMMARGIN, 27 - END - - IDD_RESAMPLE, DIALOG - BEGIN - LEFTMARGIN, 7 - RIGHTMARGIN, 190 - TOPMARGIN, 7 - BOTTOMMARGIN, 115 - END - - IDD_WECLOME, DIALOG - BEGIN - LEFTMARGIN, 7 - RIGHTMARGIN, 250 - TOPMARGIN, 7 - BOTTOMMARGIN, 259 - END - - IDD_UPDATE, DIALOG - BEGIN - LEFTMARGIN, 7 - RIGHTMARGIN, 189 - TOPMARGIN, 7 - BOTTOMMARGIN, 131 - END - - IDD_TEMPO_SWING, DIALOG - BEGIN - LEFTMARGIN, 7 - RIGHTMARGIN, 239 - TOPMARGIN, 7 - BOTTOMMARGIN, 136 - END - - IDD_LEGACY_PLAYBACK, DIALOG - BEGIN - LEFTMARGIN, 7 - RIGHTMARGIN, 382 - TOPMARGIN, 7 - BOTTOMMARGIN, 237 - END - - IDD_FIND_RANGE, DIALOG - BEGIN - LEFTMARGIN, 7 - RIGHTMARGIN, 249 - TOPMARGIN, 7 - BOTTOMMARGIN, 46 - END - - IDD_MIDI_IO_PLUGIN, DIALOG - BEGIN - LEFTMARGIN, 7 - RIGHTMARGIN, 245 - TOPMARGIN, 7 - BOTTOMMARGIN, 208 - END - - IDD_OPTIONS_WINE, DIALOG - BEGIN - LEFTMARGIN, 7 - RIGHTMARGIN, 319 - TOPMARGIN, 7 - BOTTOMMARGIN, 304 - END - - IDD_LFOPLUGIN, DIALOG - BEGIN - LEFTMARGIN, 7 - RIGHTMARGIN, 296 - TOPMARGIN, 7 - BOTTOMMARGIN, 194 - END - - IDD_OPL_PARAMS, DIALOG - BEGIN - LEFTMARGIN, 7 - RIGHTMARGIN, 403 - TOPMARGIN, 7 - BOTTOMMARGIN, 211 - END - - IDD_MISSINGPLUGS, DIALOG - BEGIN - LEFTMARGIN, 7 - RIGHTMARGIN, 300 - TOPMARGIN, 7 - BOTTOMMARGIN, 163 - END - - IDD_MODIFIEDSAMPLES, DIALOG - BEGIN - LEFTMARGIN, 7 - RIGHTMARGIN, 312 - TOPMARGIN, 7 - BOTTOMMARGIN, 178 - END - - IDD_OPLEXPORT, DIALOG - BEGIN - LEFTMARGIN, 7 - RIGHTMARGIN, 302 - TOPMARGIN, 7 - BOTTOMMARGIN, 151 - END - - IDD_METRONOME_SETTINGS, DIALOG - BEGIN - LEFTMARGIN, 7 - RIGHTMARGIN, 272 - TOPMARGIN, 7 - BOTTOMMARGIN, 200 - END -END -#endif // APSTUDIO_INVOKED - - -///////////////////////////////////////////////////////////////////////////// -// -// Icon -// - -// Icon with lowest ID value placed first to ensure application icon -// remains consistent on all systems. -IDR_MODULETYPE ICON "res\\moddoc.ico" - - -///////////////////////////////////////////////////////////////////////////// -// -// PNG -// - -IDB_ENVTOOLBAR PNG "res\\envelope_toolbar.png" - -IDB_IMAGELIST PNG "res\\icons.png" - -IDB_MAINBAR PNG "res\\main_toolbar.png" - -IDB_PATTERNS PNG "res\\pattern_toolbar.png" - -IDB_SMPTOOLBAR PNG "res\\sample_toolbar.png" - -IDB_SPLASHNOFOLDFIN PNG "res\\Splash.png" - -IDB_MPTRACK PNG "res\\About.png" - -IDB_NEW_BIG PNG "res\\New32.png" - -IDB_OPEN_BIG PNG "res\\Open32.png" - - -///////////////////////////////////////////////////////////////////////////// -// -// AFX_DIALOG_LAYOUT -// - -IDD_MIDI_IO_PLUGIN AFX_DIALOG_LAYOUT -BEGIN - 0, - 0, 0, 100, 0, - 0, 0, 100, 0, - 0, 0, 100, 0, - 0, 0, 100, 0, - 0, 0, 0, 0, - 0, 0, 0, 0, - 0, 0, 0, 0, - 0, 0, 0, 0, - 0, 0, 0, 0, - 0, 0, 100, 100, - 0, 0, 100, 100, - 0, 100, 0, 0, - 100, 100, 0, 0, - 100, 100, 0, 0, - 0, 100, 100, 0, - 0, 100, 0, 0, - 0, 100, 100, 0 -END - -IDD_LFOPLUGIN AFX_DIALOG_LAYOUT -BEGIN - 0 -END - -IDD_OPTIONS_SAMPLEEDITOR AFX_DIALOG_LAYOUT -BEGIN - 0 -END - -IDD_OPTIONS_WINE AFX_DIALOG_LAYOUT -BEGIN - 0 -END - -IDD_CLIPBOARD AFX_DIALOG_LAYOUT -BEGIN - 0, - 0, 0, 100, 100, - 0, 100, 0, 0, - 0, 100, 0, 0, - 0, 100, 0, 0, - 0, 100, 0, 0 -END - -IDD_OPL_PARAMS AFX_DIALOG_LAYOUT -BEGIN - 0 -END - -IDD_CLOSEDOCUMENTS AFX_DIALOG_LAYOUT -BEGIN - 0, - 100, 100, 0, 0, - 100, 100, 0, 0, - 0, 0, 100, 100, - 0, 100, 0, 0, - 100, 100, 0, 0, - 100, 100, 0, 0 -END - -IDD_MISSINGPLUGS AFX_DIALOG_LAYOUT -BEGIN - 0, - 100, 100, 0, 0, - 0, 0, 0, 0, - 0, 0, 100, 100, - 100, 100, 0, 0 -END - -IDD_MISSINGSAMPLES AFX_DIALOG_LAYOUT -BEGIN - 0, - 100, 100, 0, 0, - 0, 0, 0, 0, - 0, 0, 100, 100, - 0, 100, 0, 0, - 0, 100, 100, 0 -END - -IDD_OPTIONS_UPDATE AFX_DIALOG_LAYOUT -BEGIN - 0 -END - -IDD_WECLOME AFX_DIALOG_LAYOUT -BEGIN - 0 -END - -IDD_LEGACY_PLAYBACK AFX_DIALOG_LAYOUT -BEGIN - 0, - 100, 100, 0, 0, - 100, 100, 0, 0, - 0, 0, 0, 0, - 0, 0, 0, 0, - 0, 0, 100, 0, - 0, 0, 100, 100, - 0, 100, 0, 0, - 0, 100, 0, 0 -END - -IDD_EDITHISTORY AFX_DIALOG_LAYOUT -BEGIN - 0, - 100, 100, 0, 0, - 0, 100, 0, 0, - 0, 0, 100, 100, - 0, 100, 100, 0 -END - -IDD_MODIFIEDSAMPLES AFX_DIALOG_LAYOUT -BEGIN - 0, - 100, 100, 0, 0, - 0, 0, 0, 0, - 0, 0, 100, 100, - 100, 100, 0, 0, - 100, 100, 0, 0, - 0, 100, 100, 0 -END - -IDD_UPDATE AFX_DIALOG_LAYOUT -BEGIN - 0 -END - -IDD_CHANNELSETTINGS AFX_DIALOG_LAYOUT -BEGIN - 0 -END - -IDD_RESAMPLE AFX_DIALOG_LAYOUT -BEGIN - 0 -END - -IDD_OPLEXPORT AFX_DIALOG_LAYOUT -BEGIN - 0 -END - -IDD_OPTIONS_ADVANCED AFX_DIALOG_LAYOUT -BEGIN - 0 -END - -IDD_METRONOME_SETTINGS AFX_DIALOG_LAYOUT -BEGIN - 0 -END - -#endif // German (Germany) resources -///////////////////////////////////////////////////////////////////////////// - - -///////////////////////////////////////////////////////////////////////////// -// English (United States) resources - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US -#pragma code_page(1252) - -///////////////////////////////////////////////////////////////////////////// -// -// Dialog -// - IDD_ABOUTBOX DIALOGEX 0, 0, 340, 266 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "About OpenMPT" @@ -1926,24 +1449,24 @@ LTEXT "Name:",IDC_STATIC,6,26,36,8 EDITTEXT IDC_EDIT2,42,24,84,12,ES_AUTOHSCROLL CONTROL "",IDC_STATIC,"Static",SS_ETCHEDFRAME,6,48,184,1 - LTEXT "&Rows:",IDC_STATIC,12,54,108,8 - COMBOBOX IDC_COMBO1,12,66,48,93,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "&/2",IDC_BUTTON_HALF,66,66,18,12 - PUSHBUTTON "&x2",IDC_BUTTON_DOUBLE,90,66,18,12 - LTEXT "Remove rows from / Add rows at:",IDC_STATIC,12,84,126,8 - CONTROL "&Top of Pattern",IDC_RADIO1,"Button",BS_AUTORADIOBUTTON,12,96,84,12 - CONTROL "&Bottom of Pattern",IDC_RADIO2,"Button",BS_AUTORADIOBUTTON,96,96,84,12 + LTEXT "&Rows:",IDC_STATIC,6,56,36,8 + COMBOBOX IDC_COMBO1,42,54,48,93,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "&/2",IDC_BUTTON_HALF,96,54,18,12 + PUSHBUTTON "&x2",IDC_BUTTON_DOUBLE,120,54,18,12 + LTEXT "Remove rows from / Add rows at:",IDC_STATIC,6,78,126,8 + CONTROL "&Top of Pattern",IDC_RADIO1,"Button",BS_AUTORADIOBUTTON,6,90,84,12 + CONTROL "&Bottom of Pattern",IDC_RADIO2,"Button",BS_AUTORADIOBUTTON,90,90,84,12 CONTROL "Repeat pattern contents when &adding rows",IDC_CHECK2, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,114,168,10 - CONTROL "",IDC_STATIC,"Static",SS_ETCHEDFRAME,6,132,184,1 - CONTROL "Override &song signature:",IDC_CHECK1,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,138,108,12 - PUSHBUTTON "Configure S&wing",IDC_BUTTON1,124,138,66,12 - LTEXT "Rows per b&eat",IDC_STATIC,64,159,126,8 - EDITTEXT IDC_ROWSPERBEAT,24,156,30,12,ES_AUTOHSCROLL | ES_NUMBER - CONTROL "",IDC_SPIN2,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS,48,159,11,14 - LTEXT "Rows per &measure",IDC_STATIC,64,176,126,8 - EDITTEXT IDC_ROWSPERMEASURE,24,175,30,12,ES_AUTOHSCROLL | ES_NUMBER - CONTROL "",IDC_SPIN3,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS,48,173,11,14 + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,108,168,10 + CONTROL "",IDC_STATIC,"Static",SS_ETCHEDFRAME,6,126,184,1 + CONTROL "Override &song signature:",IDC_CHECK1,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,132,114,12 + PUSHBUTTON "Configure S&wing",IDC_BUTTON1,124,132,66,12 + LTEXT "Rows per b&eat",IDC_STATIC,58,153,128,8 + EDITTEXT IDC_ROWSPERBEAT,18,151,30,12,ES_AUTOHSCROLL | ES_NUMBER + CONTROL "",IDC_SPIN2,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS,42,153,11,14 + LTEXT "Rows per &measure",IDC_STATIC,58,170,128,8 + EDITTEXT IDC_ROWSPERMEASURE,18,169,30,12,ES_AUTOHSCROLL | ES_NUMBER + CONTROL "",IDC_SPIN3,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS,42,167,11,14 DEFPUSHBUTTON "&OK",IDOK,140,6,50,14 PUSHBUTTON "&Cancel",IDCANCEL,140,24,50,14 END @@ -2405,273 +1928,263 @@ #ifdef APSTUDIO_INVOKED GUIDELINES DESIGNINFO BEGIN - IDD_ABOUTBOX, DIALOG + IDD_MISSINGSAMPLES, DIALOG BEGIN - RIGHTMARGIN, 334 - BOTTOMMARGIN, 261 + LEFTMARGIN, 7 + RIGHTMARGIN, 312 + TOPMARGIN, 7 + BOTTOMMARGIN, 178 END - IDD_OPTIONS_PLAYER, DIALOG + IDD_CLEANUP_SONG, DIALOG BEGIN - LEFTMARGIN, 6 - RIGHTMARGIN, 318 - VERTGUIDE, 50 - VERTGUIDE, 169 + LEFTMARGIN, 7 + RIGHTMARGIN, 387 + TOPMARGIN, 7 + BOTTOMMARGIN, 147 END - IDD_WAVECONVERT, DIALOG + IDD_KEYBOARD_SPLIT, DIALOG BEGIN - RIGHTMARGIN, 338 - BOTTOMMARGIN, 281 + LEFTMARGIN, 7 + RIGHTMARGIN, 177 + TOPMARGIN, 7 + BOTTOMMARGIN, 130 END - IDD_PROGRESS, DIALOG + IDD_SAMPLE_GENERATOR, DIALOG BEGIN - RIGHTMARGIN, 186 + LEFTMARGIN, 7 + RIGHTMARGIN, 297 + TOPMARGIN, 7 + BOTTOMMARGIN, 184 END - IDD_OPTIONS_KEYBOARD, DIALOG + IDD_SAMPLE_GENERATOR_PRESETS, DIALOG BEGIN - LEFTMARGIN, 5 - RIGHTMARGIN, 320 - TOPMARGIN, 5 + LEFTMARGIN, 7 + RIGHTMARGIN, 309 + TOPMARGIN, 7 + BOTTOMMARGIN, 94 END - IDD_OPTIONS_COLORS, DIALOG + IDD_MIXSAMPLES, DIALOG BEGIN - LEFTMARGIN, 6 - RIGHTMARGIN, 318 - TOPMARGIN, 6 + LEFTMARGIN, 7 + RIGHTMARGIN, 189 + TOPMARGIN, 7 + BOTTOMMARGIN, 82 END - IDD_OPTIONS_MIDI, DIALOG + IDD_OPTIONS_SAMPLEEDITOR, DIALOG BEGIN - LEFTMARGIN, 6 + LEFTMARGIN, 7 RIGHTMARGIN, 318 - TOPMARGIN, 6 - END - - IDD_LOADRAWSAMPLE, DIALOG - BEGIN - RIGHTMARGIN, 227 - BOTTOMMARGIN, 127 - END - - IDD_CONTROL_GLOBALS, DIALOG - BEGIN - RIGHTMARGIN, 374 - BOTTOMMARGIN, 118 + TOPMARGIN, 7 END - IDD_CONTROL_COMMENTS, DIALOG + IDD_EDITHISTORY, DIALOG BEGIN - RIGHTMARGIN, 348 + LEFTMARGIN, 7 + RIGHTMARGIN, 309 + TOPMARGIN, 7 + BOTTOMMARGIN, 178 END - IDD_CONTROL_PATTERNS, DIALOG + IDD_SAMPLE_GRID_SIZE, DIALOG BEGIN - RIGHTMARGIN, 554 - VERTGUIDE, 39 - VERTGUIDE, 134 - BOTTOMMARGIN, 76 - HORZGUIDE, 37 - HORZGUIDE, 61 - HORZGUIDE, 73 + LEFTMARGIN, 7 + RIGHTMARGIN, 147 + TOPMARGIN, 7 + BOTTOMMARGIN, 64 END - IDD_CONTROL_SAMPLES, DIALOG + IDD_SAMPLE_XFADE, DIALOG BEGIN - LEFTMARGIN, 2 - RIGHTMARGIN, 552 - BOTTOMMARGIN, 104 + LEFTMARGIN, 7 + RIGHTMARGIN, 285 + TOPMARGIN, 7 + BOTTOMMARGIN, 94 END - IDD_CONTROL_INSTRUMENTS, DIALOG + IDD_OPTIONS_UPDATE, DIALOG BEGIN - RIGHTMARGIN, 506 - BOTTOMMARGIN, 165 + LEFTMARGIN, 7 + RIGHTMARGIN, 318 + TOPMARGIN, 7 + BOTTOMMARGIN, 307 END - IDD_MODDOC_MODTYPE, DIALOG + IDD_CLOSEDOCUMENTS, DIALOG BEGIN - RIGHTMARGIN, 248 - BOTTOMMARGIN, 280 + LEFTMARGIN, 7 + RIGHTMARGIN, 363 + TOPMARGIN, 7 + BOTTOMMARGIN, 190 END - IDD_REMOVECHANNELS, DIALOG + IDD_AUTOTUNE, DIALOG BEGIN - RIGHTMARGIN, 163 - BOTTOMMARGIN, 219 + LEFTMARGIN, 7 + RIGHTMARGIN, 159 + TOPMARGIN, 7 + BOTTOMMARGIN, 75 END - IDD_VIEW_GLOBALS, DIALOG + IDD_CHANNELSETTINGS, DIALOG BEGIN - BOTTOMMARGIN, 324 + LEFTMARGIN, 7 + RIGHTMARGIN, 237 + TOPMARGIN, 7 + BOTTOMMARGIN, 88 END - IDD_EDIT_FIND, DIALOG + IDD_CLIPBOARD, DIALOG BEGIN + LEFTMARGIN, 7 RIGHTMARGIN, 176 - BOTTOMMARGIN, 146 - END - - IDD_EDIT_REPLACE, DIALOG - BEGIN - RIGHTMARGIN, 182 - BOTTOMMARGIN, 148 - END - - IDD_PATTERN_PROPERTIES, DIALOG - BEGIN - LEFTMARGIN, 6 - RIGHTMARGIN, 190 - TOPMARGIN, 6 - BOTTOMMARGIN, 187 - END - - IDD_PATTERN_EDITCOMMAND, DIALOG - BEGIN - RIGHTMARGIN, 244 - BOTTOMMARGIN, 47 - END - - IDD_SAMPLE_AMPLIFY, DIALOG - BEGIN - RIGHTMARGIN, 184 - BOTTOMMARGIN, 89 + TOPMARGIN, 7 + BOTTOMMARGIN, 194 END - IDD_INFO_BOX, DIALOG + IDD_INPUT, DIALOG BEGIN LEFTMARGIN, 7 - RIGHTMARGIN, 266 + RIGHTMARGIN, 159 TOPMARGIN, 7 - BOTTOMMARGIN, 166 + BOTTOMMARGIN, 59 END - IDD_OPTIONS_GENERAL, DIALOG + IDD_OPTIONS_ADVANCED, DIALOG BEGIN - LEFTMARGIN, 4 + LEFTMARGIN, 7 RIGHTMARGIN, 318 - TOPMARGIN, 6 - BOTTOMMARGIN, 313 + TOPMARGIN, 7 + BOTTOMMARGIN, 274 END - IDD_OPTIONS_SOUNDCARD, DIALOG + IDD_SCANPLUGINS, DIALOG BEGIN - LEFTMARGIN, 6 - RIGHTMARGIN, 318 - TOPMARGIN, 6 - BOTTOMMARGIN, 306 + LEFTMARGIN, 7 + RIGHTMARGIN, 309 + TOPMARGIN, 7 + BOTTOMMARGIN, 27 END - IDD_MIDIMACRO, DIALOG + IDD_RESAMPLE, DIALOG BEGIN - LEFTMARGIN, 4 - RIGHTMARGIN, 365 - TOPMARGIN, 4 - BOTTOMMARGIN, 330 + LEFTMARGIN, 7 + RIGHTMARGIN, 190 + TOPMARGIN, 7 + BOTTOMMARGIN, 115 END - IDD_CHORDEDIT, DIALOG + IDD_WECLOME, DIALOG BEGIN - LEFTMARGIN, 4 - RIGHTMARGIN, 317 - TOPMARGIN, 4 - BOTTOMMARGIN, 120 + LEFTMARGIN, 7 + RIGHTMARGIN, 250 + TOPMARGIN, 7 + BOTTOMMARGIN, 259 END - IDD_SPLASHSCREEN, DIALOG + IDD_UPDATE, DIALOG BEGIN + LEFTMARGIN, 7 + RIGHTMARGIN, 189 + TOPMARGIN, 7 + BOTTOMMARGIN, 131 END - IDD_MOD2MIDI, DIALOG + IDD_TEMPO_SWING, DIALOG BEGIN - LEFTMARGIN, 4 - RIGHTMARGIN, 263 - TOPMARGIN, 4 - BOTTOMMARGIN, 190 + LEFTMARGIN, 7 + RIGHTMARGIN, 239 + TOPMARGIN, 7 + BOTTOMMARGIN, 136 END - IDD_SAVEPRESET, DIALOG + IDD_LEGACY_PLAYBACK, DIALOG BEGIN LEFTMARGIN, 7 - RIGHTMARGIN, 147 - BOTTOMMARGIN, 52 + RIGHTMARGIN, 382 + TOPMARGIN, 7 + BOTTOMMARGIN, 237 END - IDD_EDITSAMPLEMAP, DIALOG + IDD_FIND_RANGE, DIALOG BEGIN - LEFTMARGIN, 4 - RIGHTMARGIN, 283 - TOPMARGIN, 4 + LEFTMARGIN, 7 + RIGHTMARGIN, 249 + TOPMARGIN, 7 + BOTTOMMARGIN, 46 END - IDD_SELECTMIXPLUGIN, DIALOG + IDD_MIDI_IO_PLUGIN, DIALOG BEGIN LEFTMARGIN, 7 - RIGHTMARGIN, 246 + RIGHTMARGIN, 245 TOPMARGIN, 7 - BOTTOMMARGIN, 278 + BOTTOMMARGIN, 208 END - IDD_PLUGINEDITOR, DIALOG + IDD_OPTIONS_WINE, DIALOG BEGIN - LEFTMARGIN, 4 - RIGHTMARGIN, 481 - TOPMARGIN, 4 - BOTTOMMARGIN, 149 + LEFTMARGIN, 7 + RIGHTMARGIN, 319 + TOPMARGIN, 7 + BOTTOMMARGIN, 304 END - IDD_EFFECTVISUALIZER, DIALOG + IDD_LFOPLUGIN, DIALOG BEGIN - LEFTMARGIN, 4 - RIGHTMARGIN, 418 - TOPMARGIN, 3 - BOTTOMMARGIN, 104 + LEFTMARGIN, 7 + RIGHTMARGIN, 296 + TOPMARGIN, 7 + BOTTOMMARGIN, 194 END - IDD_PITCHSHIFT, DIALOG + IDD_OPL_PARAMS, DIALOG BEGIN + LEFTMARGIN, 7 + RIGHTMARGIN, 403 + TOPMARGIN, 7 + BOTTOMMARGIN, 211 END - IDD_OPTIONS_AUTOSAVE, DIALOG + IDD_MISSINGPLUGS, DIALOG BEGIN - LEFTMARGIN, 6 - RIGHTMARGIN, 319 - TOPMARGIN, 6 - BOTTOMMARGIN, 306 + LEFTMARGIN, 7 + RIGHTMARGIN, 300 + TOPMARGIN, 7 + BOTTOMMARGIN, 163 END - IDD_EDIT_GOTO, DIALOG + IDD_MODIFIEDSAMPLES, DIALOG BEGIN - LEFTMARGIN, 6 - RIGHTMARGIN, 116 - TOPMARGIN, 4 - BOTTOMMARGIN, 117 + LEFTMARGIN, 7 + RIGHTMARGIN, 312 + TOPMARGIN, 7 + BOTTOMMARGIN, 178 END - IDD_ADDSILENCE, DIALOG + IDD_OPLEXPORT, DIALOG BEGIN LEFTMARGIN, 7 - RIGHTMARGIN, 188 + RIGHTMARGIN, 302 TOPMARGIN, 7 - BOTTOMMARGIN, 86 + BOTTOMMARGIN, 151 END - IDD_OPTIONS_MIXER, DIALOG + IDD_METRONOME_SETTINGS, DIALOG BEGIN LEFTMARGIN, 7 - RIGHTMARGIN, 318 + RIGHTMARGIN, 272 TOPMARGIN, 7 + BOTTOMMARGIN, 200 END - IDD_QUICKSTART, DIALOG + IDD_PATTERN_PROPERTIES, DIALOG BEGIN - LEFTMARGIN, 10 - RIGHTMARGIN, 321 - TOPMARGIN, 9 - BOTTOMMARGIN, 202 END END #endif // APSTUDIO_INVOKED @@ -2686,12 +2199,193 @@ // remains consistent on all systems. IDR_MAINFRAME ICON "res\\mptrack.ico" +IDR_MODULETYPE ICON "res\\moddoc.ico" + + +///////////////////////////////////////////////////////////////////////////// +// +// PNG +// + +IDB_ENVTOOLBAR PNG "res\\envelope_toolbar.png" + +IDB_IMAGELIST PNG "res\\icons.png" + +IDB_MAINBAR PNG "res\\main_toolbar.png" + +IDB_PATTERNS PNG "res\\pattern_toolbar.png" + +IDB_SMPTOOLBAR PNG "res\\sample_toolbar.png" + +IDB_SPLASHNOFOLDFIN PNG "res\\Splash.png" + +IDB_MPTRACK PNG "res\\About.png" + +IDB_NEW_BIG PNG "res\\New32.png" + +IDB_OPEN_BIG PNG "res\\Open32.png" + ///////////////////////////////////////////////////////////////////////////// // // AFX_DIALOG_LAYOUT // +IDD_MIDI_IO_PLUGIN AFX_DIALOG_LAYOUT +BEGIN + 0, + 0, 0, 100, 0, + 0, 0, 100, 0, + 0, 0, 100, 0, + 0, 0, 100, 0, + 0, 0, 0, 0, + 0, 0, 0, 0, + 0, 0, 0, 0, + 0, 0, 0, 0, + 0, 0, 0, 0, + 0, 0, 100, 100, + 0, 0, 100, 100, + 0, 100, 0, 0, + 100, 100, 0, 0, + 100, 100, 0, 0, + 0, 100, 100, 0, + 0, 100, 0, 0, + 0, 100, 100, 0 +END + +IDD_LFOPLUGIN AFX_DIALOG_LAYOUT +BEGIN + 0 +END + +IDD_OPTIONS_SAMPLEEDITOR AFX_DIALOG_LAYOUT +BEGIN + 0 +END + +IDD_OPTIONS_WINE AFX_DIALOG_LAYOUT +BEGIN + 0 +END + +IDD_CLIPBOARD AFX_DIALOG_LAYOUT +BEGIN + 0, + 0, 0, 100, 100, + 0, 100, 0, 0, + 0, 100, 0, 0, + 0, 100, 0, 0, + 0, 100, 0, 0 +END + +IDD_OPL_PARAMS AFX_DIALOG_LAYOUT +BEGIN + 0 +END + +IDD_CLOSEDOCUMENTS AFX_DIALOG_LAYOUT +BEGIN + 0, + 100, 100, 0, 0, + 100, 100, 0, 0, + 0, 0, 100, 100, + 0, 100, 0, 0, + 100, 100, 0, 0, + 100, 100, 0, 0 +END + +IDD_MISSINGPLUGS AFX_DIALOG_LAYOUT +BEGIN + 0, + 100, 100, 0, 0, + 0, 0, 0, 0, + 0, 0, 100, 100, + 100, 100, 0, 0 +END + +IDD_MISSINGSAMPLES AFX_DIALOG_LAYOUT +BEGIN + 0, + 100, 100, 0, 0, + 0, 0, 0, 0, + 0, 0, 100, 100, + 0, 100, 0, 0, + 0, 100, 100, 0 +END + +IDD_OPTIONS_UPDATE AFX_DIALOG_LAYOUT +BEGIN + 0 +END + +IDD_WECLOME AFX_DIALOG_LAYOUT +BEGIN + 0 +END + +IDD_LEGACY_PLAYBACK AFX_DIALOG_LAYOUT +BEGIN + 0, + 100, 100, 0, 0, + 100, 100, 0, 0, + 0, 0, 0, 0, + 0, 0, 0, 0, + 0, 0, 100, 0, + 0, 0, 100, 100, + 0, 100, 0, 0, + 0, 100, 0, 0 +END + +IDD_EDITHISTORY AFX_DIALOG_LAYOUT +BEGIN + 0, + 100, 100, 0, 0, + 0, 100, 0, 0, + 0, 0, 100, 100, + 0, 100, 100, 0 +END + +IDD_MODIFIEDSAMPLES AFX_DIALOG_LAYOUT +BEGIN + 0, + 100, 100, 0, 0, + 0, 0, 0, 0, + 0, 0, 100, 100, + 100, 100, 0, 0, + 100, 100, 0, 0, + 0, 100, 100, 0 +END + +IDD_UPDATE AFX_DIALOG_LAYOUT +BEGIN + 0 +END + +IDD_CHANNELSETTINGS AFX_DIALOG_LAYOUT +BEGIN + 0 +END + +IDD_RESAMPLE AFX_DIALOG_LAYOUT +BEGIN + 0 +END + +IDD_OPLEXPORT AFX_DIALOG_LAYOUT +BEGIN + 0 +END + +IDD_OPTIONS_ADVANCED AFX_DIALOG_LAYOUT +BEGIN + 0 +END + +IDD_METRONOME_SETTINGS AFX_DIALOG_LAYOUT +BEGIN + 0 +END + IDD_MIDIMACRO AFX_DIALOG_LAYOUT BEGIN 0 |
|
From: <sv...@op...> - 2025-05-16 19:49:07
|
Author: sagamusix Date: Fri May 16 21:48:54 2025 New Revision: 23165 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=23165 Log: Merged revision(s) 23164 from trunk/OpenMPT: [Imp] Comments tab: Allow to click anywhere in the sample / instrument list to select or open the corresponding editor (https://bugs.openmpt.org/view.php?id=1883). ........ Modified: branches/OpenMPT-1.32/ (props changed) branches/OpenMPT-1.32/mptrack/view_com.cpp Modified: branches/OpenMPT-1.32/mptrack/view_com.cpp ============================================================================== --- branches/OpenMPT-1.32/mptrack/view_com.cpp Fri May 16 21:47:31 2025 (r23164) +++ branches/OpenMPT-1.32/mptrack/view_com.cpp Fri May 16 21:48:54 2025 (r23165) @@ -134,6 +134,7 @@ m_ToolBar.Init(CMainFrame::GetMainFrame()->m_MiscIcons, CMainFrame::GetMainFrame()->m_MiscIconsDisabled); m_ItemList.Create(WS_CHILD | WS_VISIBLE | WS_TABSTOP | LVS_REPORT | LVS_SINGLESEL | LVS_EDITLABELS | LVS_NOSORTHEADER, rect, this, IDC_LIST_DETAILS); m_ItemList.ModifyStyleEx(0, WS_EX_STATICEDGE); + m_ItemList.SetExtendedStyle(m_ItemList.GetExtendedStyle() | LVS_EX_FULLROWSELECT); // Add ToolBar Buttons m_ToolBar.AddButton(IDC_LIST_SAMPLES, IMAGE_SAMPLES); |
|
From: <sv...@op...> - 2025-05-16 19:47:48
|
Author: sagamusix Date: Fri May 16 21:47:31 2025 New Revision: 23164 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=23164 Log: [Imp] Comments tab: Allow to click anywhere in the sample / instrument list to select or open the corresponding editor (https://bugs.openmpt.org/view.php?id=1883). Modified: trunk/OpenMPT/mptrack/view_com.cpp Modified: trunk/OpenMPT/mptrack/view_com.cpp ============================================================================== --- trunk/OpenMPT/mptrack/view_com.cpp Thu May 8 11:52:08 2025 (r23163) +++ trunk/OpenMPT/mptrack/view_com.cpp Fri May 16 21:47:31 2025 (r23164) @@ -134,6 +134,7 @@ m_ToolBar.Init(CMainFrame::GetMainFrame()->m_MiscIcons, CMainFrame::GetMainFrame()->m_MiscIconsDisabled); m_ItemList.Create(WS_CHILD | WS_VISIBLE | WS_TABSTOP | LVS_REPORT | LVS_SINGLESEL | LVS_EDITLABELS | LVS_NOSORTHEADER, rect, this, IDC_LIST_DETAILS); m_ItemList.ModifyStyleEx(0, WS_EX_STATICEDGE); + m_ItemList.SetExtendedStyle(m_ItemList.GetExtendedStyle() | LVS_EX_FULLROWSELECT); // Add ToolBar Buttons m_ToolBar.AddButton(IDC_LIST_SAMPLES, IMAGE_SAMPLES); |
3 messages has been excluded from this view by a project administrator.
