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
(202) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <sv...@op...> - 2024-11-02 14:50:33
|
Author: manx Date: Sat Nov 2 15:50:19 2024 New Revision: 22082 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22082 Log: Merged revision(s) 22080 from branches/OpenMPT-1.30: [Fix] build: CI: GitHub: macOS: Work-around Homebrew breakage on macOS 13. See r22078. ........ Modified: branches/OpenMPT-1.28/ (props changed) branches/OpenMPT-1.28/.github/workflows/macOS-13-Makefile.yml Modified: branches/OpenMPT-1.28/.github/workflows/macOS-13-Makefile.yml ============================================================================== --- branches/OpenMPT-1.28/.github/workflows/macOS-13-Makefile.yml Sat Nov 2 15:41:37 2024 (r22081) +++ branches/OpenMPT-1.28/.github/workflows/macOS-13-Makefile.yml Sat Nov 2 15:50:19 2024 (r22082) @@ -17,6 +17,8 @@ - uses: actions/checkout@v4 - name: update Homebrew run: brew update + - name: fixup GitHub Homebrew unxip breakage + run: brew pin unxip - name: fixup GitHub Homebrew python breakage run: brew unlink python@3.11 && brew unlink python@3.12 && brew link --overwrite python@3.11 && brew link --overwrite python@3.12 - name: upgrade packages |
|
From: <sv...@op...> - 2024-11-02 14:41:45
|
Author: manx Date: Sat Nov 2 15:41:37 2024 New Revision: 22081 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22081 Log: Merged revision(s) 22080 from branches/OpenMPT-1.30: [Fix] build: CI: GitHub: macOS: Work-around Homebrew breakage on macOS 13. See r22078. ........ Modified: branches/OpenMPT-1.29/ (props changed) branches/OpenMPT-1.29/.github/workflows/macOS-13-Makefile.yml Modified: branches/OpenMPT-1.29/.github/workflows/macOS-13-Makefile.yml ============================================================================== --- branches/OpenMPT-1.29/.github/workflows/macOS-13-Makefile.yml Sat Nov 2 15:41:14 2024 (r22080) +++ branches/OpenMPT-1.29/.github/workflows/macOS-13-Makefile.yml Sat Nov 2 15:41:37 2024 (r22081) @@ -17,6 +17,8 @@ - uses: actions/checkout@v4 - name: update Homebrew run: brew update + - name: fixup GitHub Homebrew unxip breakage + run: brew pin unxip - name: fixup GitHub Homebrew python breakage run: brew unlink python@3.11 && brew unlink python@3.12 && brew link --overwrite python@3.11 && brew link --overwrite python@3.12 - name: upgrade packages |
|
From: <sv...@op...> - 2024-11-02 14:41:26
|
Author: manx Date: Sat Nov 2 15:41:14 2024 New Revision: 22080 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22080 Log: [Fix] build: CI: GitHub: macOS: Work-around Homebrew breakage on macOS 13. See r22078. Modified: branches/OpenMPT-1.30/.github/workflows/macOS-13-Makefile.yml Modified: branches/OpenMPT-1.30/.github/workflows/macOS-13-Makefile.yml ============================================================================== --- branches/OpenMPT-1.30/.github/workflows/macOS-13-Makefile.yml Sat Nov 2 15:40:30 2024 (r22079) +++ branches/OpenMPT-1.30/.github/workflows/macOS-13-Makefile.yml Sat Nov 2 15:41:14 2024 (r22080) @@ -17,6 +17,8 @@ - uses: actions/checkout@v4 - name: update Homebrew run: brew update + - name: fixup GitHub Homebrew unxip breakage + run: brew pin unxip - name: fixup GitHub Homebrew python breakage run: brew unlink python@3.11 && brew unlink python@3.12 && brew link --overwrite python@3.11 && brew link --overwrite python@3.12 - name: upgrade packages |
|
From: <sv...@op...> - 2024-11-02 14:40:45
|
Author: manx Date: Sat Nov 2 15:40:30 2024 New Revision: 22079 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22079 Log: Merged revision(s) 22078 from trunk/OpenMPT: [Fix] build: CI: GitHub: macOS: Work-around Homebrew breakage on macOS 13. ........ Modified: branches/OpenMPT-1.31/ (props changed) branches/OpenMPT-1.31/.github/workflows/macOS-Autotools.yml branches/OpenMPT-1.31/.github/workflows/macOS-Makefile.yml Modified: branches/OpenMPT-1.31/.github/workflows/macOS-Autotools.yml ============================================================================== --- branches/OpenMPT-1.31/.github/workflows/macOS-Autotools.yml Sat Nov 2 15:40:04 2024 (r22078) +++ branches/OpenMPT-1.31/.github/workflows/macOS-Autotools.yml Sat Nov 2 15:40:30 2024 (r22079) @@ -25,6 +25,9 @@ - uses: actions/checkout@v4 - name: update Homebrew run: brew update + - name: fixup GitHub Homebrew unxip breakage + if: ${{ matrix.host == 'macos-13' }} + run: brew pin unxip - name: fixup GitHub Homebrew python breakage if: ${{ matrix.host == 'macos-13' }} run: brew unlink python@3.11 && brew unlink python@3.12 && brew link --overwrite python@3.11 && brew link --overwrite python@3.12 Modified: branches/OpenMPT-1.31/.github/workflows/macOS-Makefile.yml ============================================================================== --- branches/OpenMPT-1.31/.github/workflows/macOS-Makefile.yml Sat Nov 2 15:40:04 2024 (r22078) +++ branches/OpenMPT-1.31/.github/workflows/macOS-Makefile.yml Sat Nov 2 15:40:30 2024 (r22079) @@ -79,6 +79,9 @@ - uses: actions/checkout@v4 - name: update Homebrew run: brew update + - name: fixup GitHub Homebrew unxip breakage + if: ${{ matrix.host == 'macos-13' }} + run: brew pin unxip - name: fixup GitHub Homebrew python breakage if: ${{ matrix.host == 'macos-13' }} run: brew unlink python@3.11 && brew unlink python@3.12 && brew link --overwrite python@3.11 && brew link --overwrite python@3.12 |
|
From: <sv...@op...> - 2024-11-02 14:40:16
|
Author: manx Date: Sat Nov 2 15:40:04 2024 New Revision: 22078 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22078 Log: [Fix] build: CI: GitHub: macOS: Work-around Homebrew breakage on macOS 13. Modified: trunk/OpenMPT/.github/workflows/macOS-Autotools.yml trunk/OpenMPT/.github/workflows/macOS-Makefile.yml Modified: trunk/OpenMPT/.github/workflows/macOS-Autotools.yml ============================================================================== --- trunk/OpenMPT/.github/workflows/macOS-Autotools.yml Sat Nov 2 15:38:06 2024 (r22077) +++ trunk/OpenMPT/.github/workflows/macOS-Autotools.yml Sat Nov 2 15:40:04 2024 (r22078) @@ -27,6 +27,9 @@ - uses: actions/checkout@v4 - name: update Homebrew run: brew update + - name: fixup GitHub Homebrew unxip breakage + if: ${{ matrix.host == 'macos-13' }} + run: brew pin unxip - name: fixup GitHub Homebrew python breakage if: ${{ matrix.host == 'macos-13' }} run: brew unlink python@3.11 && brew unlink python@3.12 && brew link --overwrite python@3.11 && brew link --overwrite python@3.12 Modified: trunk/OpenMPT/.github/workflows/macOS-Makefile.yml ============================================================================== --- trunk/OpenMPT/.github/workflows/macOS-Makefile.yml Sat Nov 2 15:38:06 2024 (r22077) +++ trunk/OpenMPT/.github/workflows/macOS-Makefile.yml Sat Nov 2 15:40:04 2024 (r22078) @@ -81,6 +81,9 @@ - uses: actions/checkout@v4 - name: update Homebrew run: brew update + - name: fixup GitHub Homebrew unxip breakage + if: ${{ matrix.host == 'macos-13' }} + run: brew pin unxip - name: fixup GitHub Homebrew python breakage if: ${{ matrix.host == 'macos-13' }} run: brew unlink python@3.11 && brew unlink python@3.12 && brew link --overwrite python@3.11 && brew link --overwrite python@3.12 |
|
From: <sv...@op...> - 2024-11-02 14:38:18
|
Author: manx Date: Sat Nov 2 15:38:06 2024 New Revision: 22077 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22077 Log: Merged revision(s) 22076 from trunk/OpenMPT: [Fix] build: CI: GitHub: macOS: Upgrading packages was accidentally removed in r21845. ........ Modified: branches/OpenMPT-1.31/ (props changed) branches/OpenMPT-1.31/.github/workflows/macOS-Autotools.yml branches/OpenMPT-1.31/.github/workflows/macOS-Makefile.yml Modified: branches/OpenMPT-1.31/.github/workflows/macOS-Autotools.yml ============================================================================== --- branches/OpenMPT-1.31/.github/workflows/macOS-Autotools.yml Sat Nov 2 15:37:39 2024 (r22076) +++ branches/OpenMPT-1.31/.github/workflows/macOS-Autotools.yml Sat Nov 2 15:38:06 2024 (r22077) @@ -28,6 +28,8 @@ - name: fixup GitHub Homebrew python breakage if: ${{ matrix.host == 'macos-13' }} run: brew unlink python@3.11 && brew unlink python@3.12 && brew link --overwrite python@3.11 && brew link --overwrite python@3.12 + - name: upgrade packages + run: brew upgrade - name: install dependencies run: brew install p7zip help2man doxygen autoconf autoconf-archive automake libtool mpg123 libogg libvorbis portaudio flac libsndfile sdl2 - name: selecting Xcode version Modified: branches/OpenMPT-1.31/.github/workflows/macOS-Makefile.yml ============================================================================== --- branches/OpenMPT-1.31/.github/workflows/macOS-Makefile.yml Sat Nov 2 15:37:39 2024 (r22076) +++ branches/OpenMPT-1.31/.github/workflows/macOS-Makefile.yml Sat Nov 2 15:38:06 2024 (r22077) @@ -82,6 +82,8 @@ - name: fixup GitHub Homebrew python breakage if: ${{ matrix.host == 'macos-13' }} run: brew unlink python@3.11 && brew unlink python@3.12 && brew link --overwrite python@3.11 && brew link --overwrite python@3.12 + - name: upgrade packages + run: brew upgrade - name: install dependencies run: brew install p7zip help2man doxygen autoconf autoconf-archive automake libtool mpg123 libogg libvorbis portaudio flac libsndfile sdl2 - name: selecting Xcode version |
|
From: <sv...@op...> - 2024-11-02 14:37:51
|
Author: manx Date: Sat Nov 2 15:37:39 2024 New Revision: 22076 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22076 Log: [Fix] build: CI: GitHub: macOS: Upgrading packages was accidentally removed in r21845. Modified: trunk/OpenMPT/.github/workflows/macOS-Autotools.yml trunk/OpenMPT/.github/workflows/macOS-Makefile.yml Modified: trunk/OpenMPT/.github/workflows/macOS-Autotools.yml ============================================================================== --- trunk/OpenMPT/.github/workflows/macOS-Autotools.yml Sat Nov 2 14:43:14 2024 (r22075) +++ trunk/OpenMPT/.github/workflows/macOS-Autotools.yml Sat Nov 2 15:37:39 2024 (r22076) @@ -30,6 +30,8 @@ - name: fixup GitHub Homebrew python breakage if: ${{ matrix.host == 'macos-13' }} run: brew unlink python@3.11 && brew unlink python@3.12 && brew link --overwrite python@3.11 && brew link --overwrite python@3.12 + - name: upgrade packages + run: brew upgrade - name: install dependencies run: brew install p7zip help2man doxygen autoconf autoconf-archive automake libtool mpg123 libogg libvorbis portaudio flac libsndfile sdl2 - name: selecting Xcode version Modified: trunk/OpenMPT/.github/workflows/macOS-Makefile.yml ============================================================================== --- trunk/OpenMPT/.github/workflows/macOS-Makefile.yml Sat Nov 2 14:43:14 2024 (r22075) +++ trunk/OpenMPT/.github/workflows/macOS-Makefile.yml Sat Nov 2 15:37:39 2024 (r22076) @@ -84,6 +84,8 @@ - name: fixup GitHub Homebrew python breakage if: ${{ matrix.host == 'macos-13' }} run: brew unlink python@3.11 && brew unlink python@3.12 && brew link --overwrite python@3.11 && brew link --overwrite python@3.12 + - name: upgrade packages + run: brew upgrade - name: install dependencies run: brew install p7zip help2man doxygen autoconf autoconf-archive automake libtool mpg123 libogg libvorbis portaudio flac libsndfile sdl2 - name: selecting Xcode version |
|
From: <sv...@op...> - 2024-11-02 13:43:27
|
Author: manx Date: Sat Nov 2 14:43:14 2024 New Revision: 22075 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22075 Log: [Ref] MP3 Samples: libmpg123: We only need typedef for mpg123_ssize_t when not using the new portable API. Modified: trunk/OpenMPT/soundlib/SampleFormatMP3.cpp Modified: trunk/OpenMPT/soundlib/SampleFormatMP3.cpp ============================================================================== --- trunk/OpenMPT/soundlib/SampleFormatMP3.cpp Sat Nov 2 12:41:35 2024 (r22074) +++ trunk/OpenMPT/soundlib/SampleFormatMP3.cpp Sat Nov 2 14:43:14 2024 (r22075) @@ -73,8 +73,6 @@ using mpg123_size_t = size_t; -#endif - // Check for exactly _MSC_VER as libmpg123 does, in order to also catch clang-cl. #ifdef _MSC_VER // ssize_t definition in libmpg123.h.in should never have existed at all. @@ -84,6 +82,8 @@ using mpg123_ssize_t = ssize_t; #endif +#endif + class ComponentMPG123 : public ComponentBuiltin { |
|
From: <sv...@op...> - 2024-11-02 11:41:46
|
Author: manx Date: Sat Nov 2 12:41:35 2024 New Revision: 22074 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22074 Log: [Doc] libopenmpt: Update changelog. Modified: branches/OpenMPT-1.28/libopenmpt/dox/changelog.md Modified: branches/OpenMPT-1.28/libopenmpt/dox/changelog.md ============================================================================== --- branches/OpenMPT-1.28/libopenmpt/dox/changelog.md Sat Nov 2 12:41:17 2024 (r22073) +++ branches/OpenMPT-1.28/libopenmpt/dox/changelog.md Sat Nov 2 12:41:35 2024 (r22074) @@ -7,7 +7,7 @@ ### libopenmpt 0.4.47-pre - * mpg123: Update to v1.32.9-dev+r5448 (2024-10-28). + * mpg123: Update to v1.32.9 (2024-11-02). ### libopenmpt 0.4.46 (2024-10-26) |
|
From: <sv...@op...> - 2024-11-02 11:41:29
|
Author: manx Date: Sat Nov 2 12:41:17 2024 New Revision: 22073 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22073 Log: Merged revision(s) 22066 from trunk/OpenMPT: [Var] mpg123: Update to 1.32.9 (2024-11-02). ........ Modified: branches/OpenMPT-1.28/ (props changed) branches/OpenMPT-1.28/include/mpg123/OpenMPT.txt branches/OpenMPT-1.28/include/mpg123/src/compat/compat.h branches/OpenMPT-1.28/include/mpg123/src/version.h Modified: branches/OpenMPT-1.28/include/mpg123/OpenMPT.txt ============================================================================== --- branches/OpenMPT-1.28/include/mpg123/OpenMPT.txt Sat Nov 2 12:40:54 2024 (r22072) +++ branches/OpenMPT-1.28/include/mpg123/OpenMPT.txt Sat Nov 2 12:41:17 2024 (r22073) @@ -1,4 +1,4 @@ -libmpg123 library version 1.32.9-dev+r5448 (2024-10-28). +libmpg123 library version 1.32.9 (2024-11-02). The following changes have been made: * `ports/MSVC++/config.h` has been added for MSVC builds. * `ports/Xcode/config.h` has been retained from older versions. Modified: branches/OpenMPT-1.28/include/mpg123/src/compat/compat.h ============================================================================== --- branches/OpenMPT-1.28/include/mpg123/src/compat/compat.h Sat Nov 2 12:40:54 2024 (r22072) +++ branches/OpenMPT-1.28/include/mpg123/src/compat/compat.h Sat Nov 2 12:41:17 2024 (r22073) @@ -110,7 +110,7 @@ typedef unsigned char byte; -#if (defined(_UCRT) || defined(_MSC_VER) || (defined(__MINGW32__) || defined(__MINGW64__))) && !defined(__CYGWIN__) +#if (defined(_UCRT) || defined(_MSC_VER) || (defined(__MINGW32__) || defined(__MINGW64__)) || (defined(__WATCOMC__) && defined(__NT__))) && !defined(__CYGWIN__) #define MPG123_COMPAT_MSVCRT_IO #endif @@ -134,6 +134,13 @@ #ifndef MPG123_COMPAT_MSVCRT_IO_64 #define MPG123_COMPAT_MSVCRT_IO_64 #endif +#endif +#endif +#if defined(__WATCOMC__) && defined(__NT__) +#if (__WATCOMC__ >= 1100) +#ifndef MPG123_COMPAT_MSVCRT_IO_64 +#define MPG123_COMPAT_MSVCRT_IO_64 +#endif #endif #endif #endif Modified: branches/OpenMPT-1.28/include/mpg123/src/version.h ============================================================================== --- branches/OpenMPT-1.28/include/mpg123/src/version.h Sat Nov 2 12:40:54 2024 (r22072) +++ branches/OpenMPT-1.28/include/mpg123/src/version.h Sat Nov 2 12:41:17 2024 (r22073) @@ -19,7 +19,7 @@ #define MPG123_PATCH 9 // Don't get too wild with that to avoid confusing m4. No brackets. // Also, it should fit well into a sane file name for the tarball. -#define MPG123_SUFFIX "-dev" +#define MPG123_SUFFIX "" #define MPG123_VERSION_CAT_REALLY(a, b, c) #a "." #b "." #c #define MPG123_VERSION_CAT(a, b, c) MPG123_VERSION_CAT_REALLY(a, b, c) |
|
From: <sv...@op...> - 2024-11-02 11:41:06
|
Author: manx Date: Sat Nov 2 12:40:54 2024 New Revision: 22072 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22072 Log: [Doc] libopenmpt: Update changelog. Modified: branches/OpenMPT-1.29/libopenmpt/dox/changelog.md Modified: branches/OpenMPT-1.29/libopenmpt/dox/changelog.md ============================================================================== --- branches/OpenMPT-1.29/libopenmpt/dox/changelog.md Sat Nov 2 12:40:38 2024 (r22071) +++ branches/OpenMPT-1.29/libopenmpt/dox/changelog.md Sat Nov 2 12:40:54 2024 (r22072) @@ -7,7 +7,7 @@ ### libopenmpt 0.5.35-pre - * mpg123: Update to v1.32.9-dev+r5448 (2024-10-28). + * mpg123: Update to v1.32.9 (2024-11-02). ### libopenmpt 0.5.34 (2024-10-26) |
|
From: <sv...@op...> - 2024-11-02 11:40:51
|
Author: manx Date: Sat Nov 2 12:40:38 2024 New Revision: 22071 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22071 Log: Merged revision(s) 22066 from trunk/OpenMPT: [Var] mpg123: Update to 1.32.9 (2024-11-02). ........ Modified: branches/OpenMPT-1.29/ (props changed) branches/OpenMPT-1.29/include/mpg123/OpenMPT.txt branches/OpenMPT-1.29/include/mpg123/src/compat/compat.h branches/OpenMPT-1.29/include/mpg123/src/version.h Modified: branches/OpenMPT-1.29/include/mpg123/OpenMPT.txt ============================================================================== --- branches/OpenMPT-1.29/include/mpg123/OpenMPT.txt Sat Nov 2 12:40:15 2024 (r22070) +++ branches/OpenMPT-1.29/include/mpg123/OpenMPT.txt Sat Nov 2 12:40:38 2024 (r22071) @@ -1,4 +1,4 @@ -libmpg123 library version 1.32.9-dev+r5448 (2024-10-28). +libmpg123 library version 1.32.9 (2024-11-02). The following changes have been made: * `ports/makefile/config.h` has been added for plain `Makefile` builds. * `ports/MSVC++/config.h` has been added for MSVC builds. Modified: branches/OpenMPT-1.29/include/mpg123/src/compat/compat.h ============================================================================== --- branches/OpenMPT-1.29/include/mpg123/src/compat/compat.h Sat Nov 2 12:40:15 2024 (r22070) +++ branches/OpenMPT-1.29/include/mpg123/src/compat/compat.h Sat Nov 2 12:40:38 2024 (r22071) @@ -110,7 +110,7 @@ typedef unsigned char byte; -#if (defined(_UCRT) || defined(_MSC_VER) || (defined(__MINGW32__) || defined(__MINGW64__))) && !defined(__CYGWIN__) +#if (defined(_UCRT) || defined(_MSC_VER) || (defined(__MINGW32__) || defined(__MINGW64__)) || (defined(__WATCOMC__) && defined(__NT__))) && !defined(__CYGWIN__) #define MPG123_COMPAT_MSVCRT_IO #endif @@ -134,6 +134,13 @@ #ifndef MPG123_COMPAT_MSVCRT_IO_64 #define MPG123_COMPAT_MSVCRT_IO_64 #endif +#endif +#endif +#if defined(__WATCOMC__) && defined(__NT__) +#if (__WATCOMC__ >= 1100) +#ifndef MPG123_COMPAT_MSVCRT_IO_64 +#define MPG123_COMPAT_MSVCRT_IO_64 +#endif #endif #endif #endif Modified: branches/OpenMPT-1.29/include/mpg123/src/version.h ============================================================================== --- branches/OpenMPT-1.29/include/mpg123/src/version.h Sat Nov 2 12:40:15 2024 (r22070) +++ branches/OpenMPT-1.29/include/mpg123/src/version.h Sat Nov 2 12:40:38 2024 (r22071) @@ -19,7 +19,7 @@ #define MPG123_PATCH 9 // Don't get too wild with that to avoid confusing m4. No brackets. // Also, it should fit well into a sane file name for the tarball. -#define MPG123_SUFFIX "-dev" +#define MPG123_SUFFIX "" #define MPG123_VERSION_CAT_REALLY(a, b, c) #a "." #b "." #c #define MPG123_VERSION_CAT(a, b, c) MPG123_VERSION_CAT_REALLY(a, b, c) |
|
From: <sv...@op...> - 2024-11-02 11:40:26
|
Author: manx Date: Sat Nov 2 12:40:15 2024 New Revision: 22070 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22070 Log: [Doc] libopenmpt: Update changelog. Modified: branches/OpenMPT-1.30/libopenmpt/dox/changelog.md Modified: branches/OpenMPT-1.30/libopenmpt/dox/changelog.md ============================================================================== --- branches/OpenMPT-1.30/libopenmpt/dox/changelog.md Sat Nov 2 12:39:55 2024 (r22069) +++ branches/OpenMPT-1.30/libopenmpt/dox/changelog.md Sat Nov 2 12:40:15 2024 (r22070) @@ -7,7 +7,7 @@ ### libopenmpt 0.6.21-pre - * mpg123: Update to v1.32.9-dev+r5448 (2024-10-28). + * mpg123: Update to v1.32.9 (2024-11-02). ### libopenmpt 0.6.20 (2024-10-26) |
|
From: <sv...@op...> - 2024-11-02 11:40:02
|
Author: manx Date: Sat Nov 2 12:39:55 2024 New Revision: 22069 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22069 Log: Merged revision(s) 22066 from trunk/OpenMPT: [Var] mpg123: Update to 1.32.9 (2024-11-02). ........ Modified: branches/OpenMPT-1.30/ (props changed) branches/OpenMPT-1.30/include/mpg123/OpenMPT.txt branches/OpenMPT-1.30/include/mpg123/src/compat/compat.h branches/OpenMPT-1.30/include/mpg123/src/version.h Modified: branches/OpenMPT-1.30/include/mpg123/OpenMPT.txt ============================================================================== --- branches/OpenMPT-1.30/include/mpg123/OpenMPT.txt Sat Nov 2 12:39:34 2024 (r22068) +++ branches/OpenMPT-1.30/include/mpg123/OpenMPT.txt Sat Nov 2 12:39:55 2024 (r22069) @@ -1,4 +1,4 @@ -libmpg123 library version 1.32.9-dev+r5448 (2024-10-28). +libmpg123 library version 1.32.9 (2024-11-02). The following changes have been made: * `ports/makefile/config.h` has been added for plain `Makefile` builds. * `ports/MSVC++/config.h` has been added for MSVC builds. Modified: branches/OpenMPT-1.30/include/mpg123/src/compat/compat.h ============================================================================== --- branches/OpenMPT-1.30/include/mpg123/src/compat/compat.h Sat Nov 2 12:39:34 2024 (r22068) +++ branches/OpenMPT-1.30/include/mpg123/src/compat/compat.h Sat Nov 2 12:39:55 2024 (r22069) @@ -110,7 +110,7 @@ typedef unsigned char byte; -#if (defined(_UCRT) || defined(_MSC_VER) || (defined(__MINGW32__) || defined(__MINGW64__))) && !defined(__CYGWIN__) +#if (defined(_UCRT) || defined(_MSC_VER) || (defined(__MINGW32__) || defined(__MINGW64__)) || (defined(__WATCOMC__) && defined(__NT__))) && !defined(__CYGWIN__) #define MPG123_COMPAT_MSVCRT_IO #endif @@ -134,6 +134,13 @@ #ifndef MPG123_COMPAT_MSVCRT_IO_64 #define MPG123_COMPAT_MSVCRT_IO_64 #endif +#endif +#endif +#if defined(__WATCOMC__) && defined(__NT__) +#if (__WATCOMC__ >= 1100) +#ifndef MPG123_COMPAT_MSVCRT_IO_64 +#define MPG123_COMPAT_MSVCRT_IO_64 +#endif #endif #endif #endif Modified: branches/OpenMPT-1.30/include/mpg123/src/version.h ============================================================================== --- branches/OpenMPT-1.30/include/mpg123/src/version.h Sat Nov 2 12:39:34 2024 (r22068) +++ branches/OpenMPT-1.30/include/mpg123/src/version.h Sat Nov 2 12:39:55 2024 (r22069) @@ -19,7 +19,7 @@ #define MPG123_PATCH 9 // Don't get too wild with that to avoid confusing m4. No brackets. // Also, it should fit well into a sane file name for the tarball. -#define MPG123_SUFFIX "-dev" +#define MPG123_SUFFIX "" #define MPG123_VERSION_CAT_REALLY(a, b, c) #a "." #b "." #c #define MPG123_VERSION_CAT(a, b, c) MPG123_VERSION_CAT_REALLY(a, b, c) |
|
From: <sv...@op...> - 2024-11-02 11:39:42
|
Author: manx Date: Sat Nov 2 12:39:34 2024 New Revision: 22068 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22068 Log: [Doc] libopenmpt: Update changelog. Modified: branches/OpenMPT-1.31/doc/libopenmpt/changelog.md Modified: branches/OpenMPT-1.31/doc/libopenmpt/changelog.md ============================================================================== --- branches/OpenMPT-1.31/doc/libopenmpt/changelog.md Sat Nov 2 12:39:05 2024 (r22067) +++ branches/OpenMPT-1.31/doc/libopenmpt/changelog.md Sat Nov 2 12:39:34 2024 (r22068) @@ -7,7 +7,7 @@ ### libopenmpt 0.7.12-pre - * mpg123: Update to v1.32.9-dev+r5448 (2024-10-28). + * mpg123: Update to v1.32.9 (2024-11-02). ### libopenmpt 0.7.11 (2024-10-26) |
|
From: <sv...@op...> - 2024-11-02 11:39:17
|
Author: manx Date: Sat Nov 2 12:39:05 2024 New Revision: 22067 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22067 Log: Merged revision(s) 22066 from trunk/OpenMPT: [Var] mpg123: Update to 1.32.9 (2024-11-02). ........ Modified: branches/OpenMPT-1.31/ (props changed) branches/OpenMPT-1.31/include/mpg123/OpenMPT.txt branches/OpenMPT-1.31/include/mpg123/src/compat/compat.h branches/OpenMPT-1.31/include/mpg123/src/version.h Modified: branches/OpenMPT-1.31/include/mpg123/OpenMPT.txt ============================================================================== --- branches/OpenMPT-1.31/include/mpg123/OpenMPT.txt Sat Nov 2 12:38:30 2024 (r22066) +++ branches/OpenMPT-1.31/include/mpg123/OpenMPT.txt Sat Nov 2 12:39:05 2024 (r22067) @@ -1,4 +1,4 @@ -libmpg123 library version 1.32.9-dev+r5448 (2024-10-28). +libmpg123 library version 1.32.9 (2024-11-02). The following changes have been made: * `ports/makefile/config.h` has been added for plain `Makefile` builds. * `ports/MSVC++/config.h` has been added for MSVC builds. Modified: branches/OpenMPT-1.31/include/mpg123/src/compat/compat.h ============================================================================== --- branches/OpenMPT-1.31/include/mpg123/src/compat/compat.h Sat Nov 2 12:38:30 2024 (r22066) +++ branches/OpenMPT-1.31/include/mpg123/src/compat/compat.h Sat Nov 2 12:39:05 2024 (r22067) @@ -110,7 +110,7 @@ typedef unsigned char byte; -#if (defined(_UCRT) || defined(_MSC_VER) || (defined(__MINGW32__) || defined(__MINGW64__))) && !defined(__CYGWIN__) +#if (defined(_UCRT) || defined(_MSC_VER) || (defined(__MINGW32__) || defined(__MINGW64__)) || (defined(__WATCOMC__) && defined(__NT__))) && !defined(__CYGWIN__) #define MPG123_COMPAT_MSVCRT_IO #endif @@ -134,6 +134,13 @@ #ifndef MPG123_COMPAT_MSVCRT_IO_64 #define MPG123_COMPAT_MSVCRT_IO_64 #endif +#endif +#endif +#if defined(__WATCOMC__) && defined(__NT__) +#if (__WATCOMC__ >= 1100) +#ifndef MPG123_COMPAT_MSVCRT_IO_64 +#define MPG123_COMPAT_MSVCRT_IO_64 +#endif #endif #endif #endif Modified: branches/OpenMPT-1.31/include/mpg123/src/version.h ============================================================================== --- branches/OpenMPT-1.31/include/mpg123/src/version.h Sat Nov 2 12:38:30 2024 (r22066) +++ branches/OpenMPT-1.31/include/mpg123/src/version.h Sat Nov 2 12:39:05 2024 (r22067) @@ -19,7 +19,7 @@ #define MPG123_PATCH 9 // Don't get too wild with that to avoid confusing m4. No brackets. // Also, it should fit well into a sane file name for the tarball. -#define MPG123_SUFFIX "-dev" +#define MPG123_SUFFIX "" #define MPG123_VERSION_CAT_REALLY(a, b, c) #a "." #b "." #c #define MPG123_VERSION_CAT(a, b, c) MPG123_VERSION_CAT_REALLY(a, b, c) |
|
From: <sv...@op...> - 2024-11-02 11:38:42
|
Author: manx Date: Sat Nov 2 12:38:30 2024 New Revision: 22066 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22066 Log: [Var] mpg123: Update to 1.32.9 (2024-11-02). Modified: trunk/OpenMPT/include/mpg123/OpenMPT.txt trunk/OpenMPT/include/mpg123/src/compat/compat.h trunk/OpenMPT/include/mpg123/src/version.h Modified: trunk/OpenMPT/include/mpg123/OpenMPT.txt ============================================================================== --- trunk/OpenMPT/include/mpg123/OpenMPT.txt Sat Nov 2 11:11:12 2024 (r22065) +++ trunk/OpenMPT/include/mpg123/OpenMPT.txt Sat Nov 2 12:38:30 2024 (r22066) @@ -1,4 +1,4 @@ -libmpg123 library version 1.32.9-dev+r5448 (2024-10-28). +libmpg123 library version 1.32.9 (2024-11-02). The following changes have been made: * `ports/makefile/config.h` has been added for plain `Makefile` builds. * `ports/MSVC++/config.h` has been added for MSVC builds. Modified: trunk/OpenMPT/include/mpg123/src/compat/compat.h ============================================================================== --- trunk/OpenMPT/include/mpg123/src/compat/compat.h Sat Nov 2 11:11:12 2024 (r22065) +++ trunk/OpenMPT/include/mpg123/src/compat/compat.h Sat Nov 2 12:38:30 2024 (r22066) @@ -110,7 +110,7 @@ typedef unsigned char byte; -#if (defined(_UCRT) || defined(_MSC_VER) || (defined(__MINGW32__) || defined(__MINGW64__))) && !defined(__CYGWIN__) +#if (defined(_UCRT) || defined(_MSC_VER) || (defined(__MINGW32__) || defined(__MINGW64__)) || (defined(__WATCOMC__) && defined(__NT__))) && !defined(__CYGWIN__) #define MPG123_COMPAT_MSVCRT_IO #endif @@ -134,6 +134,13 @@ #ifndef MPG123_COMPAT_MSVCRT_IO_64 #define MPG123_COMPAT_MSVCRT_IO_64 #endif +#endif +#endif +#if defined(__WATCOMC__) && defined(__NT__) +#if (__WATCOMC__ >= 1100) +#ifndef MPG123_COMPAT_MSVCRT_IO_64 +#define MPG123_COMPAT_MSVCRT_IO_64 +#endif #endif #endif #endif Modified: trunk/OpenMPT/include/mpg123/src/version.h ============================================================================== --- trunk/OpenMPT/include/mpg123/src/version.h Sat Nov 2 11:11:12 2024 (r22065) +++ trunk/OpenMPT/include/mpg123/src/version.h Sat Nov 2 12:38:30 2024 (r22066) @@ -19,7 +19,7 @@ #define MPG123_PATCH 9 // Don't get too wild with that to avoid confusing m4. No brackets. // Also, it should fit well into a sane file name for the tarball. -#define MPG123_SUFFIX "-dev" +#define MPG123_SUFFIX "" #define MPG123_VERSION_CAT_REALLY(a, b, c) #a "." #b "." #c #define MPG123_VERSION_CAT(a, b, c) MPG123_VERSION_CAT_REALLY(a, b, c) |
|
From: <sv...@op...> - 2024-11-02 10:11:24
|
Author: manx Date: Sat Nov 2 11:11:12 2024 New Revision: 22065 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22065 Log: [Ref] About Dialog: Use UV_ instead of U_ where UL_ is not possible. Modified: trunk/OpenMPT/mptrack/AboutDialog.cpp Modified: trunk/OpenMPT/mptrack/AboutDialog.cpp ============================================================================== --- trunk/OpenMPT/mptrack/AboutDialog.cpp Sat Nov 2 10:59:26 2024 (r22064) +++ trunk/OpenMPT/mptrack/AboutDialog.cpp Sat Nov 2 11:11:12 2024 (r22065) @@ -397,9 +397,9 @@ text += MPT_UFORMAT("Available CPU features: {}\n")(CPUFeaturesToString(CPUInfo.get_features())); #endif // MPT_ENABLE_ARCH_INTRINSICS text += MPT_UFORMAT("Operating System: {}\n\n")(mpt::OS::Windows::Version::GetCurrentName()); - text += MPT_UFORMAT("OpenMPT Install Path{1}: {0}\n")(theApp.GetInstallPath(), theApp.IsPortableMode() ? U_(" (portable)") : U_("")); - text += MPT_UFORMAT("OpenMPT Executable Path{1}: {0}\n")(theApp.GetInstallBinArchPath(), theApp.IsPortableMode() ? U_(" (portable)") : U_("")); - text += MPT_UFORMAT("Settings{1}: {0}\n")(theApp.GetConfigFileName(), theApp.IsPortableMode() ? U_(" (portable)") : U_("")); + text += MPT_UFORMAT("OpenMPT Install Path{1}: {0}\n")(theApp.GetInstallPath(), theApp.IsPortableMode() ? UV_(" (portable)") : UV_("")); + text += MPT_UFORMAT("OpenMPT Executable Path{1}: {0}\n")(theApp.GetInstallBinArchPath(), theApp.IsPortableMode() ? UV_(" (portable)") : UV_("")); + text += MPT_UFORMAT("Settings{1}: {0}\n")(theApp.GetConfigFileName(), theApp.IsPortableMode() ? UV_(" (portable)") : UV_("")); break; case 1: { @@ -440,22 +440,22 @@ } text += MPT_UFORMAT("{}: {}") ( name - , info.state == ComponentStateAvailable ? U_("ok") : - info.state == ComponentStateUnavailable? U_("missing") : - info.state == ComponentStateUnintialized ? U_("not loaded") : - info.state == ComponentStateBlocked ? U_("blocked") : - info.state == ComponentStateUnregistered ? U_("unregistered") : - U_("unknown") + , info.state == ComponentStateAvailable ? UV_("ok") : + info.state == ComponentStateUnavailable? UV_("missing") : + info.state == ComponentStateUnintialized ? UV_("not loaded") : + info.state == ComponentStateBlocked ? UV_("blocked") : + info.state == ComponentStateUnregistered ? UV_("unregistered") : + UV_("unknown") ); if(info.type != ComponentTypeUnknown) { text += MPT_UFORMAT(" ({})") - ( info.type == ComponentTypeBuiltin ? U_("builtin") : - info.type == ComponentTypeSystem ? U_("system") : - info.type == ComponentTypeSystemInstallable ? U_("system, optional") : - info.type == ComponentTypeBundled ? U_("bundled") : - info.type == ComponentTypeForeign ? U_("foreign") : - U_("unknown") + ( info.type == ComponentTypeBuiltin ? UV_("builtin") : + info.type == ComponentTypeSystem ? UV_("system") : + info.type == ComponentTypeSystemInstallable ? UV_("system, optional") : + info.type == ComponentTypeBundled ? UV_("bundled") : + info.type == ComponentTypeForeign ? UV_("foreign") : + UV_("unknown") ); } text += lf; @@ -492,14 +492,14 @@ ); text += MPT_UFORMAT("Windows version: {}\n") ( - mpt::osinfo::windows::Version::Current().IsAtLeast(mpt::osinfo::windows::Version::Win81) ? U_("Windows 8.1") : - mpt::osinfo::windows::Version::Current().IsAtLeast(mpt::osinfo::windows::Version::Win8) ? U_("Windows 8") : - mpt::osinfo::windows::Version::Current().IsAtLeast(mpt::osinfo::windows::Version::Win7) ? U_("Windows 7") : - mpt::osinfo::windows::Version::Current().IsAtLeast(mpt::osinfo::windows::Version::WinVista) ? U_("Windows Vista") : - mpt::osinfo::windows::Version::Current().IsAtLeast(mpt::osinfo::windows::Version::WinXP) ? U_("Windows XP") : - mpt::osinfo::windows::Version::Current().IsAtLeast(mpt::osinfo::windows::Version::Win2000) ? U_("Windows 2000") : - mpt::osinfo::windows::Version::Current().IsAtLeast(mpt::osinfo::windows::Version::WinNT4) ? U_("Windows NT4") : - U_("unknown") + mpt::osinfo::windows::Version::Current().IsAtLeast(mpt::osinfo::windows::Version::Win81) ? UV_("Windows 8.1") : + mpt::osinfo::windows::Version::Current().IsAtLeast(mpt::osinfo::windows::Version::Win8) ? UV_("Windows 8") : + mpt::osinfo::windows::Version::Current().IsAtLeast(mpt::osinfo::windows::Version::Win7) ? UV_("Windows 7") : + mpt::osinfo::windows::Version::Current().IsAtLeast(mpt::osinfo::windows::Version::WinVista) ? UV_("Windows Vista") : + mpt::osinfo::windows::Version::Current().IsAtLeast(mpt::osinfo::windows::Version::WinXP) ? UV_("Windows XP") : + mpt::osinfo::windows::Version::Current().IsAtLeast(mpt::osinfo::windows::Version::Win2000) ? UV_("Windows 2000") : + mpt::osinfo::windows::Version::Current().IsAtLeast(mpt::osinfo::windows::Version::WinNT4) ? UV_("Windows NT4") : + UV_("unknown") ); text += MPT_UFORMAT("Windows original: {}\n") ( mpt::OS::Windows::IsOriginal() ? yes : no |
|
From: <sv...@op...> - 2024-11-02 09:59:38
|
Author: manx Date: Sat Nov 2 10:59:26 2024 New Revision: 22064 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22064 Log: [Ref] mptString: Add #define UV_(str) for mpt::ustring_view. Modified: trunk/OpenMPT/common/mptString.h Modified: trunk/OpenMPT/common/mptString.h ============================================================================== --- trunk/OpenMPT/common/mptString.h Sat Nov 2 10:54:51 2024 (r22063) +++ trunk/OpenMPT/common/mptString.h Sat Nov 2 10:59:26 2024 (r22064) @@ -408,6 +408,7 @@ #define UC_(x) MPT_UCHAR(x) #define UL_(x) MPT_ULITERAL(x) +#define UV_(x) MPT_USTRINGVIEW(x) #define U_(x) MPT_USTRING(x) |
|
From: <sv...@op...> - 2024-11-02 09:54:57
|
Author: manx Date: Sat Nov 2 10:54:51 2024 New Revision: 22063 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22063 Log: [Ref] mpt/string/types.hpp: Add MPT_WIDESTRINGVIEW, similar to MPT_USTRINGVIEW. Modified: trunk/OpenMPT/src/mpt/string/types.hpp Modified: trunk/OpenMPT/src/mpt/string/types.hpp ============================================================================== --- trunk/OpenMPT/src/mpt/string/types.hpp Sat Nov 2 10:49:05 2024 (r22062) +++ trunk/OpenMPT/src/mpt/string/types.hpp Sat Nov 2 10:54:51 2024 (r22063) @@ -185,16 +185,18 @@ using widestring = std::wstring; using widestring_view = std::wstring_view; using widechar = wchar_t; -#define MPT_WIDECHAR(x) L##x -#define MPT_WIDELITERAL(x) L##x -#define MPT_WIDESTRING(x) std::wstring(L##x) +#define MPT_WIDECHAR(x) L##x +#define MPT_WIDELITERAL(x) L##x +#define MPT_WIDESTRING(x) std::wstring(L##x) +#define MPT_WIDESTRINGVIEW(x) std::wstring_view(L##x) #else // MPT_COMPILER_QUIRK_NO_WCHAR using widestring = std::u32string; using widestring_view = std::u32string_view; using widechar = char32_t; -#define MPT_WIDECHAR(x) U##x -#define MPT_WIDELITERAL(x) U##x -#define MPT_WIDESTRING(x) std::u32string(U##x) +#define MPT_WIDECHAR(x) U##x +#define MPT_WIDELITERAL(x) U##x +#define MPT_WIDESTRING(x) std::u32string(U##x) +#define MPT_WIDESTRINGVIEW(x) std::u32string_view(U##x) #endif // !MPT_COMPILER_QUIRK_NO_WCHAR |
|
From: <sv...@op...> - 2024-11-02 09:49:17
|
Author: manx Date: Sat Nov 2 10:49:05 2024 New Revision: 22062 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22062 Log: [Fix] Partially revert r22059. Does not build in C++17 UTF8 mode. Modified: trunk/OpenMPT/mptrack/AboutDialog.cpp Modified: trunk/OpenMPT/mptrack/AboutDialog.cpp ============================================================================== --- trunk/OpenMPT/mptrack/AboutDialog.cpp Sat Nov 2 01:26:34 2024 (r22061) +++ trunk/OpenMPT/mptrack/AboutDialog.cpp Sat Nov 2 10:49:05 2024 (r22062) @@ -397,9 +397,9 @@ text += MPT_UFORMAT("Available CPU features: {}\n")(CPUFeaturesToString(CPUInfo.get_features())); #endif // MPT_ENABLE_ARCH_INTRINSICS text += MPT_UFORMAT("Operating System: {}\n\n")(mpt::OS::Windows::Version::GetCurrentName()); - text += MPT_UFORMAT("OpenMPT Install Path{1}: {0}\n")(theApp.GetInstallPath(), theApp.IsPortableMode() ? UL_(" (portable)") : UL_("")); - text += MPT_UFORMAT("OpenMPT Executable Path{1}: {0}\n")(theApp.GetInstallBinArchPath(), theApp.IsPortableMode() ? UL_(" (portable)") : UL_("")); - text += MPT_UFORMAT("Settings{1}: {0}\n")(theApp.GetConfigFileName(), theApp.IsPortableMode() ? UL_(" (portable)") : UL_("")); + text += MPT_UFORMAT("OpenMPT Install Path{1}: {0}\n")(theApp.GetInstallPath(), theApp.IsPortableMode() ? U_(" (portable)") : U_("")); + text += MPT_UFORMAT("OpenMPT Executable Path{1}: {0}\n")(theApp.GetInstallBinArchPath(), theApp.IsPortableMode() ? U_(" (portable)") : U_("")); + text += MPT_UFORMAT("Settings{1}: {0}\n")(theApp.GetConfigFileName(), theApp.IsPortableMode() ? U_(" (portable)") : U_("")); break; case 1: { @@ -440,22 +440,22 @@ } text += MPT_UFORMAT("{}: {}") ( name - , info.state == ComponentStateAvailable ? UL_("ok") : - info.state == ComponentStateUnavailable? UL_("missing") : - info.state == ComponentStateUnintialized ? UL_("not loaded") : - info.state == ComponentStateBlocked ? UL_("blocked") : - info.state == ComponentStateUnregistered ? UL_("unregistered") : - UL_("unknown") + , info.state == ComponentStateAvailable ? U_("ok") : + info.state == ComponentStateUnavailable? U_("missing") : + info.state == ComponentStateUnintialized ? U_("not loaded") : + info.state == ComponentStateBlocked ? U_("blocked") : + info.state == ComponentStateUnregistered ? U_("unregistered") : + U_("unknown") ); if(info.type != ComponentTypeUnknown) { text += MPT_UFORMAT(" ({})") - ( info.type == ComponentTypeBuiltin ? UL_("builtin") : - info.type == ComponentTypeSystem ? UL_("system") : - info.type == ComponentTypeSystemInstallable ? UL_("system, optional") : - info.type == ComponentTypeBundled ? UL_("bundled") : - info.type == ComponentTypeForeign ? UL_("foreign") : - UL_("unknown") + ( info.type == ComponentTypeBuiltin ? U_("builtin") : + info.type == ComponentTypeSystem ? U_("system") : + info.type == ComponentTypeSystemInstallable ? U_("system, optional") : + info.type == ComponentTypeBundled ? U_("bundled") : + info.type == ComponentTypeForeign ? U_("foreign") : + U_("unknown") ); } text += lf; @@ -492,14 +492,14 @@ ); text += MPT_UFORMAT("Windows version: {}\n") ( - mpt::osinfo::windows::Version::Current().IsAtLeast(mpt::osinfo::windows::Version::Win81) ? UL_("Windows 8.1") : - mpt::osinfo::windows::Version::Current().IsAtLeast(mpt::osinfo::windows::Version::Win8) ? UL_("Windows 8") : - mpt::osinfo::windows::Version::Current().IsAtLeast(mpt::osinfo::windows::Version::Win7) ? UL_("Windows 7") : - mpt::osinfo::windows::Version::Current().IsAtLeast(mpt::osinfo::windows::Version::WinVista) ? UL_("Windows Vista") : - mpt::osinfo::windows::Version::Current().IsAtLeast(mpt::osinfo::windows::Version::WinXP) ? UL_("Windows XP") : - mpt::osinfo::windows::Version::Current().IsAtLeast(mpt::osinfo::windows::Version::Win2000) ? UL_("Windows 2000") : - mpt::osinfo::windows::Version::Current().IsAtLeast(mpt::osinfo::windows::Version::WinNT4) ? UL_("Windows NT4") : - UL_("unknown") + mpt::osinfo::windows::Version::Current().IsAtLeast(mpt::osinfo::windows::Version::Win81) ? U_("Windows 8.1") : + mpt::osinfo::windows::Version::Current().IsAtLeast(mpt::osinfo::windows::Version::Win8) ? U_("Windows 8") : + mpt::osinfo::windows::Version::Current().IsAtLeast(mpt::osinfo::windows::Version::Win7) ? U_("Windows 7") : + mpt::osinfo::windows::Version::Current().IsAtLeast(mpt::osinfo::windows::Version::WinVista) ? U_("Windows Vista") : + mpt::osinfo::windows::Version::Current().IsAtLeast(mpt::osinfo::windows::Version::WinXP) ? U_("Windows XP") : + mpt::osinfo::windows::Version::Current().IsAtLeast(mpt::osinfo::windows::Version::Win2000) ? U_("Windows 2000") : + mpt::osinfo::windows::Version::Current().IsAtLeast(mpt::osinfo::windows::Version::WinNT4) ? U_("Windows NT4") : + U_("unknown") ); text += MPT_UFORMAT("Windows original: {}\n") ( mpt::OS::Windows::IsOriginal() ? yes : no |
|
From: <sv...@op...> - 2024-11-02 00:26:42
|
Author: sagamusix Date: Sat Nov 2 01:26:34 2024 New Revision: 22061 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22061 Log: Merged revision(s) 22060 from trunk/OpenMPT: [Imp] Add the possibility to disable enhanced GDI upscaling via hidden setting Display.UseGDIUpcaling. This may fix issues that in particular some older VST plugins may be having when this mode is enabled (https://bugs.openmpt.org/view.php?id=1524). ........ Modified: branches/OpenMPT-1.31/ (props changed) branches/OpenMPT-1.31/mptrack/Mptrack.cpp branches/OpenMPT-1.31/mptrack/TrackerSettings.cpp branches/OpenMPT-1.31/mptrack/TrackerSettings.h Modified: branches/OpenMPT-1.31/mptrack/Mptrack.cpp ============================================================================== --- branches/OpenMPT-1.31/mptrack/Mptrack.cpp Sat Nov 2 01:23:53 2024 (r22060) +++ branches/OpenMPT-1.31/mptrack/Mptrack.cpp Sat Nov 2 01:26:34 2024 (r22061) @@ -1279,7 +1279,7 @@ // For Windows 10, Creators Update (1703) and newer { mpt::Library user32(mpt::LibraryPath::System(P_("user32"))); - if (user32.IsValid()) + if(user32.IsValid()) { enum MPT_DPI_AWARENESS_CONTEXT { @@ -1293,12 +1293,12 @@ PSETPROCESSDPIAWARENESSCONTEXT SetProcessDpiAwarenessContext = nullptr; if(user32.Bind(SetProcessDpiAwarenessContext, "SetProcessDpiAwarenessContext")) { - if (TrackerSettings::Instance().highResUI) + if(TrackerSettings::Instance().highResUI) { setDPI = (SetProcessDpiAwarenessContext(HANDLE(MPT_DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE_V2)) == TRUE); } else { - if (SetProcessDpiAwarenessContext(HANDLE(MPT_DPI_AWARENESS_CONTEXT_UNAWARE_GDISCALED)) == TRUE) + if(TrackerSettings::Instance().useGDIUpcaling && SetProcessDpiAwarenessContext(HANDLE(MPT_DPI_AWARENESS_CONTEXT_UNAWARE_GDISCALED)) == TRUE) setDPI = true; else setDPI = (SetProcessDpiAwarenessContext(HANDLE(MPT_DPI_AWARENESS_CONTEXT_UNAWARE)) == TRUE); Modified: branches/OpenMPT-1.31/mptrack/TrackerSettings.cpp ============================================================================== --- branches/OpenMPT-1.31/mptrack/TrackerSettings.cpp Sat Nov 2 01:23:53 2024 (r22060) +++ branches/OpenMPT-1.31/mptrack/TrackerSettings.cpp Sat Nov 2 01:26:34 2024 (r22061) @@ -175,6 +175,7 @@ , m_ShowSplashScreen(conf, U_("Display"), U_("ShowSplashScreen"), true) , gbMdiMaximize(conf, U_("Display"), U_("MDIMaximize"), true) , highResUI(conf, U_("Display"), U_("HighResUI"), false) + , useGDIUpcaling(conf, UL_("Display"), UL_("UseGDIUpscaling"), true) , glTreeSplitRatio(conf, U_("Display"), U_("MDITreeRatio"), 128) , glTreeWindowWidth(conf, U_("Display"), U_("MDITreeWidth"), 160) , glGeneralWindowHeight(conf, U_("Display"), U_("MDIGeneralHeight"), 222) Modified: branches/OpenMPT-1.31/mptrack/TrackerSettings.h ============================================================================== --- branches/OpenMPT-1.31/mptrack/TrackerSettings.h Sat Nov 2 01:23:53 2024 (r22060) +++ branches/OpenMPT-1.31/mptrack/TrackerSettings.h Sat Nov 2 01:26:34 2024 (r22061) @@ -660,6 +660,7 @@ Setting<bool> m_ShowSplashScreen; Setting<bool> gbMdiMaximize; Setting<bool> highResUI; + Setting<bool> useGDIUpcaling; Setting<LONG> glTreeSplitRatio; Setting<LONG> glTreeWindowWidth; Setting<LONG> glGeneralWindowHeight; |
|
From: <sv...@op...> - 2024-11-02 00:24:05
|
Author: sagamusix Date: Sat Nov 2 01:23:53 2024 New Revision: 22060 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22060 Log: [Imp] Add the possibility to disable enhanced GDI upscaling via hidden setting Display.UseGDIUpcaling. This may fix issues that in particular some older VST plugins may be having when this mode is enabled (https://bugs.openmpt.org/view.php?id=1524). Modified: trunk/OpenMPT/mptrack/Mptrack.cpp trunk/OpenMPT/mptrack/TrackerSettings.cpp trunk/OpenMPT/mptrack/TrackerSettings.h Modified: trunk/OpenMPT/mptrack/Mptrack.cpp ============================================================================== --- trunk/OpenMPT/mptrack/Mptrack.cpp Sat Nov 2 00:26:39 2024 (r22059) +++ trunk/OpenMPT/mptrack/Mptrack.cpp Sat Nov 2 01:23:53 2024 (r22060) @@ -1285,7 +1285,7 @@ // For Windows 10, Creators Update (1703) and newer { mpt::Library user32(mpt::LibraryPath::System(P_("user32"))); - if (user32.IsValid()) + if(user32.IsValid()) { enum MPT_DPI_AWARENESS_CONTEXT { @@ -1299,12 +1299,12 @@ PSETPROCESSDPIAWARENESSCONTEXT SetProcessDpiAwarenessContext = nullptr; if(user32.Bind(SetProcessDpiAwarenessContext, "SetProcessDpiAwarenessContext")) { - if (TrackerSettings::Instance().highResUI) + if(TrackerSettings::Instance().highResUI) { setDPI = (SetProcessDpiAwarenessContext(HANDLE(MPT_DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE_V2)) == TRUE); } else { - if (SetProcessDpiAwarenessContext(HANDLE(MPT_DPI_AWARENESS_CONTEXT_UNAWARE_GDISCALED)) == TRUE) + if(TrackerSettings::Instance().useGDIUpcaling && SetProcessDpiAwarenessContext(HANDLE(MPT_DPI_AWARENESS_CONTEXT_UNAWARE_GDISCALED)) == TRUE) setDPI = true; else setDPI = (SetProcessDpiAwarenessContext(HANDLE(MPT_DPI_AWARENESS_CONTEXT_UNAWARE)) == TRUE); Modified: trunk/OpenMPT/mptrack/TrackerSettings.cpp ============================================================================== --- trunk/OpenMPT/mptrack/TrackerSettings.cpp Sat Nov 2 00:26:39 2024 (r22059) +++ trunk/OpenMPT/mptrack/TrackerSettings.cpp Sat Nov 2 01:23:53 2024 (r22060) @@ -176,6 +176,7 @@ , m_ShowSplashScreen(conf, UL_("Display"), UL_("ShowSplashScreen"), true) , gbMdiMaximize(conf, UL_("Display"), UL_("MDIMaximize"), true) , highResUI(conf, UL_("Display"), UL_("HighResUI"), false) + , useGDIUpcaling(conf, UL_("Display"), UL_("UseGDIUpscaling"), true) , glTreeSplitRatio(conf, UL_("Display"), UL_("MDITreeRatio"), 128) , glTreeWindowWidth(conf, UL_("Display"), UL_("MDITreeWidth"), 160) , glGeneralWindowHeight(conf, UL_("Display"), UL_("MDIGeneralHeight"), 222) Modified: trunk/OpenMPT/mptrack/TrackerSettings.h ============================================================================== --- trunk/OpenMPT/mptrack/TrackerSettings.h Sat Nov 2 00:26:39 2024 (r22059) +++ trunk/OpenMPT/mptrack/TrackerSettings.h Sat Nov 2 01:23:53 2024 (r22060) @@ -669,6 +669,7 @@ Setting<bool> m_ShowSplashScreen; Setting<bool> gbMdiMaximize; Setting<bool> highResUI; + Setting<bool> useGDIUpcaling; Setting<LONG> glTreeSplitRatio; Setting<LONG> glTreeWindowWidth; Setting<LONG> glGeneralWindowHeight; |
|
From: <sv...@op...> - 2024-11-01 23:26:48
|
Author: sagamusix Date: Sat Nov 2 00:26:39 2024 New Revision: 22059 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22059 Log: [Ref] Use UL_ instead of U_ in TrackerSettings and CAboutDialog places to reduce binary size by about ~12KB. Modified: trunk/OpenMPT/mptrack/AboutDialog.cpp trunk/OpenMPT/mptrack/TrackerSettings.cpp Modified: trunk/OpenMPT/mptrack/AboutDialog.cpp ============================================================================== --- trunk/OpenMPT/mptrack/AboutDialog.cpp Fri Nov 1 23:47:42 2024 (r22058) +++ trunk/OpenMPT/mptrack/AboutDialog.cpp Sat Nov 2 00:26:39 2024 (r22059) @@ -250,14 +250,13 @@ DialogBase::OnInitDialog(); mpt::ustring app; - app += MPT_UFORMAT("OpenMPT{} ({} ({} bit))")( + app += MPT_UFORMAT("OpenMPT{} ({}, {} bit)\r\n")( mpt::ToUnicode(mpt::Charset::ASCII, OPENMPT_BUILD_VARIANT_MONIKER), mpt::OS::Windows::Name(mpt::OS::Windows::GetProcessArchitecture()), mpt::arch_bits) - + U_("\n"); - app += U_("Version ") + Build::GetVersionStringSimple() + U_("\n\n"); - app += Build::GetURL(Build::Url::Website) + U_("\n"); - SetDlgItemText(IDC_EDIT3, mpt::ToCString(mpt::replace(app, U_("\n"), U_("\r\n")))); + + UL_("Version ") + Build::GetVersionStringSimple() + UL_("\r\n\r\n") + + Build::GetURL(Build::Url::Website) + UL_("\r\n"); + SetDlgItemText(IDC_EDIT3, mpt::ToCString(app)); m_bmp.SubclassDlgItem(IDC_BITMAP1, this); @@ -303,10 +302,10 @@ std::vector<mpt::ustring> features; #if MPT_COMPILER_MSVC #if defined(MPT_ENABLE_ARCH_X86) - features.push_back(U_("x86")); + features.push_back(UL_("x86")); #endif #if defined(MPT_ENABLE_ARCH_AMD64) - features.push_back(U_("amd64")); + features.push_back(UL_("amd64")); #endif struct ProcFlag { @@ -342,9 +341,9 @@ mpt::ustring CAboutDlg::GetTabText(int tab) { - const mpt::ustring lf = U_("\n"); - const mpt::ustring yes = U_("yes"); - const mpt::ustring no = U_("no"); + const mpt::ustring lf = UL_("\n"); + const mpt::ustring yes = UL_("yes"); + const mpt::ustring no = UL_("no"); #ifdef MPT_ENABLE_ARCH_INTRINSICS const mpt::arch::current::cpu_info CPUInfo = mpt::arch::get_cpu_info(); #endif // MPT_ENABLE_ARCH_INTRINSICS @@ -352,7 +351,7 @@ switch(tab) { case 0: - text = U_("OpenMPT - Open ModPlug Tracker\n\n") + text = UL_("OpenMPT - Open ModPlug Tracker\n\n") + MPT_UFORMAT("Version: {}\n")(Build::GetVersionStringExtended()) + MPT_UFORMAT("Source Code: {}\n")(SourceInfo::Current().GetUrlWithRevision() + UL_(" ") + SourceInfo::Current().GetStateString()) + MPT_UFORMAT("Build Date: {}\n")(Build::GetBuildDateString()) @@ -361,18 +360,18 @@ + MPT_UFORMAT("Required Windows Kernel Level: {}\n")(mpt::OS::Windows::Version::GetName(mpt::OS::Windows::Version::GetMinimumKernelLevel())) + MPT_UFORMAT("Required Windows API Level: {}\n")(mpt::OS::Windows::Version::GetName(mpt::OS::Windows::Version::GetMinimumAPILevel())); { - text += U_("Required CPU features: "); + text += UL_("Required CPU features: "); std::vector<mpt::ustring> features; #ifdef MPT_ENABLE_ARCH_INTRINSICS #if MPT_ARCH_AMD64 - features.push_back(U_("x86-64")); - if(mpt::arch::current::assumed_features() & mpt::arch::current::feature::avx) features.push_back(U_("avx")); - if(mpt::arch::current::assumed_features() & mpt::arch::current::feature::avx2) features.push_back(U_("avx2")); + features.push_back(UL_("x86-64")); + if(mpt::arch::current::assumed_features() & mpt::arch::current::feature::avx) features.push_back(UL_("avx")); + if(mpt::arch::current::assumed_features() & mpt::arch::current::feature::avx2) features.push_back(UL_("avx2")); #elif MPT_ARCH_X86 - if(mpt::arch::current::assumed_features() & mpt::arch::current::feature::sse) features.push_back(U_("sse")); - if(mpt::arch::current::assumed_features() & mpt::arch::current::feature::sse2) features.push_back(U_("sse2")); - if(mpt::arch::current::assumed_features() & mpt::arch::current::feature::avx) features.push_back(U_("avx")); - if(mpt::arch::current::assumed_features() & mpt::arch::current::feature::avx2) features.push_back(U_("avx2")); + if(mpt::arch::current::assumed_features() & mpt::arch::current::feature::sse) features.push_back(UL_("sse")); + if(mpt::arch::current::assumed_features() & mpt::arch::current::feature::sse2) features.push_back(UL_("sse2")); + if(mpt::arch::current::assumed_features() & mpt::arch::current::feature::avx) features.push_back(UL_("avx")); + if(mpt::arch::current::assumed_features() & mpt::arch::current::feature::avx2) features.push_back(UL_("avx2")); #endif #endif text += mpt::join_format(features, U_(" ")); @@ -398,16 +397,16 @@ text += MPT_UFORMAT("Available CPU features: {}\n")(CPUFeaturesToString(CPUInfo.get_features())); #endif // MPT_ENABLE_ARCH_INTRINSICS text += MPT_UFORMAT("Operating System: {}\n\n")(mpt::OS::Windows::Version::GetCurrentName()); - text += MPT_UFORMAT("OpenMPT Install Path{1}: {0}\n")(theApp.GetInstallPath(), theApp.IsPortableMode() ? U_(" (portable)") : U_("")); - text += MPT_UFORMAT("OpenMPT Executable Path{1}: {0}\n")(theApp.GetInstallBinArchPath(), theApp.IsPortableMode() ? U_(" (portable)") : U_("")); - text += MPT_UFORMAT("Settings{1}: {0}\n")(theApp.GetConfigFileName(), theApp.IsPortableMode() ? U_(" (portable)") : U_("")); + text += MPT_UFORMAT("OpenMPT Install Path{1}: {0}\n")(theApp.GetInstallPath(), theApp.IsPortableMode() ? UL_(" (portable)") : UL_("")); + text += MPT_UFORMAT("OpenMPT Executable Path{1}: {0}\n")(theApp.GetInstallBinArchPath(), theApp.IsPortableMode() ? UL_(" (portable)") : UL_("")); + text += MPT_UFORMAT("Settings{1}: {0}\n")(theApp.GetConfigFileName(), theApp.IsPortableMode() ? UL_(" (portable)") : UL_("")); break; case 1: { std::vector<std::string> components = ComponentManager::Instance()->GetRegisteredComponents(); if(!TrackerSettings::Instance().ComponentsKeepLoaded) { - text += U_("Components are loaded and unloaded as needed.\n\n"); + text += UL_("Components are loaded and unloaded as needed.\n\n"); for(const auto &component : components) { ComponentInfo info = ComponentManager::Instance()->GetComponentInfo(component); @@ -424,10 +423,10 @@ { if(available) { - text += U_("Loaded Components:\n"); + text += UL_("Loaded Components:\n"); } else { - text += U_("\nUnloaded Components:\n"); + text += UL_("\nUnloaded Components:\n"); } for(const auto &component : components) { @@ -441,22 +440,22 @@ } text += MPT_UFORMAT("{}: {}") ( name - , info.state == ComponentStateAvailable ? U_("ok") : - info.state == ComponentStateUnavailable? U_("missing") : - info.state == ComponentStateUnintialized ? U_("not loaded") : - info.state == ComponentStateBlocked ? U_("blocked") : - info.state == ComponentStateUnregistered ? U_("unregistered") : - U_("unknown") + , info.state == ComponentStateAvailable ? UL_("ok") : + info.state == ComponentStateUnavailable? UL_("missing") : + info.state == ComponentStateUnintialized ? UL_("not loaded") : + info.state == ComponentStateBlocked ? UL_("blocked") : + info.state == ComponentStateUnregistered ? UL_("unregistered") : + UL_("unknown") ); if(info.type != ComponentTypeUnknown) { text += MPT_UFORMAT(" ({})") - ( info.type == ComponentTypeBuiltin ? U_("builtin") : - info.type == ComponentTypeSystem ? U_("system") : - info.type == ComponentTypeSystemInstallable ? U_("system, optional") : - info.type == ComponentTypeBundled ? U_("bundled") : - info.type == ComponentTypeForeign ? U_("foreign") : - U_("unknown") + ( info.type == ComponentTypeBuiltin ? UL_("builtin") : + info.type == ComponentTypeSystem ? UL_("system") : + info.type == ComponentTypeSystemInstallable ? UL_("system, optional") : + info.type == ComponentTypeBundled ? UL_("bundled") : + info.type == ComponentTypeForeign ? UL_("foreign") : + UL_("unknown") ); } text += lf; @@ -472,17 +471,17 @@ text += Build::GetLicenseString(); break; case 4: - text += U_("Website:\n") + Build::GetURL(Build::Url::Website); - text += U_("\n\nForum:\n") + Build::GetURL(Build::Url::Forum); - text += U_("\n\nBug Tracker:\n") + Build::GetURL(Build::Url::Bugtracker); - text += U_("\n\nUpdates:\n") + Build::GetURL(Build::Url::Updates); + text += UL_("Website:\n") + Build::GetURL(Build::Url::Website); + text += UL_("\n\nForum:\n") + Build::GetURL(Build::Url::Forum); + text += UL_("\n\nBug Tracker:\n") + Build::GetURL(Build::Url::Bugtracker); + text += UL_("\n\nUpdates:\n") + Build::GetURL(Build::Url::Updates); break; case 5: try { if(!theApp.GetWine()) { - text += U_("Wine integration not available.\n"); + text += UL_("Wine integration not available.\n"); } else { @@ -493,20 +492,20 @@ ); text += MPT_UFORMAT("Windows version: {}\n") ( - mpt::osinfo::windows::Version::Current().IsAtLeast(mpt::osinfo::windows::Version::Win81) ? U_("Windows 8.1") : - mpt::osinfo::windows::Version::Current().IsAtLeast(mpt::osinfo::windows::Version::Win8) ? U_("Windows 8") : - mpt::osinfo::windows::Version::Current().IsAtLeast(mpt::osinfo::windows::Version::Win7) ? U_("Windows 7") : - mpt::osinfo::windows::Version::Current().IsAtLeast(mpt::osinfo::windows::Version::WinVista) ? U_("Windows Vista") : - mpt::osinfo::windows::Version::Current().IsAtLeast(mpt::osinfo::windows::Version::WinXP) ? U_("Windows XP") : - mpt::osinfo::windows::Version::Current().IsAtLeast(mpt::osinfo::windows::Version::Win2000) ? U_("Windows 2000") : - mpt::osinfo::windows::Version::Current().IsAtLeast(mpt::osinfo::windows::Version::WinNT4) ? U_("Windows NT4") : - U_("unknown") + mpt::osinfo::windows::Version::Current().IsAtLeast(mpt::osinfo::windows::Version::Win81) ? UL_("Windows 8.1") : + mpt::osinfo::windows::Version::Current().IsAtLeast(mpt::osinfo::windows::Version::Win8) ? UL_("Windows 8") : + mpt::osinfo::windows::Version::Current().IsAtLeast(mpt::osinfo::windows::Version::Win7) ? UL_("Windows 7") : + mpt::osinfo::windows::Version::Current().IsAtLeast(mpt::osinfo::windows::Version::WinVista) ? UL_("Windows Vista") : + mpt::osinfo::windows::Version::Current().IsAtLeast(mpt::osinfo::windows::Version::WinXP) ? UL_("Windows XP") : + mpt::osinfo::windows::Version::Current().IsAtLeast(mpt::osinfo::windows::Version::Win2000) ? UL_("Windows 2000") : + mpt::osinfo::windows::Version::Current().IsAtLeast(mpt::osinfo::windows::Version::WinNT4) ? UL_("Windows NT4") : + UL_("unknown") ); text += MPT_UFORMAT("Windows original: {}\n") ( mpt::OS::Windows::IsOriginal() ? yes : no ); - text += U_("\n"); + text += UL_("\n"); text += MPT_UFORMAT("Wine: {}\n") ( mpt::OS::Windows::IsWine() ? yes : no @@ -524,7 +523,7 @@ ( mpt::ToUnicode(mpt::Charset::UTF8, wine.VersionContext().RawHostRelease()) ); - text += U_("\n"); + text += UL_("\n"); text += MPT_UFORMAT("uname -m: {}\n") ( mpt::ToUnicode(mpt::Charset::UTF8, wine.Uname_m()) @@ -542,7 +541,7 @@ ( mpt::ToUnicode(mpt::Charset::UTF8, wine.XDG_CONFIG_HOME()) ); - text += U_("\n"); + text += UL_("\n"); text += MPT_UFORMAT("OpenMPT folder: {}\n") ( theApp.GetInstallPath().ToUnicode() @@ -563,7 +562,7 @@ } } catch(const mpt::Wine::Exception & e) { - text += U_("Exception: ") + mpt::get_exception_text<mpt::ustring>(e) + U_("\n"); + text += UL_("Exception: ") + mpt::get_exception_text<mpt::ustring>(e) + UL_("\n"); } break; } Modified: trunk/OpenMPT/mptrack/TrackerSettings.cpp ============================================================================== --- trunk/OpenMPT/mptrack/TrackerSettings.cpp Fri Nov 1 23:47:42 2024 (r22058) +++ trunk/OpenMPT/mptrack/TrackerSettings.cpp Sat Nov 2 00:26:39 2024 (r22059) @@ -119,19 +119,19 @@ : conf(conf_) // Debug #if !defined(MPT_LOG_IS_DISABLED) - , DebugLogLevel(conf, U_("Debug"), U_("LogLevel"), static_cast<int>(mpt::log::GlobalLogLevel)) - , DebugLogFacilitySolo(conf, U_("Debug"), U_("LogFacilitySolo"), std::string()) - , DebugLogFacilityBlocked(conf, U_("Debug"), U_("LogFacilityBlocked"), std::string()) - , DebugLogFileEnable(conf, U_("Debug"), U_("LogFileEnable"), mpt::log::FileEnabled) - , DebugLogDebuggerEnable(conf, U_("Debug"), U_("LogDebuggerEnable"), mpt::log::DebuggerEnabled) - , DebugLogConsoleEnable(conf, U_("Debug"), U_("LogConsoleEnable"), mpt::log::ConsoleEnabled) + , DebugLogLevel(conf, UL_("Debug"), UL_("LogLevel"), static_cast<int>(mpt::log::GlobalLogLevel)) + , DebugLogFacilitySolo(conf, UL_("Debug"), UL_("LogFacilitySolo"), std::string()) + , DebugLogFacilityBlocked(conf, UL_("Debug"), UL_("LogFacilityBlocked"), std::string()) + , DebugLogFileEnable(conf, UL_("Debug"), UL_("LogFileEnable"), mpt::log::FileEnabled) + , DebugLogDebuggerEnable(conf, UL_("Debug"), UL_("LogDebuggerEnable"), mpt::log::DebuggerEnabled) + , DebugLogConsoleEnable(conf, UL_("Debug"), UL_("LogConsoleEnable"), mpt::log::ConsoleEnabled) #endif - , DebugTraceEnable(conf, U_("Debug"), U_("TraceEnable"), false) - , DebugTraceSize(conf, U_("Debug"), U_("TraceSize"), 1000000) - , DebugTraceAlwaysDump(conf, U_("Debug"), U_("TraceAlwaysDump"), false) - , DebugStopSoundDeviceOnCrash(conf, U_("Debug"), U_("StopSoundDeviceOnCrash"), true) - , DebugStopSoundDeviceBeforeDump(conf, U_("Debug"), U_("StopSoundDeviceBeforeDump"), false) - , DebugDelegateToWindowsHandler(conf, U_("Debug"), U_("DelegateToWindowsHandler"), false) + , DebugTraceEnable(conf, UL_("Debug"), UL_("TraceEnable"), false) + , DebugTraceSize(conf, UL_("Debug"), UL_("TraceSize"), 1000000) + , DebugTraceAlwaysDump(conf, UL_("Debug"), UL_("TraceAlwaysDump"), false) + , DebugStopSoundDeviceOnCrash(conf, UL_("Debug"), UL_("StopSoundDeviceOnCrash"), true) + , DebugStopSoundDeviceBeforeDump(conf, UL_("Debug"), UL_("StopSoundDeviceBeforeDump"), false) + , DebugDelegateToWindowsHandler(conf, UL_("Debug"), UL_("DelegateToWindowsHandler"), false) { // Duplicate state for debug stuff in order to avoid calling into settings framework from crash context. @@ -168,216 +168,216 @@ TrackerSettings::TrackerSettings(SettingsContainer &conf) : conf(conf) // Version - , IniVersion(conf, U_("Version"), U_("Version"), mpt::ustring()) + , IniVersion(conf, UL_("Version"), UL_("Version"), mpt::ustring()) , FirstRun(IniVersion.Get() == mpt::ustring()) , PreviousSettingsVersion(GetPreviousSettingsVersion(IniVersion)) - , VersionInstallGUID(conf, U_("Version"), U_("InstallGUID"), mpt::UUID()) + , VersionInstallGUID(conf, UL_("Version"), UL_("InstallGUID"), mpt::UUID()) // Display - , m_ShowSplashScreen(conf, U_("Display"), U_("ShowSplashScreen"), true) - , gbMdiMaximize(conf, U_("Display"), U_("MDIMaximize"), true) - , highResUI(conf, U_("Display"), U_("HighResUI"), false) - , glTreeSplitRatio(conf, U_("Display"), U_("MDITreeRatio"), 128) - , glTreeWindowWidth(conf, U_("Display"), U_("MDITreeWidth"), 160) - , glGeneralWindowHeight(conf, U_("Display"), U_("MDIGeneralHeight"), 222) - , glPatternWindowHeight(conf, U_("Display"), U_("MDIPatternHeight"), 152) - , glSampleWindowHeight(conf, U_("Display"), U_("MDISampleHeight"), 190) - , glInstrumentWindowHeight(conf, U_("Display"), U_("MDIInstrumentHeight"), 300) - , glCommentsWindowHeight(conf, U_("Display"), U_("MDICommentsHeight"), 288) - , glGraphWindowHeight(conf, U_("Display"), U_("MDIGraphHeight"), 288) - , gnPlugWindowX(conf, U_("Display"), U_("PlugSelectWindowX"), 243) - , gnPlugWindowY(conf, U_("Display"), U_("PlugSelectWindowY"), 273) - , gnPlugWindowWidth(conf, U_("Display"), U_("PlugSelectWindowWidth"), 450) - , gnPlugWindowHeight(conf, U_("Display"), U_("PlugSelectWindowHeight"), 540) - , lastSelectedPlugin(conf, U_("Display"), U_("PlugSelectWindowLast"), {}) - , gnMsgBoxVisiblityFlags(conf, U_("Display"), U_("MsgBoxVisibilityFlags"), uint32_max) - , GUIUpdateInterval(conf, U_("Display"), U_("GUIUpdateInterval"), 0) - , FSUpdateInterval(conf, U_("Display"), U_("FSUpdateInterval"), 500) - , VuMeterUpdateInterval(conf, U_("Display"), U_("VuMeterUpdateInterval"), 15) - , VuMeterDecaySpeedDecibelPerSecond(conf, U_("Display"), U_("VuMeterDecaySpeedDecibelPerSecond"), 88.0f) - , accidentalFlats(conf, U_("Display"), U_("AccidentalFlats"), false) - , rememberSongWindows(conf, U_("Display"), U_("RememberSongWindows"), true) - , showDirsInSampleBrowser(conf, U_("Display"), U_("ShowDirsInSampleBrowser"), false) - , useOldStyleFolderBrowser(conf, U_("Display"), U_("UseOldStyleFolderBrowser"), false) - , defaultRainbowChannelColors(conf, U_("Display"), U_("DefaultChannelColors"), DefaultChannelColors::Random) - , commentsFont(conf, U_("Display"), U_("Comments Font"), FontSetting(U_("Courier New"), 120)) + , m_ShowSplashScreen(conf, UL_("Display"), UL_("ShowSplashScreen"), true) + , gbMdiMaximize(conf, UL_("Display"), UL_("MDIMaximize"), true) + , highResUI(conf, UL_("Display"), UL_("HighResUI"), false) + , glTreeSplitRatio(conf, UL_("Display"), UL_("MDITreeRatio"), 128) + , glTreeWindowWidth(conf, UL_("Display"), UL_("MDITreeWidth"), 160) + , glGeneralWindowHeight(conf, UL_("Display"), UL_("MDIGeneralHeight"), 222) + , glPatternWindowHeight(conf, UL_("Display"), UL_("MDIPatternHeight"), 152) + , glSampleWindowHeight(conf, UL_("Display"), UL_("MDISampleHeight"), 190) + , glInstrumentWindowHeight(conf, UL_("Display"), UL_("MDIInstrumentHeight"), 300) + , glCommentsWindowHeight(conf, UL_("Display"), UL_("MDICommentsHeight"), 288) + , glGraphWindowHeight(conf, UL_("Display"), UL_("MDIGraphHeight"), 288) + , gnPlugWindowX(conf, UL_("Display"), UL_("PlugSelectWindowX"), 243) + , gnPlugWindowY(conf, UL_("Display"), UL_("PlugSelectWindowY"), 273) + , gnPlugWindowWidth(conf, UL_("Display"), UL_("PlugSelectWindowWidth"), 450) + , gnPlugWindowHeight(conf, UL_("Display"), UL_("PlugSelectWindowHeight"), 540) + , lastSelectedPlugin(conf, UL_("Display"), UL_("PlugSelectWindowLast"), {}) + , gnMsgBoxVisiblityFlags(conf, UL_("Display"), UL_("MsgBoxVisibilityFlags"), uint32_max) + , GUIUpdateInterval(conf, UL_("Display"), UL_("GUIUpdateInterval"), 0) + , FSUpdateInterval(conf, UL_("Display"), UL_("FSUpdateInterval"), 500) + , VuMeterUpdateInterval(conf, UL_("Display"), UL_("VuMeterUpdateInterval"), 15) + , VuMeterDecaySpeedDecibelPerSecond(conf, UL_("Display"), UL_("VuMeterDecaySpeedDecibelPerSecond"), 88.0f) + , accidentalFlats(conf, UL_("Display"), UL_("AccidentalFlats"), false) + , rememberSongWindows(conf, UL_("Display"), UL_("RememberSongWindows"), true) + , showDirsInSampleBrowser(conf, UL_("Display"), UL_("ShowDirsInSampleBrowser"), false) + , useOldStyleFolderBrowser(conf, UL_("Display"), UL_("UseOldStyleFolderBrowser"), false) + , defaultRainbowChannelColors(conf, UL_("Display"), UL_("DefaultChannelColors"), DefaultChannelColors::Random) + , commentsFont(conf, UL_("Display"), UL_("Comments Font"), FontSetting(UL_("Courier New"), 120)) // Misc - , defaultModType(conf, U_("Misc"), U_("DefaultModType"), MOD_TYPE_IT) - , defaultNewFileAction(conf, U_("Misc"), U_("DefaultNewFileAction"), nfDefaultFormat) - , DefaultPlugVolumeHandling(conf, U_("Misc"), U_("DefaultPlugVolumeHandling"), PLUGIN_VOLUMEHANDLING_IGNORE) - , autoApplySmoothFT2Ramping(conf, U_("Misc"), U_("SmoothFT2Ramping"), false) - , MiscITCompressionStereo(conf, U_("Misc"), U_("ITCompressionStereo"), 4) - , MiscITCompressionMono(conf, U_("Misc"), U_("ITCompressionMono"), 7) - , MiscSaveChannelMuteStatus(conf, U_("Misc"), U_("SaveChannelMuteStatus"), true) - , MiscAllowMultipleCommandsPerKey(conf, U_("Misc"), U_("AllowMultipleCommandsPerKey"), false) - , MiscDistinguishModifiers(conf, U_("Misc"), U_("DistinguishModifiers"), false) - , MiscProcessPriorityClass(conf, U_("Misc"), U_("ProcessPriorityClass"), ProcessPriorityClassNORMAL) - , MiscFlushFileBuffersOnSave(conf, U_("Misc"), U_("FlushFileBuffersOnSave"), true) - , MiscCacheCompleteFileBeforeLoading(conf, U_("Misc"), U_("CacheCompleteFileBeforeLoading"), false) - , MiscUseSingleInstance(conf, U_("Misc"), U_("UseSingleInstance"), false) + , defaultModType(conf, UL_("Misc"), UL_("DefaultModType"), MOD_TYPE_IT) + , defaultNewFileAction(conf, UL_("Misc"), UL_("DefaultNewFileAction"), nfDefaultFormat) + , DefaultPlugVolumeHandling(conf, UL_("Misc"), UL_("DefaultPlugVolumeHandling"), PLUGIN_VOLUMEHANDLING_IGNORE) + , autoApplySmoothFT2Ramping(conf, UL_("Misc"), UL_("SmoothFT2Ramping"), false) + , MiscITCompressionStereo(conf, UL_("Misc"), UL_("ITCompressionStereo"), 4) + , MiscITCompressionMono(conf, UL_("Misc"), UL_("ITCompressionMono"), 7) + , MiscSaveChannelMuteStatus(conf, UL_("Misc"), UL_("SaveChannelMuteStatus"), true) + , MiscAllowMultipleCommandsPerKey(conf, UL_("Misc"), UL_("AllowMultipleCommandsPerKey"), false) + , MiscDistinguishModifiers(conf, UL_("Misc"), UL_("DistinguishModifiers"), false) + , MiscProcessPriorityClass(conf, UL_("Misc"), UL_("ProcessPriorityClass"), ProcessPriorityClassNORMAL) + , MiscFlushFileBuffersOnSave(conf, UL_("Misc"), UL_("FlushFileBuffersOnSave"), true) + , MiscCacheCompleteFileBeforeLoading(conf, UL_("Misc"), UL_("CacheCompleteFileBeforeLoading"), false) + , MiscUseSingleInstance(conf, UL_("Misc"), UL_("UseSingleInstance"), false) // Sound Settings , m_SoundShowRecordingSettings(false) - , m_SoundShowDeprecatedDevices(conf, U_("Sound Settings"), U_("ShowDeprecatedDevices"), false) - , m_SoundDeprecatedDeviceWarningShown(conf, U_("Sound Settings"), U_("DeprecatedDeviceWarningShown"), false) - , m_SoundSampleRates(conf, U_("Sound Settings"), U_("SampleRates"), GetDefaultSampleRates()) - , m_SoundSettingsOpenDeviceAtStartup(conf, U_("Sound Settings"), U_("OpenDeviceAtStartup"), false) - , m_SoundSettingsStopMode(conf, U_("Sound Settings"), U_("StopMode"), SoundDeviceStopModeClosed) + , m_SoundShowDeprecatedDevices(conf, UL_("Sound Settings"), UL_("ShowDeprecatedDevices"), false) + , m_SoundDeprecatedDeviceWarningShown(conf, UL_("Sound Settings"), UL_("DeprecatedDeviceWarningShown"), false) + , m_SoundSampleRates(conf, UL_("Sound Settings"), UL_("SampleRates"), GetDefaultSampleRates()) + , m_SoundSettingsOpenDeviceAtStartup(conf, UL_("Sound Settings"), UL_("OpenDeviceAtStartup"), false) + , m_SoundSettingsStopMode(conf, UL_("Sound Settings"), UL_("StopMode"), SoundDeviceStopModeClosed) , m_SoundDeviceSettingsUseOldDefaults(false) , m_SoundDeviceID_DEPRECATED(SoundDevice::Legacy::ID()) - , m_SoundDeviceIdentifier(conf, U_("Sound Settings"), U_("Device"), SoundDevice::Identifier()) - , MixerMaxChannels(conf, U_("Sound Settings"), U_("MixChannels"), MixerSettings().m_nMaxMixChannels) - , MixerDSPMask(conf, U_("Sound Settings"), U_("Quality"), MixerSettings().DSPMask) - , MixerFlags(conf, U_("Sound Settings"), U_("SoundSetup"), MixerSettings().MixerFlags) - , MixerSamplerate(conf, U_("Sound Settings"), U_("Mixing_Rate"), MixerSettings().gdwMixingFreq) - , MixerOutputChannels(conf, U_("Sound Settings"), U_("ChannelMode"), MixerSettings().gnChannels) - , MixerPreAmp(conf, U_("Sound Settings"), U_("PreAmp"), MixerSettings().m_nPreAmp) - , MixerStereoSeparation(conf, U_("Sound Settings"), U_("StereoSeparation"), MixerSettings().m_nStereoSeparation) - , MixerVolumeRampUpMicroseconds(conf, U_("Sound Settings"), U_("VolumeRampUpMicroseconds"), MixerSettings().GetVolumeRampUpMicroseconds()) - , MixerVolumeRampDownMicroseconds(conf, U_("Sound Settings"), U_("VolumeRampDownMicroseconds"), MixerSettings().GetVolumeRampDownMicroseconds()) - , MixerNumInputChannels(conf, U_("Sound Settings"), U_("NumInputChannels"), static_cast<uint32>(MixerSettings().NumInputChannels)) - , ResamplerMode(conf, U_("Sound Settings"), U_("SrcMode"), CResamplerSettings().SrcMode) - , ResamplerSubMode(conf, U_("Sound Settings"), U_("XMMSModplugResamplerWFIRType"), CResamplerSettings().gbWFIRType) - , ResamplerCutoffPercent(conf, U_("Sound Settings"), U_("ResamplerWFIRCutoff"), mpt::saturate_round<int32>(CResamplerSettings().gdWFIRCutoff * 100.0)) - , ResamplerEmulateAmiga(conf, U_("Sound Settings"), U_("ResamplerEmulateAmiga"), Resampling::AmigaFilter::A1200) - , SoundBoostedThreadPriority(conf, U_("Sound Settings"), U_("BoostedThreadPriority"), SoundDevice::AppInfo().BoostedThreadPriorityXP) - , SoundBoostedThreadMMCSSClass(conf, U_("Sound Settings"), U_("BoostedThreadMMCSSClass"), SoundDevice::AppInfo().BoostedThreadMMCSSClassVista) - , SoundBoostedThreadRealtimePosix(conf, U_("Sound Settings"), U_("BoostedThreadRealtimeLinux"), SoundDevice::AppInfo().BoostedThreadRealtimePosix) - , SoundBoostedThreadNicenessPosix(conf, U_("Sound Settings"), U_("BoostedThreadNicenessPosix"), SoundDevice::AppInfo().BoostedThreadNicenessPosix) - , SoundBoostedThreadRtprioPosix(conf, U_("Sound Settings"), U_("BoostedThreadRtprioLinux"), SoundDevice::AppInfo().BoostedThreadRtprioPosix) - , SoundMaskDriverCrashes(conf, U_("Sound Settings"), U_("MaskDriverCrashes"), SoundDevice::AppInfo().MaskDriverCrashes) - , SoundAllowDeferredProcessing(conf, U_("Sound Settings"), U_("AllowDeferredProcessing"), SoundDevice::AppInfo().AllowDeferredProcessing) + , m_SoundDeviceIdentifier(conf, UL_("Sound Settings"), UL_("Device"), SoundDevice::Identifier()) + , MixerMaxChannels(conf, UL_("Sound Settings"), UL_("MixChannels"), MixerSettings().m_nMaxMixChannels) + , MixerDSPMask(conf, UL_("Sound Settings"), UL_("Quality"), MixerSettings().DSPMask) + , MixerFlags(conf, UL_("Sound Settings"), UL_("SoundSetup"), MixerSettings().MixerFlags) + , MixerSamplerate(conf, UL_("Sound Settings"), UL_("Mixing_Rate"), MixerSettings().gdwMixingFreq) + , MixerOutputChannels(conf, UL_("Sound Settings"), UL_("ChannelMode"), MixerSettings().gnChannels) + , MixerPreAmp(conf, UL_("Sound Settings"), UL_("PreAmp"), MixerSettings().m_nPreAmp) + , MixerStereoSeparation(conf, UL_("Sound Settings"), UL_("StereoSeparation"), MixerSettings().m_nStereoSeparation) + , MixerVolumeRampUpMicroseconds(conf, UL_("Sound Settings"), UL_("VolumeRampUpMicroseconds"), MixerSettings().GetVolumeRampUpMicroseconds()) + , MixerVolumeRampDownMicroseconds(conf, UL_("Sound Settings"), UL_("VolumeRampDownMicroseconds"), MixerSettings().GetVolumeRampDownMicroseconds()) + , MixerNumInputChannels(conf, UL_("Sound Settings"), UL_("NumInputChannels"), static_cast<uint32>(MixerSettings().NumInputChannels)) + , ResamplerMode(conf, UL_("Sound Settings"), UL_("SrcMode"), CResamplerSettings().SrcMode) + , ResamplerSubMode(conf, UL_("Sound Settings"), UL_("XMMSModplugResamplerWFIRType"), CResamplerSettings().gbWFIRType) + , ResamplerCutoffPercent(conf, UL_("Sound Settings"), UL_("ResamplerWFIRCutoff"), mpt::saturate_round<int32>(CResamplerSettings().gdWFIRCutoff * 100.0)) + , ResamplerEmulateAmiga(conf, UL_("Sound Settings"), UL_("ResamplerEmulateAmiga"), Resampling::AmigaFilter::A1200) + , SoundBoostedThreadPriority(conf, UL_("Sound Settings"), UL_("BoostedThreadPriority"), SoundDevice::AppInfo().BoostedThreadPriorityXP) + , SoundBoostedThreadMMCSSClass(conf, UL_("Sound Settings"), UL_("BoostedThreadMMCSSClass"), SoundDevice::AppInfo().BoostedThreadMMCSSClassVista) + , SoundBoostedThreadRealtimePosix(conf, UL_("Sound Settings"), UL_("BoostedThreadRealtimeLinux"), SoundDevice::AppInfo().BoostedThreadRealtimePosix) + , SoundBoostedThreadNicenessPosix(conf, UL_("Sound Settings"), UL_("BoostedThreadNicenessPosix"), SoundDevice::AppInfo().BoostedThreadNicenessPosix) + , SoundBoostedThreadRtprioPosix(conf, UL_("Sound Settings"), UL_("BoostedThreadRtprioLinux"), SoundDevice::AppInfo().BoostedThreadRtprioPosix) + , SoundMaskDriverCrashes(conf, UL_("Sound Settings"), UL_("MaskDriverCrashes"), SoundDevice::AppInfo().MaskDriverCrashes) + , SoundAllowDeferredProcessing(conf, UL_("Sound Settings"), UL_("AllowDeferredProcessing"), SoundDevice::AppInfo().AllowDeferredProcessing) // MIDI Settings - , m_nMidiDevice(conf, U_("MIDI Settings"), U_("MidiDevice"), 0) - , midiDeviceName(conf, U_("MIDI Settings"), U_("MidiDeviceName"), _T("")) - , m_dwMidiSetup(conf, U_("MIDI Settings"), U_("MidiSetup"), MIDISETUP_RECORDVELOCITY | MIDISETUP_RECORDNOTEOFF | MIDISETUP_TRANSPOSEKEYBOARD | MIDISETUP_MIDITOPLUG) - , aftertouchBehaviour(conf, U_("MIDI Settings"), U_("AftertouchBehaviour"), atDoNotRecord) - , midiVelocityAmp(conf, U_("MIDI Settings"), U_("MidiVelocityAmp"), 100) - , midiIgnoreCCs(conf, U_("MIDI Settings"), U_("IgnoredCCs"), std::bitset<128>()) - , midiImportPatternLen(conf, U_("MIDI Settings"), U_("MidiImportPatLen"), 128) - , midiImportQuantize(conf, U_("MIDI Settings"), U_("MidiImportQuantize"), 32) - , midiImportTicks(conf, U_("MIDI Settings"), U_("MidiImportTicks"), 6) + , m_nMidiDevice(conf, UL_("MIDI Settings"), UL_("MidiDevice"), 0) + , midiDeviceName(conf, UL_("MIDI Settings"), UL_("MidiDeviceName"), _T("")) + , m_dwMidiSetup(conf, UL_("MIDI Settings"), UL_("MidiSetup"), MIDISETUP_RECORDVELOCITY | MIDISETUP_RECORDNOTEOFF | MIDISETUP_TRANSPOSEKEYBOARD | MIDISETUP_MIDITOPLUG) + , aftertouchBehaviour(conf, UL_("MIDI Settings"), UL_("AftertouchBehaviour"), atDoNotRecord) + , midiVelocityAmp(conf, UL_("MIDI Settings"), UL_("MidiVelocityAmp"), 100) + , midiIgnoreCCs(conf, UL_("MIDI Settings"), UL_("IgnoredCCs"), std::bitset<128>()) + , midiImportPatternLen(conf, UL_("MIDI Settings"), UL_("MidiImportPatLen"), 128) + , midiImportQuantize(conf, UL_("MIDI Settings"), UL_("MidiImportQuantize"), 32) + , midiImportTicks(conf, UL_("MIDI Settings"), UL_("MidiImportTicks"), 6) // Pattern Editor - , gbLoopSong(conf, U_("Pattern Editor"), U_("LoopSong"), true) - , gnPatternSpacing(conf, U_("Pattern Editor"), U_("Spacing"), 0) - , gbPatternVUMeters(conf, U_("Pattern Editor"), U_("VU-Meters"), true) - , gbPatternPluginNames(conf, U_("Pattern Editor"), U_("Plugin-Names"), true) - , gbPatternRecord(conf, U_("Pattern Editor"), U_("Record"), true) - , patternNoEditPopup(conf, U_("Pattern Editor"), U_("NoEditPopup"), false) - , patternStepCommands(conf, U_("Pattern Editor"), U_("EditStepAppliesToCommands"), false) - , m_dwPatternSetup(conf, U_("Pattern Editor"), U_("PatternSetup"), GetDefaultPatternSetup()) - , m_nRowHighlightMeasures(conf, U_("Pattern Editor"), U_("RowSpacing"), 16) - , m_nRowHighlightBeats(conf, U_("Pattern Editor"), U_("RowSpacing2"), 4) - , patternIgnoreSongTimeSignature(conf, U_("Pattern Editor"), U_("IgnoreSongTimeSignature"), false) - , recordQuantizeRows(conf, U_("Pattern Editor"), U_("RecordQuantize"), 0) - , gnAutoChordWaitTime(conf, U_("Pattern Editor"), U_("AutoChordWaitTime"), 60) - , orderlistMargins(conf, U_("Pattern Editor"), U_("DefaultSequenceMargins"), 0) - , rowDisplayOffset(conf, U_("Pattern Editor"), U_("RowDisplayOffset"), 0) - , patternFont(conf, U_("Pattern Editor"), U_("Font"), FontSetting(PATTERNFONT_SMALL, 0)) - , patternFontDot(conf, U_("Pattern Editor"), U_("FontDot"), U_(".")) - , effectVisWidth(conf, U_("Pattern Editor"), U_("EffectVisWidth"), -1) - , effectVisHeight(conf, U_("Pattern Editor"), U_("EffectVisHeight"), -1) - , effectVisX(conf, U_("Pattern Editor"), U_("EffectVisX"), int32_min) - , effectVisY(conf, U_("Pattern Editor"), U_("EffectVisY"), int32_min) - , patternAccessibilityFormat(conf, U_("Pattern Editor"), U_("AccessibilityFormat"), _T("Row %row%, Channel %channel%, %column_type%: %column_description%")) - , patternAlwaysDrawWholePatternOnScrollSlow(conf, U_("Pattern Editor"), U_("AlwaysDrawWholePatternOnScrollSlow"), false) - , orderListOldDropBehaviour(conf, U_("Pattern Editor"), U_("OrderListOldDropBehaviour"), false) + , gbLoopSong(conf, UL_("Pattern Editor"), UL_("LoopSong"), true) + , gnPatternSpacing(conf, UL_("Pattern Editor"), UL_("Spacing"), 0) + , gbPatternVUMeters(conf, UL_("Pattern Editor"), UL_("VU-Meters"), true) + , gbPatternPluginNames(conf, UL_("Pattern Editor"), UL_("Plugin-Names"), true) + , gbPatternRecord(conf, UL_("Pattern Editor"), UL_("Record"), true) + , patternNoEditPopup(conf, UL_("Pattern Editor"), UL_("NoEditPopup"), false) + , patternStepCommands(conf, UL_("Pattern Editor"), UL_("EditStepAppliesToCommands"), false) + , m_dwPatternSetup(conf, UL_("Pattern Editor"), UL_("PatternSetup"), GetDefaultPatternSetup()) + , m_nRowHighlightMeasures(conf, UL_("Pattern Editor"), UL_("RowSpacing"), 16) + , m_nRowHighlightBeats(conf, UL_("Pattern Editor"), UL_("RowSpacing2"), 4) + , patternIgnoreSongTimeSignature(conf, UL_("Pattern Editor"), UL_("IgnoreSongTimeSignature"), false) + , recordQuantizeRows(conf, UL_("Pattern Editor"), UL_("RecordQuantize"), 0) + , gnAutoChordWaitTime(conf, UL_("Pattern Editor"), UL_("AutoChordWaitTime"), 60) + , orderlistMargins(conf, UL_("Pattern Editor"), UL_("DefaultSequenceMargins"), 0) + , rowDisplayOffset(conf, UL_("Pattern Editor"), UL_("RowDisplayOffset"), 0) + , patternFont(conf, UL_("Pattern Editor"), UL_("Font"), FontSetting(PATTERNFONT_SMALL, 0)) + , patternFontDot(conf, UL_("Pattern Editor"), UL_("FontDot"), UL_(".")) + , effectVisWidth(conf, UL_("Pattern Editor"), UL_("EffectVisWidth"), -1) + , effectVisHeight(conf, UL_("Pattern Editor"), UL_("EffectVisHeight"), -1) + , effectVisX(conf, UL_("Pattern Editor"), UL_("EffectVisX"), int32_min) + , effectVisY(conf, UL_("Pattern Editor"), UL_("EffectVisY"), int32_min) + , patternAccessibilityFormat(conf, UL_("Pattern Editor"), UL_("AccessibilityFormat"), _T("Row %row%, Channel %channel%, %column_type%: %column_description%")) + , patternAlwaysDrawWholePatternOnScrollSlow(conf, UL_("Pattern Editor"), UL_("AlwaysDrawWholePatternOnScrollSlow"), false) + , orderListOldDropBehaviour(conf, UL_("Pattern Editor"), UL_("OrderListOldDropBehaviour"), false) // Sample Editor - , m_SampleUndoBufferSize(conf, U_("Sample Editor"), U_("UndoBufferSize"), SampleUndoBufferSize()) - , sampleEditorKeyBehaviour(conf, U_("Sample Editor"), U_("KeyBehaviour"), seNoteOffOnNewKey) - , m_defaultSampleFormat(conf, U_("Sample Editor"), U_("DefaultFormat"), dfFLAC) - , m_followSamplePlayCursor(conf, U_("Sample Editor"), U_("FollowSamplePlayCursor"), FollowSamplePlayCursor::DoNotFollow) - , sampleEditorTimelineFormat(conf, U_("Sample Editor"), U_("TimelineFormat"), TimelineFormat::Seconds) - , sampleEditorDefaultResampler(conf, U_("Sample Editor"), U_("DefaultResampler"), SRCMODE_DEFAULT) - , m_nFinetuneStep(conf, U_("Sample Editor"), U_("FinetuneStep"), 10) - , m_FLACCompressionLevel(conf, U_("Sample Editor"), U_("FLACCompressionLevel"), 5) - , compressITI(conf, U_("Sample Editor"), U_("CompressITI"), true) - , m_MayNormalizeSamplesOnLoad(conf, U_("Sample Editor"), U_("MayNormalizeSamplesOnLoad"), true) - , previewInFileDialogs(conf, U_("Sample Editor"), U_("PreviewInFileDialogs"), false) - , cursorPositionInHex(conf, U_("Sample Editor"), U_("CursorPositionInHex"), false) + , m_SampleUndoBufferSize(conf, UL_("Sample Editor"), UL_("UndoBufferSize"), SampleUndoBufferSize()) + , sampleEditorKeyBehaviour(conf, UL_("Sample Editor"), UL_("KeyBehaviour"), seNoteOffOnNewKey) + , m_defaultSampleFormat(conf, UL_("Sample Editor"), UL_("DefaultFormat"), dfFLAC) + , m_followSamplePlayCursor(conf, UL_("Sample Editor"), UL_("FollowSamplePlayCursor"), FollowSamplePlayCursor::DoNotFollow) + , sampleEditorTimelineFormat(conf, UL_("Sample Editor"), UL_("TimelineFormat"), TimelineFormat::Seconds) + , sampleEditorDefaultResampler(conf, UL_("Sample Editor"), UL_("DefaultResampler"), SRCMODE_DEFAULT) + , m_nFinetuneStep(conf, UL_("Sample Editor"), UL_("FinetuneStep"), 10) + , m_FLACCompressionLevel(conf, UL_("Sample Editor"), UL_("FLACCompressionLevel"), 5) + , compressITI(conf, UL_("Sample Editor"), UL_("CompressITI"), true) + , m_MayNormalizeSamplesOnLoad(conf, UL_("Sample Editor"), UL_("MayNormalizeSamplesOnLoad"), true) + , previewInFileDialogs(conf, UL_("Sample Editor"), UL_("PreviewInFileDialogs"), false) + , cursorPositionInHex(conf, UL_("Sample Editor"), UL_("CursorPositionInHex"), false) // Export - , ExportDefaultToSoundcardSamplerate(conf, U_("Export"), U_("DefaultToSoundcardSamplerate"), true) - , ExportStreamEncoderSettings(conf, U_("Export")) - , ExportNormalize(conf, U_("Export"), U_("Normalize"), false) - , ExportClearPluginBuffers(conf, U_("Export"), U_("ClearPluginBuffers"), true) + , ExportDefaultToSoundcardSamplerate(conf, UL_("Export"), UL_("DefaultToSoundcardSamplerate"), true) + , ExportStreamEncoderSettings(conf, UL_("Export")) + , ExportNormalize(conf, UL_("Export"), UL_("Normalize"), false) + , ExportClearPluginBuffers(conf, UL_("Export"), UL_("ClearPluginBuffers"), true) // Components - , ComponentsLoadOnStartup(conf, U_("Components"), U_("LoadOnStartup"), ComponentManagerSettingsDefault().LoadOnStartup()) - , ComponentsKeepLoaded(conf, U_("Components"), U_("KeepLoaded"), ComponentManagerSettingsDefault().KeepLoaded()) + , ComponentsLoadOnStartup(conf, UL_("Components"), UL_("LoadOnStartup"), ComponentManagerSettingsDefault().LoadOnStartup()) + , ComponentsKeepLoaded(conf, UL_("Components"), UL_("KeepLoaded"), ComponentManagerSettingsDefault().KeepLoaded()) // AutoSave - , CreateBackupFiles(conf, U_("AutoSave"), U_("CreateBackupFiles"), true) - , AutosaveEnabled(conf, U_("AutoSave"), U_("Enabled"), true) - , AutosaveIntervalMinutes(conf, U_("AutoSave"), U_("IntervalMinutes"), 10) - , AutosaveHistoryDepth(conf, U_("AutoSave"), U_("BackupHistory"), 3) - , AutosaveUseOriginalPath(conf, U_("AutoSave"), U_("UseOriginalPath"), true) - , AutosavePath(conf, U_("AutoSave"), U_("Path"), mpt::common_directories::get_temp_directory()) + , CreateBackupFiles(conf, UL_("AutoSave"), UL_("CreateBackupFiles"), true) + , AutosaveEnabled(conf, UL_("AutoSave"), UL_("Enabled"), true) + , AutosaveIntervalMinutes(conf, UL_("AutoSave"), UL_("IntervalMinutes"), 10) + , AutosaveHistoryDepth(conf, UL_("AutoSave"), UL_("BackupHistory"), 3) + , AutosaveUseOriginalPath(conf, UL_("AutoSave"), UL_("UseOriginalPath"), true) + , AutosavePath(conf, UL_("AutoSave"), UL_("Path"), mpt::common_directories::get_temp_directory()) // Paths - , PathSongs(conf, U_("Paths"), U_("Songs_Directory"), mpt::PathString()) - , PathSamples(conf, U_("Paths"), U_("Samples_Directory"), mpt::PathString()) - , PathInstruments(conf, U_("Paths"), U_("Instruments_Directory"), mpt::PathString()) - , PathPlugins(conf, U_("Paths"), U_("Plugins_Directory"), mpt::PathString()) - , PathPluginPresets(conf, U_("Paths"), U_("Plugin_Presets_Directory"), mpt::PathString()) - , PathExport(conf, U_("Paths"), U_("Export_Directory"), mpt::PathString()) + , PathSongs(conf, UL_("Paths"), UL_("Songs_Directory"), mpt::PathString()) + , PathSamples(conf, UL_("Paths"), UL_("Samples_Directory"), mpt::PathString()) + , PathInstruments(conf, UL_("Paths"), UL_("Instruments_Directory"), mpt::PathString()) + , PathPlugins(conf, UL_("Paths"), UL_("Plugins_Directory"), mpt::PathString()) + , PathPluginPresets(conf, UL_("Paths"), UL_("Plugin_Presets_Directory"), mpt::PathString()) + , PathExport(conf, UL_("Paths"), UL_("Export_Directory"), mpt::PathString()) , PathTunings(theApp.GetConfigPath() + P_("tunings\\")) , PathUserTemplates(theApp.GetConfigPath() + P_("TemplateModules\\")) // Default template - , defaultTemplateFile(conf, U_("Paths"), U_("DefaultTemplate"), mpt::PathString()) - , defaultArtist(conf, U_("Misc"), U_("DefaultArtist"), mpt::getenv(U_("USERNAME")).value_or(U_(""))) + , defaultTemplateFile(conf, UL_("Paths"), UL_("DefaultTemplate"), mpt::PathString()) + , defaultArtist(conf, UL_("Misc"), UL_("DefaultArtist"), mpt::getenv(UL_("USERNAME")).value_or(UL_(""))) // MRU List - , mruListLength(conf, U_("Misc"), U_("MRUListLength"), 10) + , mruListLength(conf, UL_("Misc"), UL_("MRUListLength"), 10) // Plugins - , bridgeAllPlugins(conf, U_("VST Plugins"), U_("BridgeAllPlugins"), false) - , enableAutoSuspend(conf, U_("VST Plugins"), U_("EnableAutoSuspend"), false) - , midiMappingInPluginEditor(conf, U_("VST Plugins"), U_("EnableMidiMappingInEditor"), true) - , pluginProjectPath(conf, U_("VST Plugins"), U_("ProjectPath"), mpt::ustring()) - , vstHostProductString(conf, U_("VST Plugins"), U_("HostProductString"), "OpenMPT") - , vstHostVendorString(conf, U_("VST Plugins"), U_("HostVendorString"), "OpenMPT project") - , vstHostVendorVersion(conf, U_("VST Plugins"), U_("HostVendorVersion"), Version::Current().GetRawVersion()) + , bridgeAllPlugins(conf, UL_("VST Plugins"), UL_("BridgeAllPlugins"), false) + , enableAutoSuspend(conf, UL_("VST Plugins"), UL_("EnableAutoSuspend"), false) + , midiMappingInPluginEditor(conf, UL_("VST Plugins"), UL_("EnableMidiMappingInEditor"), true) + , pluginProjectPath(conf, UL_("VST Plugins"), UL_("ProjectPath"), mpt::ustring()) + , vstHostProductString(conf, UL_("VST Plugins"), UL_("HostProductString"), "OpenMPT") + , vstHostVendorString(conf, UL_("VST Plugins"), UL_("HostVendorString"), "OpenMPT project") + , vstHostVendorVersion(conf, UL_("VST Plugins"), UL_("HostVendorVersion"), Version::Current().GetRawVersion()) // Broken Plugins Workarounds - , BrokenPluginsWorkaroundVSTMaskAllCrashes(conf, U_("Broken Plugins Workarounds"), U_("VSTMaskAllCrashes"), true) // TODO: really should be false - , BrokenPluginsWorkaroundVSTNeverUnloadAnyPlugin(conf, U_("Broken Plugins Workarounds"), U_("VSTNeverUnloadAnyPlugin"), false) + , BrokenPluginsWorkaroundVSTMaskAllCrashes(conf, UL_("Broken Plugins Workarounds"), UL_("VSTMaskAllCrashes"), true) // TODO: really should be false + , BrokenPluginsWorkaroundVSTNeverUnloadAnyPlugin(conf, UL_("Broken Plugins Workarounds"), UL_("VSTNeverUnloadAnyPlugin"), false) #if defined(MPT_ENABLE_UPDATE) // Update - , UpdateEnabled(conf, U_("Update"), U_("Enabled"), true) - , UpdateInstallAutomatically(conf, U_("Update"), U_("InstallAutomatically"), false) - , UpdateLastUpdateCheck(conf, U_("Update"), U_("LastUpdateCheck"), mpt::Date::Unix{}) - , UpdateUpdateCheckPeriod_DEPRECATED(conf, U_("Update"), U_("UpdateCheckPeriod"), 7) - , UpdateIntervalDays(conf, U_("Update"), U_("UpdateCheckIntervalDays"), 7) - , UpdateChannel(conf, U_("Update"), U_("Channel"), UpdateChannelRelease) - , UpdateUpdateURL_DEPRECATED(conf, U_("Update"), U_("UpdateURL"), U_("https://update.openmpt.org/check/$VERSION/$GUID")) - , UpdateAPIURL(conf, U_("Update"), U_("APIURL"), CUpdateCheck::GetDefaultAPIURL()) - , UpdateStatisticsConsentAsked(conf, U_("Update"), U_("StatistisConsentAsked"), false) - , UpdateStatistics(conf, U_("Update"), U_("Statistis"), false) - , UpdateSendGUID_DEPRECATED(conf, U_("Update"), U_("SendGUID"), false) - , UpdateShowUpdateHint(conf, U_("Update"), U_("ShowUpdateHint"), true) - , UpdateIgnoreVersion(conf, U_("Update"), U_("IgnoreVersion"), _T("")) - , UpdateSkipSignatureVerificationUNSECURE(conf, U_("Update"), U_("SkipSignatureVerification"), false) - , UpdateSigningKeysRootAnchors(conf, U_("Update"), U_("SigningKeysRootAnchors"), CUpdateCheck::GetDefaultUpdateSigningKeysRootAnchors()) + , UpdateEnabled(conf, UL_("Update"), UL_("Enabled"), true) + , UpdateInstallAutomatically(conf, UL_("Update"), UL_("InstallAutomatically"), false) + , UpdateLastUpdateCheck(conf, UL_("Update"), UL_("LastUpdateCheck"), mpt::Date::Unix{}) + , UpdateUpdateCheckPeriod_DEPRECATED(conf, UL_("Update"), UL_("UpdateCheckPeriod"), 7) + , UpdateIntervalDays(conf, UL_("Update"), UL_("UpdateCheckIntervalDays"), 7) + , UpdateChannel(conf, UL_("Update"), UL_("Channel"), UpdateChannelRelease) + , UpdateUpdateURL_DEPRECATED(conf, UL_("Update"), UL_("UpdateURL"), UL_("https://update.openmpt.org/check/$VERSION/$GUID")) + , UpdateAPIURL(conf, UL_("Update"), UL_("APIURL"), CUpdateCheck::GetDefaultAPIURL()) + , UpdateStatisticsConsentAsked(conf, UL_("Update"), UL_("StatistisConsentAsked"), false) + , UpdateStatistics(conf, UL_("Update"), UL_("Statistis"), false) + , UpdateSendGUID_DEPRECATED(conf, UL_("Update"), UL_("SendGUID"), false) + , UpdateShowUpdateHint(conf, UL_("Update"), UL_("ShowUpdateHint"), true) + , UpdateIgnoreVersion(conf, UL_("Update"), UL_("IgnoreVersion"), _T("")) + , UpdateSkipSignatureVerificationUNSECURE(conf, UL_("Update"), UL_("SkipSignatureVerification"), false) + , UpdateSigningKeysRootAnchors(conf, UL_("Update"), UL_("SigningKeysRootAnchors"), CUpdateCheck::GetDefaultUpdateSigningKeysRootAnchors()) #endif // MPT_ENABLE_UPDATE // Wine suppport - , WineSupportEnabled(conf, U_("WineSupport"), U_("Enabled"), false) - , WineSupportAlwaysRecompile(conf, U_("WineSupport"), U_("AlwaysRecompile"), false) - , WineSupportAskCompile(conf, U_("WineSupport"), U_("AskCompile"), false) - , WineSupportCompileVerbosity(conf, U_("WineSupport"), U_("CompileVerbosity"), 2) // 0=silent 1=silentmake 2=progresswindow 3=standard 4=verbosemake 5=veryverbosemake 6=msgboxes - , WineSupportForeignOpenMPT(conf, U_("WineSupport"), U_("ForeignOpenMPT"), false) - , WineSupportAllowUnknownHost(conf, U_("WineSupport"), U_("AllowUnknownHost"), false) - , WineSupportEnablePulseAudio(conf, U_("WineSupport"), U_("EnablePulseAudio"), 1) - , WineSupportEnablePortAudio(conf, U_("WineSupport"), U_("EnablePortAudio"), 1) - , WineSupportEnableRtAudio(conf, U_("WineSupport"), U_("EnableRtAudio"), 1) + , WineSupportEnabled(conf, UL_("WineSupport"), UL_("Enabled"), false) + , WineSupportAlwaysRecompile(conf, UL_("WineSupport"), UL_("AlwaysRecompile"), false) + , WineSupportAskCompile(conf, UL_("WineSupport"), UL_("AskCompile"), false) + , WineSupportCompileVerbosity(conf, UL_("WineSupport"), UL_("CompileVerbosity"), 2) // 0=silent 1=silentmake 2=progresswindow 3=standard 4=verbosemake 5=veryverbosemake 6=msgboxes + , WineSupportForeignOpenMPT(conf, UL_("WineSupport"), UL_("ForeignOpenMPT"), false) + , WineSupportAllowUnknownHost(conf, UL_("WineSupport"), UL_("AllowUnknownHost"), false) + , WineSupportEnablePulseAudio(conf, UL_("WineSupport"), UL_("EnablePulseAudio"), 1) + , WineSupportEnablePortAudio(conf, UL_("WineSupport"), UL_("EnablePortAudio"), 1) + , WineSupportEnableRtAudio(conf, UL_("WineSupport"), UL_("EnableRtAudio"), 1) { // Effects #ifndef NO_DSP - m_MegaBassSettings.m_nXBassDepth = conf.Read<int32>(U_("Effects"), U_("XBassDepth"), m_MegaBassSettings.m_nXBassDepth); - m_MegaBassSettings.m_nXBassRange = conf.Read<int32>(U_("Effects"), U_("XBassRange"), m_MegaBassSettings.m_nXBassRange); + m_MegaBassSettings.m_nXBassDepth = conf.Read<int32>(UL_("Effects"), UL_("XBassDepth"), m_MegaBassSettings.m_nXBassDepth); + m_MegaBassSettings.m_nXBassRange = conf.Read<int32>(UL_("Effects"), UL_("XBassRange"), m_MegaBassSettings.m_nXBassRange); #endif #ifndef NO_REVERB - m_ReverbSettings.m_nReverbDepth = conf.Read<int32>(U_("Effects"), U_("ReverbDepth"), m_ReverbSettings.m_nReverbDepth); - m_ReverbSettings.m_nReverbType = conf.Read<int32>(U_("Effects"), U_("ReverbType"), m_ReverbSettings.m_nReverbType); + m_ReverbSettings.m_nReverbDepth = conf.Read<int32>(UL_("Effects"), UL_("ReverbDepth"), m_ReverbSettings.m_nReverbDepth); + m_ReverbSettings.m_nReverbType = conf.Read<int32>(UL_("Effects"), UL_("ReverbType"), m_ReverbSettings.m_nReverbType); #endif #ifndef NO_DSP - m_SurroundSettings.m_nProLogicDepth = conf.Read<int32>(U_("Effects"), U_("ProLogicDepth"), m_SurroundSettings.m_nProLogicDepth); - m_SurroundSettings.m_nProLogicDelay = conf.Read<int32>(U_("Effects"), U_("ProLogicDelay"), m_SurroundSettings.m_nProLogicDelay); + m_SurroundSettings.m_nProLogicDepth = conf.Read<int32>(UL_("Effects"), UL_("ProLogicDepth"), m_SurroundSettings.m_nProLogicDepth); + m_SurroundSettings.m_nProLogicDelay = conf.Read<int32>(UL_("Effects"), UL_("ProLogicDelay"), m_SurroundSettings.m_nProLogicDelay); #endif #ifndef NO_EQ - m_EqSettings = conf.Read<EQPreset>(U_("Effects"), U_("EQ_Settings"), FlatEQPreset); + m_EqSettings = conf.Read<EQPreset>(UL_("Effects"), UL_("EQ_Settings"), FlatEQPreset); const EQPreset userPresets[] = { FlatEQPreset, @@ -386,24 +386,24 @@ { "User 3", {16,16,16,16,16,16}, { 250, 450, 900, 2000, 5000, 10000 } } }; - m_EqUserPresets[0] = conf.Read<EQPreset>(U_("Effects"), U_("EQ_User1"), userPresets[0]); - m_EqUserPresets[1] = conf.Read<EQPreset>(U_("Effects"), U_("EQ_User2"), userPresets[1]); - m_EqUserPresets[2] = conf.Read<EQPreset>(U_("Effects"), U_("EQ_User3"), userPresets[2]); - m_EqUserPresets[3] = conf.Read<EQPreset>(U_("Effects"), U_("EQ_User4"), userPresets[3]); + m_EqUserPresets[0] = conf.Read<EQPreset>(UL_("Effects"), UL_("EQ_User1"), userPresets[0]); + m_EqUserPresets[1] = conf.Read<EQPreset>(UL_("Effects"), UL_("EQ_User2"), userPresets[1]); + m_EqUserPresets[2] = conf.Read<EQPreset>(UL_("Effects"), UL_("EQ_User3"), userPresets[2]); + m_EqUserPresets[3] = conf.Read<EQPreset>(UL_("Effects"), UL_("EQ_User4"), userPresets[3]); #endif #ifndef NO_DSP - m_BitCrushSettings.m_Bits = conf.Read<int32>(U_("Effects"), U_("BitCrushBits"), m_BitCrushSettings.m_Bits); + m_BitCrushSettings.m_Bits = conf.Read<int32>(UL_("Effects"), UL_("BitCrushBits"), m_BitCrushSettings.m_Bits); #endif // Display (Colors) GetDefaultColourScheme(rgbCustomColors); for(int ncol = 0; ncol < MAX_MODCOLORS; ncol++) { const mpt::ustring colorName = MPT_UFORMAT("Color{}")(mpt::ufmt::dec0<2>(ncol)); - rgbCustomColors[ncol] = conf.Read<uint32>(U_("Display"), colorName, rgbCustomColors[ncol]); + rgbCustomColors[ncol] = conf.Read<uint32>(UL_("Display"), colorName, rgbCustomColors[ncol]); } // Paths - m_szKbdFile = conf.Read<mpt::PathString>(U_("Paths"), U_("Key_Config_File"), mpt::PathString()); - conf.Forget(U_("Paths"), U_("Key_Config_File")); + m_szKbdFile = conf.Read<mpt::PathString>(UL_("Paths"), UL_("Key_Config_File"), mpt::PathString()); + conf.Forget(UL_("Paths"), UL_("Key_Config_File")); // init old and messy stuff: @@ -434,7 +434,7 @@ // load old and messy stuff: - PatternClipboard::SetClipboardSize(conf.Read<int32>(U_("Pattern Editor"), U_("NumClipboards"), mpt::saturate_cast<int32>(PatternClipboard::GetClipboardSize()))); + PatternClipboard::SetClipboardSize(conf.Read<int32>(UL_("Pattern Editor"), UL_("NumClipboards"), mpt::saturate_cast<int32>(PatternClipboard::GetClipboardSize()))); // Chords LoadChords(Chords); @@ -444,11 +444,11 @@ theApp.GetDefaultMidiMacro(macros); for(int i = 0; i < kSFxMacros; i++) { - macros.SFx[i] = conf.Read<std::string>(U_("Zxx Macros"), MPT_UFORMAT("SF{}")(mpt::ufmt::HEX(i)), macros.SFx[i]); + macros.SFx[i] = conf.Read<std::string>(UL_("Zxx Macros"), MPT_UFORMAT("SF{}")(mpt::ufmt::HEX(i)), macros.SFx[i]); } for(int i = 0; i < kZxxMacros; i++) { - macros.Zxx[i] = conf.Read<std::string>(U_("Zxx Macros"), MPT_UFORMAT("Z{}")(mpt::ufmt::HEX0<2>(i | 0x80)), macros.Zxx[i]); + macros.Zxx[i] = conf.Read<std::string>(UL_("Zxx Macros"), MPT_UFORMAT("Z{}")(mpt::ufmt::HEX0<2>(i | 0x80)), macros.Zxx[i]); } @@ -459,7 +459,7 @@ { mpt::ustring key = MPT_UFORMAT("File{}")(i); - mpt::PathString path = theApp.PathInstallRelativeToAbsolute(conf.Read<mpt::PathString>(U_("Recent File List"), key, mpt::PathString())); + mpt::PathString path = theApp.PathInstallRelativeToAbsolute(conf.Read<mpt::PathString>(UL_("Recent File List"), key, mpt::PathString())); if(!path.empty()) { mruFiles.push_back(path); @@ -485,14 +485,14 @@ } if(storedVersion < MPT_V("1.30.00.24")) { - BrokenPluginsWorkaroundVSTNeverUnloadAnyPlugin = !conf.Read<bool>(U_("VST Plugins"), U_("FullyUnloadPlugins"), true); - conf.Remove(U_("VST Plugins"), U_("FullyUnloadPlugins")); + BrokenPluginsWorkaroundVSTNeverUnloadAnyPlugin = !conf.Read<bool>(UL_("VST Plugins"), UL_("FullyUnloadPlugins"), true); + conf.Remove(UL_("VST Plugins"), UL_("FullyUnloadPlugins")); } // Sound Settings if(storedVersion < MPT_V("1.22.07.30")) { - if(conf.Read<bool>(U_("Sound Settings"), U_("KeepDeviceOpen"), false)) + if(conf.Read<bool>(UL_("Sound Settings"), UL_("KeepDeviceOpen"), false)) { m_SoundSettingsStopMode = SoundDeviceStopModePlaying; } else @@ -513,15 +513,15 @@ } if(storedVersion < MPT_V("1.22.07.04")) { - m_SoundDeviceID_DEPRECATED = conf.Read<SoundDevice::Legacy::ID>(U_("Sound Settings"), U_("WaveDevice"), SoundDevice::Legacy::ID()); - Setting<uint32> m_BufferLength_DEPRECATED(conf, U_("Sound Settings"), U_("BufferLength"), 50); - Setting<uint32> m_LatencyMS(conf, U_("Sound Settings"), U_("Latency"), mpt::saturate_round<int32>(SoundDevice::Settings().Latency * 1000.0)); - Setting<uint32> m_UpdateIntervalMS(conf, U_("Sound Settings"), U_("UpdateInterval"), mpt::saturate_round<int32>(SoundDevice::Settings().UpdateInterval * 1000.0)); - Setting<SampleFormat> m_SampleFormat(conf, U_("Sound Settings"), U_("BitsPerSample"), SoundDevice::Settings().sampleFormat); - Setting<bool> m_SoundDeviceExclusiveMode(conf, U_("Sound Settings"), U_("ExclusiveMode"), SoundDevice::Settings().ExclusiveMode); - Setting<bool> m_SoundDeviceBoostThreadPriority(conf, U_("Sound Settings"), U_("BoostThreadPriority"), SoundDevice::Settings().BoostThreadPriority); - Setting<bool> m_SoundDeviceUseHardwareTiming(conf, U_("Sound Settings"), U_("UseHardwareTiming"), SoundDevice::Settings().UseHardwareTiming); - Setting<SoundDevice::ChannelMapping> m_SoundDeviceChannelMapping(conf, U_("Sound Settings"), U_("ChannelMapping"), SoundDevice::Settings().Channels); + m_SoundDeviceID_DEPRECATED = conf.Read<SoundDevice::Legacy::ID>(UL_("Sound Settings"), UL_("WaveDevice"), SoundDevice::Legacy::ID()); + Setting<uint32> m_BufferLength_DEPRECATED(conf, UL_("Sound Settings"), UL_("BufferLength"), 50); + Setting<uint32> m_LatencyMS(conf, UL_("Sound Settings"), UL_("Latency"), mpt::saturate_round<int32>(SoundDevice::Settings().Latency * 1000.0)); + Setting<uint32> m_UpdateIntervalMS(conf, UL_("Sound Settings"), UL_("UpdateInterval"), mpt::saturate_round<int32>(SoundDevice::Settings().UpdateInterval * 1000.0)); + Setting<SampleFormat> m_SampleFormat(conf, UL_("Sound Settings"), UL_("BitsPerSample"), SoundDevice::Settings().sampleFormat); + Setting<bool> m_SoundDeviceExclusiveMode(conf, UL_("Sound Settings"), UL_("ExclusiveMode"), SoundDevice::Settings().ExclusiveMode); + Setting<bool> m_SoundDeviceBoostThreadPriority(conf, UL_("Sound Settings"), UL_("BoostThreadPriority"), SoundDevice::Settings().BoostThreadPriority); + Setting<bool> m_SoundDeviceUseHardwareTiming(conf, UL_("Sound Settings"), UL_("UseHardwareTiming"), SoundDevice::Settings().UseHardwareTiming); + Setting<SoundDevice::ChannelMapping> m_SoundDeviceChannelMapping(conf, UL_("Sound Settings"), UL_("ChannelMapping"), SoundDevice::Settings().Channels); if(storedVersion < MPT_V("1.21.01.26")) { if(m_BufferLength_DEPRECATED != 0) @@ -551,7 +551,7 @@ } if(storedVersion < MPT_V("1.22.07.03")) { - m_SoundDeviceChannelMapping = SoundDevice::ChannelMapping::BaseChannel(MixerOutputChannels, conf.Read<int>(U_("Sound Settings"), U_("ASIOBaseChannel"), 0)); + m_SoundDeviceChannelMapping = SoundDevice::ChannelMapping::BaseChannel(MixerOutputChannels, conf.Read<int>(UL_("Sound Settings"), UL_("ASIOBaseChannel"), 0)); } m_SoundDeviceSettingsDefaults.Latency = m_LatencyMS / 1000.0; m_SoundDeviceSettingsDefaults.UpdateInterval = m_UpdateIntervalMS / 1000.0; @@ -595,15 +595,15 @@ if(storedVersion < MPT_V("1.20.00.22")) { MixerSettings settings = GetMixerSettings(); - settings.SetVolumeRampUpSamples(conf.Read<int32>(U_("Sound Settings"), U_("VolumeRampSamples"), 42)); - settings.SetVolumeRampDownSamples(conf.Read<int32>(U_("Sound Settings"), U_("VolumeRampSamples"), 42)); + settings.SetVolumeRampUpSamples(conf.Read<int32>(UL_("Sound Settings"), UL_("VolumeRampSamples"), 42)); + settings.SetVolumeRampDownSamples(conf.Read<int32>(UL_("Sound Settings"), UL_("VolumeRampSamples"), 42)); SetMixerSettings(settings); - conf.Remove(U_("Sound Settings"), U_("VolumeRampSamples")); + conf.Remove(UL_("Sound Settings"), UL_("VolumeRampSamples")); } else if(storedVersion < MPT_V("1.22.07.18")) { MixerSettings settings = GetMixerSettings(); - settings.SetVolumeRampUpSamples(conf.Read<int32>(U_("Sound Settings"), U_("VolumeRampUpSamples"), MixerSettings().GetVolumeRampUpSamples())); - settings.SetVolumeRampDownSamples(conf.Read<int32>(U_("Sound Settings"), U_("VolumeRampDownSamples"), MixerSettings().GetVolumeRampDownSamples())); + settings.SetVolumeRampUpSamples(conf.Read<int32>(UL_("Sound Settings"), UL_("VolumeRampUpSamples"), MixerSettings().GetVolumeRampUpSamples())); + settings.SetVolumeRampDownSamples(conf.Read<int32>(UL_("Sound Settings"), UL_("VolumeRampDownSamples"), MixerSettings().GetVolumeRampDownSamples())); SetMixerSettings(settings); } Limit(ResamplerCutoffPercent, 0, 100); @@ -657,7 +657,7 @@ } if(storedVersion < MPT_V("1.24.01.04")) { - commentsFont = FontSetting(U_("Courier New"), (m_dwPatternSetup & 0x02) ? 120 : 90); + commentsFont = FontSetting(UL_("Courier New"), (m_dwPatternSetup & 0x02) ? 120 : 90); patternFont = FontSetting((m_dwPatternSetup & 0x08) ? PATTERNFONT_SMALL : PATTERNFONT_LARGE, 0); m_dwPatternSetup &= ~(0x08 | 0x02); } @@ -682,8 +682,8 @@ if(storedVersion < MPT_V("1.30.00.38")) { { - conf.Write<Encoder::Mode>(U_("Export"), U_("FLAC_Mode"), Encoder::ModeLossless); - const int oldformat = conf.Read<int>(U_("Export"), U_("FLAC_Format"), 1); + conf.Write<Encoder::Mode>(UL_("Export"), UL_("FLAC_Mode"), Encoder::ModeLossless); + const int oldformat = conf.Read<int>(UL_("Export"), UL_("FLAC_Format"), 1); Encoder::Format newformat = { Encoder::Format::Encoding::Integer, 24, mpt::get_endian() }; if (oldformat >= 0) { @@ -700,12 +700,12 @@ break; } } - conf.Write<Encoder::Format>(U_("Export"), U_("FLAC_Format2"), newformat); - conf.Forget(U_("Export"), U_("FLAC_Format")); + conf.Write<Encoder::Format>(UL_("Export"), UL_("FLAC_Format2"), newformat); + conf.Forget(UL_("Export"), UL_("FLAC_Format")); } { - conf.Write<Encoder::Mode>(U_("Export"), U_("Wave_Mode"), Encoder::ModeLossless); - const int oldformat = conf.Read<int>(U_("Export"), U_("Wave_Format"), 1); + conf.Write<Encoder::Mode>(UL_("Export"), UL_("Wave_Mode"), Encoder::ModeLossless); + const int oldformat = conf.Read<int>(UL_("Export"), UL_("Wave_Format"), 1); Encoder::Format newformat = { Encoder::Format::Encoding::Float, 32, mpt::endian::little }; if (oldformat >= 0) { @@ -731,12 +731,12 @@ break; } } - conf.Write<Encoder::Format>(U_("Export"), U_("Wave_Format2"), newformat); - conf.Forget(U_("Export"), U_("Wave_Format")); + conf.Write<Encoder::Format>(UL_("Export"), UL_("Wave_Format2"), newformat); + conf.Forget(UL_("Export"), UL_("Wave_Format")); } { - conf.Write<Encoder::Mode>(U_("Export"), U_("AU_Mode"), Encoder::ModeLossless); - const int oldformat = conf.Read<int>(U_("Export"), U_("AU_Format"), 1); + conf.Write<Encoder::Mode>(UL_("Export"), UL_("AU_Mode"), Encoder::ModeLossless); + const int oldformat = conf.Read<int>(UL_("Export"), UL_("AU_Format"), 1); Encoder::Format newformat = { Encoder::Format::Encoding::Float, 32, mpt::endian::big }; if(oldformat >= 0) { @@ -762,12 +762,12 @@ break; } } - conf.Write<Encoder::Format>(U_("Export"), U_("AU_Format2"), newformat); - conf.Forget(U_("Export"), U_("AU_Format")); + conf.Write<Encoder::Format>(UL_("Export"), UL_("AU_Format2"), newformat); + conf.Forget(UL_("Export"), UL_("AU_Format")); } { - conf.Write<Encoder::Mode>(U_("Export"), U_("RAW_Mode"), Encoder::ModeLossless); - const int oldformat = conf.Read<int>(U_("Export"), U_("RAW_Format"), 1); + conf.Write<Encoder::Mode>(UL_("Export"), UL_("RAW_Mode"), Encoder::ModeLossless); + const int oldformat = conf.Read<int>(UL_("Export"), UL_("RAW_Format"), 1); Encoder::Format newformat = { Encoder::Format::Encoding::Float, 32, mpt::get_endian() }; if(oldformat >= 0) { @@ -796,8 +796,8 @@ break; } } - conf.Write<Encoder::Format>(U_("Export"), U_("RAW_Format2"), newformat); - conf.Forget(U_("Export"), U_("RAW_Format")); + conf.Write<Encoder::Format>(UL_("Export"), UL_("RAW_Format2"), newformat); + conf.Forget(UL_("Export"), UL_("RAW_Format")); } } @@ -1011,7 +1011,7 @@ mpt::PathString fn = PathTunings.GetDefaultDir() + P_("Built-in\\12TET.tun"); if(!mpt::native_fs{}.exists(fn)) { - std::unique_ptr<CTuning> pT = CSoundFile::CreateTuning12TET(U_("12TET")); + std::unique_ptr<CTuning> pT = CSoundFile::CreateTuning12TET(UL_("12TET")); mpt::IO::SafeOutputFile sf(fn, std::ios::binary, mpt::IO::FlushMode::Full); pT->Serialize(sf); } @@ -1020,7 +1020... [truncated message content] |
|
From: <sv...@op...> - 2024-11-01 22:47:54
|
Author: sagamusix Date: Fri Nov 1 23:47:42 2024 New Revision: 22058 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22058 Log: Merged revision(s) 22055-22056 from trunk/OpenMPT: [Fix] MOD: Also enable ProTracker-compatible tremolo ramp waveform for M!K! modules. ........ [Imp] Warn when Startrekker AM companion file for synthesized instruments is most likely missing. ........ Modified: branches/OpenMPT-1.31/ (props changed) branches/OpenMPT-1.31/soundlib/Load_mod.cpp Modified: branches/OpenMPT-1.31/soundlib/Load_mod.cpp ============================================================================== --- branches/OpenMPT-1.31/soundlib/Load_mod.cpp Fri Nov 1 23:42:41 2024 (r22057) +++ branches/OpenMPT-1.31/soundlib/Load_mod.cpp Fri Nov 1 23:47:42 2024 (r22058) @@ -1072,6 +1072,7 @@ // Reading patterns Patterns.ResizeArray(numPatterns); + std::bitset<32> referencedSamples; for(PATTERNINDEX pat = 0; pat < numPatterns; pat++) { ModCommand *rowBase = nullptr; @@ -1179,6 +1180,8 @@ if(m.instr != 0) { lastInstrument[chn] = m.instr; + if(isStartrekker) + referencedSamples.set(m.instr & 0x1F); } } if(hasSpeedOnRow && hasTempoOnRow) @@ -1215,7 +1218,7 @@ { m_SongFlags.set(SONG_ISAMIGA); } - if(isGenericMultiChannel || isMdKd) + if(isGenericMultiChannel || isMdKd || IsMagic(magic, "M!K!")) { m_playBehaviour.set(kFT2MODTremoloRampWaveform); } @@ -1316,7 +1319,7 @@ m_nInstruments = 31; #endif - for(SAMPLEINDEX smp = 1; smp <= m_nInstruments; smp++) + for(SAMPLEINDEX smp = 1; smp <= GetNumInstruments(); smp++) { // For Startrekker AM synthesis, we need instrument envelopes. ModInstrument *ins = AllocateInstrument(smp, smp); @@ -1336,6 +1339,28 @@ // This extra padding is probably present to have identical block sizes for AM and FM instruments. amData.Skip(120 - sizeof(AMInstrument)); } + + if(!m_nInstruments) + { + uint8 emptySampleReferences = 0; + for(SAMPLEINDEX smp = 1; smp <= 31; smp++) + { + if(referencedSamples[smp] && !Samples[smp].nLength) + { + if(++emptySampleReferences > 1) + { + mpt::ustring filenameHint; + if(file.GetOptionalFileName()) + { + const auto filename = file.GetOptionalFileName()->GetFilename().ToUnicode(); + filenameHint = MPT_UFORMAT(" ({}.nt or {}.as)")(filename, filename); + } + AddToLog(LogWarning, MPT_UFORMAT("This Startrekker AM file is most likely missing its companion file{}. Synthesized instruments will not play.")(filenameHint)); + break; + } + } + } + } } #endif // MPT_EXTERNAL_SAMPLES || MPT_BUILD_FUZZER |
3 messages has been excluded from this view by a project administrator.
