Menu
▾
▴
modplug-svn-commit — OpenMPT subversion commit notifications
You can subscribe to this list here.
| 2006 |
Jan
|
Feb
|
Mar
(1) |
Apr
(1) |
May
|
Jun
(1) |
Jul
|
Aug
(10) |
Sep
|
Oct
|
Nov
|
Dec
(3) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2007 |
Jan
(1) |
Feb
(2) |
Mar
(3) |
Apr
(2) |
May
(10) |
Jun
(2) |
Jul
(1) |
Aug
|
Sep
|
Oct
|
Nov
(3) |
Dec
|
| 2008 |
Jan
(6) |
Feb
(4) |
Mar
(5) |
Apr
(2) |
May
(1) |
Jun
(1) |
Jul
(4) |
Aug
(6) |
Sep
(2) |
Oct
(9) |
Nov
(1) |
Dec
(4) |
| 2009 |
Jan
(9) |
Feb
(2) |
Mar
(2) |
Apr
(2) |
May
(6) |
Jun
(18) |
Jul
(33) |
Aug
(39) |
Sep
(33) |
Oct
(24) |
Nov
(23) |
Dec
(22) |
| 2010 |
Jan
(29) |
Feb
(32) |
Mar
(51) |
Apr
(17) |
May
(31) |
Jun
(21) |
Jul
(32) |
Aug
(28) |
Sep
(35) |
Oct
(27) |
Nov
(11) |
Dec
(13) |
| 2011 |
Jan
(14) |
Feb
(13) |
Mar
(27) |
Apr
(27) |
May
(28) |
Jun
(20) |
Jul
(43) |
Aug
(52) |
Sep
(66) |
Oct
(61) |
Nov
(11) |
Dec
(8) |
| 2012 |
Jan
(20) |
Feb
(30) |
Mar
(38) |
Apr
(21) |
May
(33) |
Jun
(21) |
Jul
(25) |
Aug
(9) |
Sep
(24) |
Oct
(42) |
Nov
(27) |
Dec
(41) |
| 2013 |
Jan
(20) |
Feb
(35) |
Mar
(156) |
Apr
(298) |
May
(258) |
Jun
(201) |
Jul
(105) |
Aug
(60) |
Sep
(193) |
Oct
(245) |
Nov
(280) |
Dec
(194) |
| 2014 |
Jan
(63) |
Feb
(202) |
Mar
(200) |
Apr
(23) |
May
(53) |
Jun
(105) |
Jul
(18) |
Aug
(26) |
Sep
(110) |
Oct
(187) |
Nov
(97) |
Dec
(74) |
| 2015 |
Jan
(45) |
Feb
(55) |
Mar
(116) |
Apr
(116) |
May
(193) |
Jun
(164) |
Jul
(50) |
Aug
(111) |
Sep
(98) |
Oct
(71) |
Nov
(103) |
Dec
(63) |
| 2016 |
Jan
(33) |
Feb
(101) |
Mar
(182) |
Apr
(139) |
May
(140) |
Jun
(103) |
Jul
(165) |
Aug
(286) |
Sep
(208) |
Oct
(127) |
Nov
(97) |
Dec
(54) |
| 2017 |
Jan
(64) |
Feb
(335) |
Mar
(202) |
Apr
(212) |
May
(139) |
Jun
(127) |
Jul
(294) |
Aug
(154) |
Sep
(170) |
Oct
(152) |
Nov
(156) |
Dec
(62) |
| 2018 |
Jan
(168) |
Feb
(237) |
Mar
(196) |
Apr
(174) |
May
(174) |
Jun
(161) |
Jul
(127) |
Aug
(88) |
Sep
(149) |
Oct
(66) |
Nov
(52) |
Dec
(135) |
| 2019 |
Jan
(146) |
Feb
(126) |
Mar
(104) |
Apr
(58) |
May
(60) |
Jun
(28) |
Jul
(197) |
Aug
(129) |
Sep
(141) |
Oct
(148) |
Nov
(63) |
Dec
(100) |
| 2020 |
Jan
(74) |
Feb
(37) |
Mar
(59) |
Apr
(154) |
May
(194) |
Jun
(133) |
Jul
(313) |
Aug
(197) |
Sep
(49) |
Oct
(162) |
Nov
(143) |
Dec
(57) |
| 2021 |
Jan
(120) |
Feb
(107) |
Mar
(314) |
Apr
(157) |
May
(524) |
Jun
(169) |
Jul
(72) |
Aug
(133) |
Sep
(135) |
Oct
(146) |
Nov
(198) |
Dec
(325) |
| 2022 |
Jan
(409) |
Feb
(249) |
Mar
(138) |
Apr
(95) |
May
(102) |
Jun
(221) |
Jul
(66) |
Aug
(120) |
Sep
(192) |
Oct
(131) |
Nov
(53) |
Dec
(171) |
| 2023 |
Jan
(357) |
Feb
(82) |
Mar
(168) |
Apr
(218) |
May
(196) |
Jun
(86) |
Jul
(115) |
Aug
(49) |
Sep
(190) |
Oct
(102) |
Nov
(45) |
Dec
(76) |
| 2024 |
Jan
(86) |
Feb
(50) |
Mar
(324) |
Apr
(209) |
May
(197) |
Jun
(232) |
Jul
(194) |
Aug
(247) |
Sep
(219) |
Oct
(266) |
Nov
(328) |
Dec
(304) |
| 2025 |
Jan
(191) |
Feb
(115) |
Mar
(137) |
Apr
(32) |
May
(126) |
Jun
(403) |
Jul
(213) |
Aug
(184) |
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <sv...@op...> - 2024-04-28 18:04:01
|
Author: manx Date: Sun Apr 28 20:03:49 2024 New Revision: 20680 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20680 Log: [Imp] build: CI: GitHub: Fedora: Add matrix build for dependencies. Modified: trunk/OpenMPT/.github/workflows/Fedora-Makefile.yml Modified: trunk/OpenMPT/.github/workflows/Fedora-Makefile.yml ============================================================================== --- trunk/OpenMPT/.github/workflows/Fedora-Makefile.yml Sun Apr 28 19:29:25 2024 (r20679) +++ trunk/OpenMPT/.github/workflows/Fedora-Makefile.yml Sun Apr 28 20:03:49 2024 (r20680) @@ -6,26 +6,34 @@ pull_request: branches: [ master ] -concurrency: - group: ${{ github.ref }}-${{ github.workflow }} - cancel-in-progress: true - jobs: build: + strategy: + fail-fast: false + matrix: + include: + - { deps: sys } + - { deps: local } + - { deps: small } + + concurrency: + group: ${{ github.ref }}-${{ github.workflow }}-${{matrix.deps}} + cancel-in-progress: true + runs-on: ubuntu-latest container: image: fedora:latest steps: - - name: install dependencies + - name: Install dependencies run: dnf -y upgrade --refresh && dnf -y install subversion perl-XML-XPath git mawk zip unzip p7zip xz make binutils gcc gcc-g++ clang pcc pkgconf help2man doxygen autoconf autoconf-archive automake libtool ccache zlib-devel mpg123-devel libogg-devel libvorbis-devel portaudio-devel pulseaudio-libs-devel SDL2-devel flac-devel libsndfile-devel libtool-ltdl-devel - - name: checkout + - name: Checkout uses: actions/checkout@v4 - name: fix git # https://github.com/actions/runner/issues/2033 run: chown -R $(id -u):$(id -g) $(pwd) - - name: make - run: make -j$(nproc) STRICT=1 - - name: make check - run: make -j$(nproc) STRICT=1 check + - name: Build + run: make -j$(nproc) STRICT=1 VERBOSE=1 ${{ (matrix.deps == 'sys') && 'AUTO_DEPS=1' || (matrix.deps == 'local') && 'LOCAL_ZLIB=1 LOCAL_MPG123=1 LOCAL_OGG=1 LOCAL_VORBIS=1 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_FLAC=1 NO_SNDFILE=1' || 'NO_ZLIB=1 NO_MPG123=1 NO_OGG=1 NO_VORBIS=1 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_FLAC=1 NO_SNDFILE=1' }} + - name: Test + run: make -j$(nproc) STRICT=1 VERBOSE=1 ${{ (matrix.deps == 'sys') && 'AUTO_DEPS=1' || (matrix.deps == 'local') && 'LOCAL_ZLIB=1 LOCAL_MPG123=1 LOCAL_OGG=1 LOCAL_VORBIS=1 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_FLAC=1 NO_SNDFILE=1' || 'NO_ZLIB=1 NO_MPG123=1 NO_OGG=1 NO_VORBIS=1 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_FLAC=1 NO_SNDFILE=1' }} check |
|
From: <sv...@op...> - 2024-04-28 17:29:36
|
Author: manx Date: Sun Apr 28 19:29:25 2024 New Revision: 20679 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20679 Log: [Fix] build: CI: GitHub: Fedora: Workaround GitHub quirks. See <https://github.com/dorny/test-reporter/issues/131#issuecomment-881945146> and <https://github.com/actions/runner/issues/2033>. Modified: trunk/OpenMPT/.github/workflows/Fedora-Makefile.yml Modified: trunk/OpenMPT/.github/workflows/Fedora-Makefile.yml ============================================================================== --- trunk/OpenMPT/.github/workflows/Fedora-Makefile.yml Sun Apr 28 18:25:38 2024 (r20678) +++ trunk/OpenMPT/.github/workflows/Fedora-Makefile.yml Sun Apr 28 19:29:25 2024 (r20679) @@ -18,9 +18,13 @@ image: fedora:latest steps: - - uses: actions/checkout@v4 - name: install dependencies run: dnf -y upgrade --refresh && dnf -y install subversion perl-XML-XPath git mawk zip unzip p7zip xz make binutils gcc gcc-g++ clang pcc pkgconf help2man doxygen autoconf autoconf-archive automake libtool ccache zlib-devel mpg123-devel libogg-devel libvorbis-devel portaudio-devel pulseaudio-libs-devel SDL2-devel flac-devel libsndfile-devel libtool-ltdl-devel + - name: checkout + uses: actions/checkout@v4 + - name: fix git + # https://github.com/actions/runner/issues/2033 + run: chown -R $(id -u):$(id -g) $(pwd) - name: make run: make -j$(nproc) STRICT=1 - name: make check |
|
From: <sv...@op...> - 2024-04-28 16:25:45
|
Author: sagamusix Date: Sun Apr 28 18:25:38 2024 New Revision: 20678 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20678 Log: Merged revision(s) 20675 from trunk/OpenMPT: [Imp] DMF: Avoid spending a lot of time on reading non-existing pattern data. ........ Modified: branches/OpenMPT-1.29/ (props changed) branches/OpenMPT-1.29/soundlib/Load_dmf.cpp Modified: branches/OpenMPT-1.29/soundlib/Load_dmf.cpp ============================================================================== --- branches/OpenMPT-1.29/soundlib/Load_dmf.cpp Sun Apr 28 18:25:23 2024 (r20677) +++ branches/OpenMPT-1.29/soundlib/Load_dmf.cpp Sun Apr 28 18:25:38 2024 (r20678) @@ -347,7 +347,7 @@ // Counters for channel packing (including global track) std::vector<uint8> channelCounter(numChannels + 1, 0); - for(ROWINDEX row = 0; row < numRows; row++) + for(ROWINDEX row = 0; row < numRows && file.CanRead(1); row++) { // Global track info counter reached 0 => read global track data if(channelCounter[0] == 0) @@ -979,6 +979,8 @@ const uint8 headerSize = fileHeader.version < 3 ? 9 : 8; chunk.Skip(headerSize - sizeof(uint32le)); const uint32 patLength = chunk.ReadUint32LE(); + if(!chunk.CanRead(patLength)) + return false; chunk.SkipBack(headerSize); patternChunk = chunk.ReadChunk(headerSize + patLength); } |
|
From: <sv...@op...> - 2024-04-28 16:25:37
|
Author: sagamusix Date: Sun Apr 28 18:25:23 2024 New Revision: 20677 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20677 Log: Merged revision(s) 20675 from trunk/OpenMPT: [Imp] DMF: Avoid spending a lot of time on reading non-existing pattern data. ........ Modified: branches/OpenMPT-1.30/ (props changed) branches/OpenMPT-1.30/soundlib/Load_dmf.cpp Modified: branches/OpenMPT-1.30/soundlib/Load_dmf.cpp ============================================================================== --- branches/OpenMPT-1.30/soundlib/Load_dmf.cpp Sun Apr 28 18:25:09 2024 (r20676) +++ branches/OpenMPT-1.30/soundlib/Load_dmf.cpp Sun Apr 28 18:25:23 2024 (r20677) @@ -346,7 +346,7 @@ // Counters for channel packing (including global track) std::vector<uint8> channelCounter(numChannels + 1, 0); - for(ROWINDEX row = 0; row < numRows; row++) + for(ROWINDEX row = 0; row < numRows && file.CanRead(1); row++) { // Global track info counter reached 0 => read global track data if(channelCounter[0] == 0) @@ -973,6 +973,8 @@ const uint8 headerSize = fileHeader.version < 3 ? 9 : 8; chunk.Skip(headerSize - sizeof(uint32le)); const uint32 patLength = chunk.ReadUint32LE(); + if(!chunk.CanRead(patLength)) + return false; chunk.SkipBack(headerSize); patternChunk = chunk.ReadChunk(headerSize + patLength); } |
|
From: <sv...@op...> - 2024-04-28 16:25:21
|
Author: sagamusix Date: Sun Apr 28 18:25:09 2024 New Revision: 20676 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20676 Log: Merged revision(s) 20675 from trunk/OpenMPT: [Imp] DMF: Avoid spending a lot of time on reading non-existing pattern data. ........ Modified: branches/OpenMPT-1.31/ (props changed) branches/OpenMPT-1.31/soundlib/Load_dmf.cpp Modified: branches/OpenMPT-1.31/soundlib/Load_dmf.cpp ============================================================================== --- branches/OpenMPT-1.31/soundlib/Load_dmf.cpp Sun Apr 28 18:24:28 2024 (r20675) +++ branches/OpenMPT-1.31/soundlib/Load_dmf.cpp Sun Apr 28 18:25:09 2024 (r20676) @@ -346,7 +346,7 @@ // Counters for channel packing (including global track) std::vector<uint8> channelCounter(numChannels + 1, 0); - for(ROWINDEX row = 0; row < numRows; row++) + for(ROWINDEX row = 0; row < numRows && file.CanRead(1); row++) { // Global track info counter reached 0 => read global track data if(channelCounter[0] == 0) @@ -970,6 +970,8 @@ const uint8 headerSize = fileHeader.version < 3 ? 9 : 8; chunk.Skip(headerSize - sizeof(uint32le)); const uint32 patLength = chunk.ReadUint32LE(); + if(!chunk.CanRead(patLength)) + return false; chunk.SkipBack(headerSize); patternChunk = chunk.ReadChunk(headerSize + patLength); } |
|
From: <sv...@op...> - 2024-04-28 16:24:40
|
Author: sagamusix Date: Sun Apr 28 18:24:28 2024 New Revision: 20675 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20675 Log: [Imp] DMF: Avoid spending a lot of time on reading non-existing pattern data. Modified: trunk/OpenMPT/soundlib/Load_dmf.cpp Modified: trunk/OpenMPT/soundlib/Load_dmf.cpp ============================================================================== --- trunk/OpenMPT/soundlib/Load_dmf.cpp Sun Apr 28 18:02:38 2024 (r20674) +++ trunk/OpenMPT/soundlib/Load_dmf.cpp Sun Apr 28 18:24:28 2024 (r20675) @@ -346,7 +346,7 @@ // Counters for channel packing (including global track) std::vector<uint8> channelCounter(numChannels + 1, 0); - for(ROWINDEX row = 0; row < numRows; row++) + for(ROWINDEX row = 0; row < numRows && file.CanRead(1); row++) { // Global track info counter reached 0 => read global track data if(channelCounter[0] == 0) @@ -971,6 +971,8 @@ const uint8 headerSize = fileHeader.version < 3 ? 9 : 8; chunk.Skip(headerSize - sizeof(uint32le)); const uint32 patLength = chunk.ReadUint32LE(); + if(!chunk.CanRead(patLength)) + return false; chunk.SkipBack(headerSize); patternChunk = chunk.ReadChunk(headerSize + patLength); } |
|
From: <sv...@op...> - 2024-04-28 16:02:50
|
Author: manx Date: Sun Apr 28 18:02:38 2024 New Revision: 20674 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20674 Log: Merged revision(s) 20672 from trunk/OpenMPT: [Doc] libopenmpt: Refer to OpenMPT instead of Open ModPlug Tracker as the primary name (as done on the website). ........ Modified: branches/OpenMPT-1.31/ (props changed) branches/OpenMPT-1.31/doc/libopenmpt/index.dox Modified: branches/OpenMPT-1.31/doc/libopenmpt/index.dox ============================================================================== --- branches/OpenMPT-1.31/doc/libopenmpt/index.dox Sun Apr 28 18:02:03 2024 (r20673) +++ branches/OpenMPT-1.31/doc/libopenmpt/index.dox Sun Apr 28 18:02:38 2024 (r20674) @@ -4,7 +4,7 @@ * * libopenmpt is a cross-platform C++ and C library to decode <a href="https://en.wikipedia.org/wiki/Module_file">tracked music files (modules)</a> into a raw PCM audio stream. * - * libopenmpt is based on the player code of the Open ModPlug Tracker project (OpenMPT, <a href="https://openmpt.org/">https://openmpt.org/</a>) + * libopenmpt is based on the player code of the OpenMPT project (Open ModPlug Tracker, <a href="https://openmpt.org/">https://openmpt.org/</a>) * * \section toc Contents * - \ref md_README "README" |
|
From: <sv...@op...> - 2024-04-28 16:02:15
|
Author: manx Date: Sun Apr 28 18:02:03 2024 New Revision: 20673 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20673 Log: [Fix] build: CI: GitHub: Fedora: Fix xz dependency install. Modified: trunk/OpenMPT/.github/workflows/Fedora-Makefile.yml Modified: trunk/OpenMPT/.github/workflows/Fedora-Makefile.yml ============================================================================== --- trunk/OpenMPT/.github/workflows/Fedora-Makefile.yml Sun Apr 28 18:01:25 2024 (r20672) +++ trunk/OpenMPT/.github/workflows/Fedora-Makefile.yml Sun Apr 28 18:02:03 2024 (r20673) @@ -20,7 +20,7 @@ steps: - uses: actions/checkout@v4 - name: install dependencies - run: dnf -y upgrade --refresh && dnf -y install subversion perl-XML-XPath git mawk zip unzip p7zip xz-utils make binutils gcc gcc-g++ clang pcc pkgconf help2man doxygen autoconf autoconf-archive automake libtool ccache zlib-devel mpg123-devel libogg-devel libvorbis-devel portaudio-devel pulseaudio-libs-devel SDL2-devel flac-devel libsndfile-devel libtool-ltdl-devel + run: dnf -y upgrade --refresh && dnf -y install subversion perl-XML-XPath git mawk zip unzip p7zip xz make binutils gcc gcc-g++ clang pcc pkgconf help2man doxygen autoconf autoconf-archive automake libtool ccache zlib-devel mpg123-devel libogg-devel libvorbis-devel portaudio-devel pulseaudio-libs-devel SDL2-devel flac-devel libsndfile-devel libtool-ltdl-devel - name: make run: make -j$(nproc) STRICT=1 - name: make check |
|
From: <sv...@op...> - 2024-04-28 16:01:32
|
Author: manx Date: Sun Apr 28 18:01:25 2024 New Revision: 20672 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20672 Log: [Doc] libopenmpt: Refer to OpenMPT instead of Open ModPlug Tracker as the primary name (as done on the website). Modified: trunk/OpenMPT/doc/libopenmpt/index.dox Modified: trunk/OpenMPT/doc/libopenmpt/index.dox ============================================================================== --- trunk/OpenMPT/doc/libopenmpt/index.dox Sun Apr 28 17:36:46 2024 (r20671) +++ trunk/OpenMPT/doc/libopenmpt/index.dox Sun Apr 28 18:01:25 2024 (r20672) @@ -4,7 +4,7 @@ * * libopenmpt is a cross-platform C++ and C library to decode <a href="https://en.wikipedia.org/wiki/Module_file">tracked music files (modules)</a> into a raw PCM audio stream. * - * libopenmpt is based on the player code of the Open ModPlug Tracker project (OpenMPT, <a href="https://openmpt.org/">https://openmpt.org/</a>) + * libopenmpt is based on the player code of the OpenMPT project (Open ModPlug Tracker, <a href="https://openmpt.org/">https://openmpt.org/</a>) * * \section toc Contents * - \ref md_README "README" |
|
From: <sv...@op...> - 2024-04-28 15:37:02
|
Author: manx Date: Sun Apr 28 17:36:46 2024 New Revision: 20671 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20671 Log: [New] build: CI: GitHub: Add Fedora builder. Added: trunk/OpenMPT/.github/workflows/Fedora-Makefile.yml Added: trunk/OpenMPT/.github/workflows/Fedora-Makefile.yml ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/OpenMPT/.github/workflows/Fedora-Makefile.yml Sun Apr 28 17:36:46 2024 (r20671) @@ -0,0 +1,27 @@ +name: Fedora Makefile + +on: + push: + branches: [ master ] + pull_request: + branches: [ master ] + +concurrency: + group: ${{ github.ref }}-${{ github.workflow }} + cancel-in-progress: true + +jobs: + build: + + runs-on: ubuntu-latest + container: + image: fedora:latest + + steps: + - uses: actions/checkout@v4 + - name: install dependencies + run: dnf -y upgrade --refresh && dnf -y install subversion perl-XML-XPath git mawk zip unzip p7zip xz-utils make binutils gcc gcc-g++ clang pcc pkgconf help2man doxygen autoconf autoconf-archive automake libtool ccache zlib-devel mpg123-devel libogg-devel libvorbis-devel portaudio-devel pulseaudio-libs-devel SDL2-devel flac-devel libsndfile-devel libtool-ltdl-devel + - name: make + run: make -j$(nproc) STRICT=1 + - name: make check + run: make -j$(nproc) STRICT=1 check |
|
From: <sv...@op...> - 2024-04-28 15:36:15
|
Author: sagamusix Date: Sun Apr 28 17:36:01 2024 New Revision: 20670 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20670 Log: [Ref] Use PluginComboBox for CMidiMacroSetup. Modified: trunk/OpenMPT/mptrack/MIDIMacroDialog.cpp trunk/OpenMPT/mptrack/MIDIMacroDialog.h Modified: trunk/OpenMPT/mptrack/MIDIMacroDialog.cpp ============================================================================== --- trunk/OpenMPT/mptrack/MIDIMacroDialog.cpp Sun Apr 28 16:34:58 2024 (r20669) +++ trunk/OpenMPT/mptrack/MIDIMacroDialog.cpp Sun Apr 28 17:36:01 2024 (r20670) @@ -11,7 +11,6 @@ #include "stdafx.h" #include "MIDIMacroDialog.h" #include "Mptrack.h" -#include "PluginComboBox.h" #include "Reporting.h" #include "resource.h" #include "../common/mptStringBuffer.h" @@ -135,22 +134,9 @@ m_EditMacro[m].ShowAll.SetFont(GetFont()); } UpdateMacroList(); - -#ifndef NO_PLUGINS - for(PLUGINDEX i = 0; i < MAX_MIXPLUGINS; i++) - { - const SNDMIXPLUGIN &plugin = m_SndFile.m_MixPlugins[i]; - - if(plugin.IsValidPlugin()) - { - s.Format(_T("FX%d: "), i + 1); - s += mpt::ToCString(plugin.GetName()); - m_CbnMacroPlug.SetItemData(m_CbnMacroPlug.AddString(s), i); - } - } - m_CbnMacroPlug.SetCurSel(0); + m_CbnMacroPlug.Update(PluginComboBox::Config{PluginComboBox::Flags::ShowLibraryNames}, m_SndFile); + m_CbnMacroPlug.SetRawSelection(0); OnPlugChanged(); -#endif // NO_PLUGINS return FALSE; } @@ -378,7 +364,7 @@ void CMidiMacroSetup::OnPlugChanged() { #ifndef NO_PLUGINS - DWORD_PTR plug = m_CbnMacroPlug.GetItemData(m_CbnMacroPlug.GetCurSel()); + PLUGINDEX plug = m_CbnMacroPlug.GetSelection().value_or(PLUGINDEX_INVALID); if(plug >= MAX_MIXPLUGINS) return; Modified: trunk/OpenMPT/mptrack/MIDIMacroDialog.h ============================================================================== --- trunk/OpenMPT/mptrack/MIDIMacroDialog.h Sun Apr 28 16:34:58 2024 (r20669) +++ trunk/OpenMPT/mptrack/MIDIMacroDialog.h Sun Apr 28 17:36:01 2024 (r20670) @@ -13,6 +13,7 @@ #include "openmpt/all/BuildSettings.hpp" #include "ColourEdit.h" +#include "PluginComboBox.h" #include "../common/misc_util.h" #include "../soundlib/MIDIMacros.h" #include "mpt/base/alloc.hpp" @@ -24,7 +25,8 @@ class CMidiMacroSetup: public CDialog { protected: - CComboBox m_CbnSFx, m_CbnSFxPreset, m_CbnZxx, m_CbnZxxPreset, m_CbnMacroPlug, m_CbnMacroParam, m_CbnMacroCC; + CComboBox m_CbnSFx, m_CbnSFxPreset, m_CbnZxx, m_CbnZxxPreset, m_CbnMacroParam, m_CbnMacroCC; + PluginComboBox m_CbnMacroPlug; CEdit m_EditSFx, m_EditZxx; struct MacroEdit { |
Author: sagamusix Date: Sun Apr 28 16:34:58 2024 New Revision: 20669 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20669 Log: [Ref] Unify plugin combo box handling into a single class, which also unifies UpdateHint handling for this sort of combo box. Added: trunk/OpenMPT/mptrack/PluginComboBox.cpp (contents, props changed) trunk/OpenMPT/mptrack/PluginComboBox.h (contents, props changed) Modified: trunk/OpenMPT/build/vs2017winxp/OpenMPT-ANSI.vcxproj trunk/OpenMPT/build/vs2017winxp/OpenMPT-ANSI.vcxproj.filters trunk/OpenMPT/build/vs2017winxp/OpenMPT-UTF8.vcxproj trunk/OpenMPT/build/vs2017winxp/OpenMPT-UTF8.vcxproj.filters trunk/OpenMPT/build/vs2017winxp/OpenMPT.vcxproj trunk/OpenMPT/build/vs2017winxp/OpenMPT.vcxproj.filters trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-ANSI.vcxproj trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-ANSI.vcxproj.filters trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-UTF8.vcxproj trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-UTF8.vcxproj.filters trunk/OpenMPT/build/vs2017winxpansi/OpenMPT.vcxproj trunk/OpenMPT/build/vs2017winxpansi/OpenMPT.vcxproj.filters trunk/OpenMPT/build/vs2019win10/OpenMPT-ANSI.vcxproj trunk/OpenMPT/build/vs2019win10/OpenMPT-ANSI.vcxproj.filters trunk/OpenMPT/build/vs2019win10/OpenMPT-UTF8.vcxproj trunk/OpenMPT/build/vs2019win10/OpenMPT-UTF8.vcxproj.filters trunk/OpenMPT/build/vs2019win10/OpenMPT.vcxproj trunk/OpenMPT/build/vs2019win10/OpenMPT.vcxproj.filters trunk/OpenMPT/build/vs2019win7/OpenMPT-ANSI.vcxproj trunk/OpenMPT/build/vs2019win7/OpenMPT-ANSI.vcxproj.filters trunk/OpenMPT/build/vs2019win7/OpenMPT-UTF8.vcxproj trunk/OpenMPT/build/vs2019win7/OpenMPT-UTF8.vcxproj.filters trunk/OpenMPT/build/vs2019win7/OpenMPT.vcxproj trunk/OpenMPT/build/vs2019win7/OpenMPT.vcxproj.filters trunk/OpenMPT/build/vs2019win81/OpenMPT-ANSI.vcxproj trunk/OpenMPT/build/vs2019win81/OpenMPT-ANSI.vcxproj.filters trunk/OpenMPT/build/vs2019win81/OpenMPT-UTF8.vcxproj trunk/OpenMPT/build/vs2019win81/OpenMPT-UTF8.vcxproj.filters trunk/OpenMPT/build/vs2019win81/OpenMPT.vcxproj trunk/OpenMPT/build/vs2019win81/OpenMPT.vcxproj.filters trunk/OpenMPT/build/vs2022win10/OpenMPT-ANSI.vcxproj trunk/OpenMPT/build/vs2022win10/OpenMPT-ANSI.vcxproj.filters trunk/OpenMPT/build/vs2022win10/OpenMPT-UTF8.vcxproj trunk/OpenMPT/build/vs2022win10/OpenMPT-UTF8.vcxproj.filters trunk/OpenMPT/build/vs2022win10/OpenMPT.vcxproj trunk/OpenMPT/build/vs2022win10/OpenMPT.vcxproj.filters trunk/OpenMPT/build/vs2022win10clang/OpenMPT-ANSI.vcxproj trunk/OpenMPT/build/vs2022win10clang/OpenMPT-ANSI.vcxproj.filters trunk/OpenMPT/build/vs2022win10clang/OpenMPT-UTF8.vcxproj trunk/OpenMPT/build/vs2022win10clang/OpenMPT-UTF8.vcxproj.filters trunk/OpenMPT/build/vs2022win10clang/OpenMPT.vcxproj trunk/OpenMPT/build/vs2022win10clang/OpenMPT.vcxproj.filters trunk/OpenMPT/build/vs2022win7/OpenMPT-ANSI.vcxproj trunk/OpenMPT/build/vs2022win7/OpenMPT-ANSI.vcxproj.filters trunk/OpenMPT/build/vs2022win7/OpenMPT-UTF8.vcxproj trunk/OpenMPT/build/vs2022win7/OpenMPT-UTF8.vcxproj.filters trunk/OpenMPT/build/vs2022win7/OpenMPT.vcxproj trunk/OpenMPT/build/vs2022win7/OpenMPT.vcxproj.filters trunk/OpenMPT/build/vs2022win81/OpenMPT-ANSI.vcxproj trunk/OpenMPT/build/vs2022win81/OpenMPT-ANSI.vcxproj.filters trunk/OpenMPT/build/vs2022win81/OpenMPT-UTF8.vcxproj trunk/OpenMPT/build/vs2022win81/OpenMPT-UTF8.vcxproj.filters trunk/OpenMPT/build/vs2022win81/OpenMPT.vcxproj trunk/OpenMPT/build/vs2022win81/OpenMPT.vcxproj.filters trunk/OpenMPT/mptrack/Ctrl_ins.cpp trunk/OpenMPT/mptrack/Ctrl_ins.h trunk/OpenMPT/mptrack/MIDIMacroDialog.cpp trunk/OpenMPT/mptrack/MIDIMappingDialog.cpp trunk/OpenMPT/mptrack/MIDIMappingDialog.h trunk/OpenMPT/mptrack/MainFrm.cpp trunk/OpenMPT/mptrack/Mptrack.h trunk/OpenMPT/mptrack/PatternEditorDialogs.cpp trunk/OpenMPT/mptrack/PatternEditorDialogs.h trunk/OpenMPT/mptrack/PatternFindReplaceDlg.cpp trunk/OpenMPT/mptrack/PatternFindReplaceDlg.h trunk/OpenMPT/mptrack/View_gen.cpp trunk/OpenMPT/mptrack/View_gen.h trunk/OpenMPT/mptrack/plugins/LFOPluginEditor.cpp trunk/OpenMPT/mptrack/plugins/LFOPluginEditor.h Modified: trunk/OpenMPT/build/vs2017winxp/OpenMPT-ANSI.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2017winxp/OpenMPT-ANSI.vcxproj Sun Apr 28 15:42:30 2024 (r20668) +++ trunk/OpenMPT/build/vs2017winxp/OpenMPT-ANSI.vcxproj Sun Apr 28 16:34:58 2024 (r20669) @@ -855,6 +855,7 @@ <ClInclude Include="..\..\mptrack\PatternFont.h" /> <ClInclude Include="..\..\mptrack\PatternGotoDialog.h" /> <ClInclude Include="..\..\mptrack\PlugNotFoundDlg.h" /> + <ClInclude Include="..\..\mptrack\PluginComboBox.h" /> <ClInclude Include="..\..\mptrack\ProgressDialog.h" /> <ClInclude Include="..\..\mptrack\Reporting.h" /> <ClInclude Include="..\..\mptrack\ResizableDialog.h" /> @@ -1286,6 +1287,7 @@ <ClCompile Include="..\..\mptrack\PatternFont.cpp" /> <ClCompile Include="..\..\mptrack\PatternGotoDialog.cpp" /> <ClCompile Include="..\..\mptrack\PlugNotFoundDlg.cpp" /> + <ClCompile Include="..\..\mptrack\PluginComboBox.cpp" /> <ClCompile Include="..\..\mptrack\ProgressDialog.cpp" /> <ClCompile Include="..\..\mptrack\Reporting.cpp" /> <ClCompile Include="..\..\mptrack\ResizableDialog.cpp" /> Modified: trunk/OpenMPT/build/vs2017winxp/OpenMPT-ANSI.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2017winxp/OpenMPT-ANSI.vcxproj.filters Sun Apr 28 15:42:30 2024 (r20668) +++ trunk/OpenMPT/build/vs2017winxp/OpenMPT-ANSI.vcxproj.filters Sun Apr 28 16:34:58 2024 (r20669) @@ -516,6 +516,9 @@ <ClInclude Include="..\..\mptrack\PlugNotFoundDlg.h"> <Filter>mptrack</Filter> </ClInclude> + <ClInclude Include="..\..\mptrack\PluginComboBox.h"> + <Filter>mptrack</Filter> + </ClInclude> <ClInclude Include="..\..\mptrack\ProgressDialog.h"> <Filter>mptrack</Filter> </ClInclude> @@ -1805,6 +1808,9 @@ <ClCompile Include="..\..\mptrack\PlugNotFoundDlg.cpp"> <Filter>mptrack</Filter> </ClCompile> + <ClCompile Include="..\..\mptrack\PluginComboBox.cpp"> + <Filter>mptrack</Filter> + </ClCompile> <ClCompile Include="..\..\mptrack\ProgressDialog.cpp"> <Filter>mptrack</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2017winxp/OpenMPT-UTF8.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2017winxp/OpenMPT-UTF8.vcxproj Sun Apr 28 15:42:30 2024 (r20668) +++ trunk/OpenMPT/build/vs2017winxp/OpenMPT-UTF8.vcxproj Sun Apr 28 16:34:58 2024 (r20669) @@ -855,6 +855,7 @@ <ClInclude Include="..\..\mptrack\PatternFont.h" /> <ClInclude Include="..\..\mptrack\PatternGotoDialog.h" /> <ClInclude Include="..\..\mptrack\PlugNotFoundDlg.h" /> + <ClInclude Include="..\..\mptrack\PluginComboBox.h" /> <ClInclude Include="..\..\mptrack\ProgressDialog.h" /> <ClInclude Include="..\..\mptrack\Reporting.h" /> <ClInclude Include="..\..\mptrack\ResizableDialog.h" /> @@ -1286,6 +1287,7 @@ <ClCompile Include="..\..\mptrack\PatternFont.cpp" /> <ClCompile Include="..\..\mptrack\PatternGotoDialog.cpp" /> <ClCompile Include="..\..\mptrack\PlugNotFoundDlg.cpp" /> + <ClCompile Include="..\..\mptrack\PluginComboBox.cpp" /> <ClCompile Include="..\..\mptrack\ProgressDialog.cpp" /> <ClCompile Include="..\..\mptrack\Reporting.cpp" /> <ClCompile Include="..\..\mptrack\ResizableDialog.cpp" /> Modified: trunk/OpenMPT/build/vs2017winxp/OpenMPT-UTF8.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2017winxp/OpenMPT-UTF8.vcxproj.filters Sun Apr 28 15:42:30 2024 (r20668) +++ trunk/OpenMPT/build/vs2017winxp/OpenMPT-UTF8.vcxproj.filters Sun Apr 28 16:34:58 2024 (r20669) @@ -516,6 +516,9 @@ <ClInclude Include="..\..\mptrack\PlugNotFoundDlg.h"> <Filter>mptrack</Filter> </ClInclude> + <ClInclude Include="..\..\mptrack\PluginComboBox.h"> + <Filter>mptrack</Filter> + </ClInclude> <ClInclude Include="..\..\mptrack\ProgressDialog.h"> <Filter>mptrack</Filter> </ClInclude> @@ -1805,6 +1808,9 @@ <ClCompile Include="..\..\mptrack\PlugNotFoundDlg.cpp"> <Filter>mptrack</Filter> </ClCompile> + <ClCompile Include="..\..\mptrack\PluginComboBox.cpp"> + <Filter>mptrack</Filter> + </ClCompile> <ClCompile Include="..\..\mptrack\ProgressDialog.cpp"> <Filter>mptrack</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2017winxp/OpenMPT.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2017winxp/OpenMPT.vcxproj Sun Apr 28 15:42:30 2024 (r20668) +++ trunk/OpenMPT/build/vs2017winxp/OpenMPT.vcxproj Sun Apr 28 16:34:58 2024 (r20669) @@ -855,6 +855,7 @@ <ClInclude Include="..\..\mptrack\PatternFont.h" /> <ClInclude Include="..\..\mptrack\PatternGotoDialog.h" /> <ClInclude Include="..\..\mptrack\PlugNotFoundDlg.h" /> + <ClInclude Include="..\..\mptrack\PluginComboBox.h" /> <ClInclude Include="..\..\mptrack\ProgressDialog.h" /> <ClInclude Include="..\..\mptrack\Reporting.h" /> <ClInclude Include="..\..\mptrack\ResizableDialog.h" /> @@ -1286,6 +1287,7 @@ <ClCompile Include="..\..\mptrack\PatternFont.cpp" /> <ClCompile Include="..\..\mptrack\PatternGotoDialog.cpp" /> <ClCompile Include="..\..\mptrack\PlugNotFoundDlg.cpp" /> + <ClCompile Include="..\..\mptrack\PluginComboBox.cpp" /> <ClCompile Include="..\..\mptrack\ProgressDialog.cpp" /> <ClCompile Include="..\..\mptrack\Reporting.cpp" /> <ClCompile Include="..\..\mptrack\ResizableDialog.cpp" /> Modified: trunk/OpenMPT/build/vs2017winxp/OpenMPT.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2017winxp/OpenMPT.vcxproj.filters Sun Apr 28 15:42:30 2024 (r20668) +++ trunk/OpenMPT/build/vs2017winxp/OpenMPT.vcxproj.filters Sun Apr 28 16:34:58 2024 (r20669) @@ -516,6 +516,9 @@ <ClInclude Include="..\..\mptrack\PlugNotFoundDlg.h"> <Filter>mptrack</Filter> </ClInclude> + <ClInclude Include="..\..\mptrack\PluginComboBox.h"> + <Filter>mptrack</Filter> + </ClInclude> <ClInclude Include="..\..\mptrack\ProgressDialog.h"> <Filter>mptrack</Filter> </ClInclude> @@ -1805,6 +1808,9 @@ <ClCompile Include="..\..\mptrack\PlugNotFoundDlg.cpp"> <Filter>mptrack</Filter> </ClCompile> + <ClCompile Include="..\..\mptrack\PluginComboBox.cpp"> + <Filter>mptrack</Filter> + </ClCompile> <ClCompile Include="..\..\mptrack\ProgressDialog.cpp"> <Filter>mptrack</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-ANSI.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-ANSI.vcxproj Sun Apr 28 15:42:30 2024 (r20668) +++ trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-ANSI.vcxproj Sun Apr 28 16:34:58 2024 (r20669) @@ -855,6 +855,7 @@ <ClInclude Include="..\..\mptrack\PatternFont.h" /> <ClInclude Include="..\..\mptrack\PatternGotoDialog.h" /> <ClInclude Include="..\..\mptrack\PlugNotFoundDlg.h" /> + <ClInclude Include="..\..\mptrack\PluginComboBox.h" /> <ClInclude Include="..\..\mptrack\ProgressDialog.h" /> <ClInclude Include="..\..\mptrack\Reporting.h" /> <ClInclude Include="..\..\mptrack\ResizableDialog.h" /> @@ -1286,6 +1287,7 @@ <ClCompile Include="..\..\mptrack\PatternFont.cpp" /> <ClCompile Include="..\..\mptrack\PatternGotoDialog.cpp" /> <ClCompile Include="..\..\mptrack\PlugNotFoundDlg.cpp" /> + <ClCompile Include="..\..\mptrack\PluginComboBox.cpp" /> <ClCompile Include="..\..\mptrack\ProgressDialog.cpp" /> <ClCompile Include="..\..\mptrack\Reporting.cpp" /> <ClCompile Include="..\..\mptrack\ResizableDialog.cpp" /> Modified: trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-ANSI.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-ANSI.vcxproj.filters Sun Apr 28 15:42:30 2024 (r20668) +++ trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-ANSI.vcxproj.filters Sun Apr 28 16:34:58 2024 (r20669) @@ -516,6 +516,9 @@ <ClInclude Include="..\..\mptrack\PlugNotFoundDlg.h"> <Filter>mptrack</Filter> </ClInclude> + <ClInclude Include="..\..\mptrack\PluginComboBox.h"> + <Filter>mptrack</Filter> + </ClInclude> <ClInclude Include="..\..\mptrack\ProgressDialog.h"> <Filter>mptrack</Filter> </ClInclude> @@ -1805,6 +1808,9 @@ <ClCompile Include="..\..\mptrack\PlugNotFoundDlg.cpp"> <Filter>mptrack</Filter> </ClCompile> + <ClCompile Include="..\..\mptrack\PluginComboBox.cpp"> + <Filter>mptrack</Filter> + </ClCompile> <ClCompile Include="..\..\mptrack\ProgressDialog.cpp"> <Filter>mptrack</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-UTF8.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-UTF8.vcxproj Sun Apr 28 15:42:30 2024 (r20668) +++ trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-UTF8.vcxproj Sun Apr 28 16:34:58 2024 (r20669) @@ -855,6 +855,7 @@ <ClInclude Include="..\..\mptrack\PatternFont.h" /> <ClInclude Include="..\..\mptrack\PatternGotoDialog.h" /> <ClInclude Include="..\..\mptrack\PlugNotFoundDlg.h" /> + <ClInclude Include="..\..\mptrack\PluginComboBox.h" /> <ClInclude Include="..\..\mptrack\ProgressDialog.h" /> <ClInclude Include="..\..\mptrack\Reporting.h" /> <ClInclude Include="..\..\mptrack\ResizableDialog.h" /> @@ -1286,6 +1287,7 @@ <ClCompile Include="..\..\mptrack\PatternFont.cpp" /> <ClCompile Include="..\..\mptrack\PatternGotoDialog.cpp" /> <ClCompile Include="..\..\mptrack\PlugNotFoundDlg.cpp" /> + <ClCompile Include="..\..\mptrack\PluginComboBox.cpp" /> <ClCompile Include="..\..\mptrack\ProgressDialog.cpp" /> <ClCompile Include="..\..\mptrack\Reporting.cpp" /> <ClCompile Include="..\..\mptrack\ResizableDialog.cpp" /> Modified: trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-UTF8.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-UTF8.vcxproj.filters Sun Apr 28 15:42:30 2024 (r20668) +++ trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-UTF8.vcxproj.filters Sun Apr 28 16:34:58 2024 (r20669) @@ -516,6 +516,9 @@ <ClInclude Include="..\..\mptrack\PlugNotFoundDlg.h"> <Filter>mptrack</Filter> </ClInclude> + <ClInclude Include="..\..\mptrack\PluginComboBox.h"> + <Filter>mptrack</Filter> + </ClInclude> <ClInclude Include="..\..\mptrack\ProgressDialog.h"> <Filter>mptrack</Filter> </ClInclude> @@ -1805,6 +1808,9 @@ <ClCompile Include="..\..\mptrack\PlugNotFoundDlg.cpp"> <Filter>mptrack</Filter> </ClCompile> + <ClCompile Include="..\..\mptrack\PluginComboBox.cpp"> + <Filter>mptrack</Filter> + </ClCompile> <ClCompile Include="..\..\mptrack\ProgressDialog.cpp"> <Filter>mptrack</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2017winxpansi/OpenMPT.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2017winxpansi/OpenMPT.vcxproj Sun Apr 28 15:42:30 2024 (r20668) +++ trunk/OpenMPT/build/vs2017winxpansi/OpenMPT.vcxproj Sun Apr 28 16:34:58 2024 (r20669) @@ -855,6 +855,7 @@ <ClInclude Include="..\..\mptrack\PatternFont.h" /> <ClInclude Include="..\..\mptrack\PatternGotoDialog.h" /> <ClInclude Include="..\..\mptrack\PlugNotFoundDlg.h" /> + <ClInclude Include="..\..\mptrack\PluginComboBox.h" /> <ClInclude Include="..\..\mptrack\ProgressDialog.h" /> <ClInclude Include="..\..\mptrack\Reporting.h" /> <ClInclude Include="..\..\mptrack\ResizableDialog.h" /> @@ -1286,6 +1287,7 @@ <ClCompile Include="..\..\mptrack\PatternFont.cpp" /> <ClCompile Include="..\..\mptrack\PatternGotoDialog.cpp" /> <ClCompile Include="..\..\mptrack\PlugNotFoundDlg.cpp" /> + <ClCompile Include="..\..\mptrack\PluginComboBox.cpp" /> <ClCompile Include="..\..\mptrack\ProgressDialog.cpp" /> <ClCompile Include="..\..\mptrack\Reporting.cpp" /> <ClCompile Include="..\..\mptrack\ResizableDialog.cpp" /> Modified: trunk/OpenMPT/build/vs2017winxpansi/OpenMPT.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2017winxpansi/OpenMPT.vcxproj.filters Sun Apr 28 15:42:30 2024 (r20668) +++ trunk/OpenMPT/build/vs2017winxpansi/OpenMPT.vcxproj.filters Sun Apr 28 16:34:58 2024 (r20669) @@ -516,6 +516,9 @@ <ClInclude Include="..\..\mptrack\PlugNotFoundDlg.h"> <Filter>mptrack</Filter> </ClInclude> + <ClInclude Include="..\..\mptrack\PluginComboBox.h"> + <Filter>mptrack</Filter> + </ClInclude> <ClInclude Include="..\..\mptrack\ProgressDialog.h"> <Filter>mptrack</Filter> </ClInclude> @@ -1805,6 +1808,9 @@ <ClCompile Include="..\..\mptrack\PlugNotFoundDlg.cpp"> <Filter>mptrack</Filter> </ClCompile> + <ClCompile Include="..\..\mptrack\PluginComboBox.cpp"> + <Filter>mptrack</Filter> + </ClCompile> <ClCompile Include="..\..\mptrack\ProgressDialog.cpp"> <Filter>mptrack</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2019win10/OpenMPT-ANSI.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2019win10/OpenMPT-ANSI.vcxproj Sun Apr 28 15:42:30 2024 (r20668) +++ trunk/OpenMPT/build/vs2019win10/OpenMPT-ANSI.vcxproj Sun Apr 28 16:34:58 2024 (r20669) @@ -1630,6 +1630,7 @@ <ClInclude Include="..\..\mptrack\PatternFont.h" /> <ClInclude Include="..\..\mptrack\PatternGotoDialog.h" /> <ClInclude Include="..\..\mptrack\PlugNotFoundDlg.h" /> + <ClInclude Include="..\..\mptrack\PluginComboBox.h" /> <ClInclude Include="..\..\mptrack\ProgressDialog.h" /> <ClInclude Include="..\..\mptrack\Reporting.h" /> <ClInclude Include="..\..\mptrack\ResizableDialog.h" /> @@ -2061,6 +2062,7 @@ <ClCompile Include="..\..\mptrack\PatternFont.cpp" /> <ClCompile Include="..\..\mptrack\PatternGotoDialog.cpp" /> <ClCompile Include="..\..\mptrack\PlugNotFoundDlg.cpp" /> + <ClCompile Include="..\..\mptrack\PluginComboBox.cpp" /> <ClCompile Include="..\..\mptrack\ProgressDialog.cpp" /> <ClCompile Include="..\..\mptrack\Reporting.cpp" /> <ClCompile Include="..\..\mptrack\ResizableDialog.cpp" /> Modified: trunk/OpenMPT/build/vs2019win10/OpenMPT-ANSI.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2019win10/OpenMPT-ANSI.vcxproj.filters Sun Apr 28 15:42:30 2024 (r20668) +++ trunk/OpenMPT/build/vs2019win10/OpenMPT-ANSI.vcxproj.filters Sun Apr 28 16:34:58 2024 (r20669) @@ -558,6 +558,9 @@ <ClInclude Include="..\..\mptrack\PlugNotFoundDlg.h"> <Filter>mptrack</Filter> </ClInclude> + <ClInclude Include="..\..\mptrack\PluginComboBox.h"> + <Filter>mptrack</Filter> + </ClInclude> <ClInclude Include="..\..\mptrack\ProgressDialog.h"> <Filter>mptrack</Filter> </ClInclude> @@ -1847,6 +1850,9 @@ <ClCompile Include="..\..\mptrack\PlugNotFoundDlg.cpp"> <Filter>mptrack</Filter> </ClCompile> + <ClCompile Include="..\..\mptrack\PluginComboBox.cpp"> + <Filter>mptrack</Filter> + </ClCompile> <ClCompile Include="..\..\mptrack\ProgressDialog.cpp"> <Filter>mptrack</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2019win10/OpenMPT-UTF8.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2019win10/OpenMPT-UTF8.vcxproj Sun Apr 28 15:42:30 2024 (r20668) +++ trunk/OpenMPT/build/vs2019win10/OpenMPT-UTF8.vcxproj Sun Apr 28 16:34:58 2024 (r20669) @@ -1630,6 +1630,7 @@ <ClInclude Include="..\..\mptrack\PatternFont.h" /> <ClInclude Include="..\..\mptrack\PatternGotoDialog.h" /> <ClInclude Include="..\..\mptrack\PlugNotFoundDlg.h" /> + <ClInclude Include="..\..\mptrack\PluginComboBox.h" /> <ClInclude Include="..\..\mptrack\ProgressDialog.h" /> <ClInclude Include="..\..\mptrack\Reporting.h" /> <ClInclude Include="..\..\mptrack\ResizableDialog.h" /> @@ -2061,6 +2062,7 @@ <ClCompile Include="..\..\mptrack\PatternFont.cpp" /> <ClCompile Include="..\..\mptrack\PatternGotoDialog.cpp" /> <ClCompile Include="..\..\mptrack\PlugNotFoundDlg.cpp" /> + <ClCompile Include="..\..\mptrack\PluginComboBox.cpp" /> <ClCompile Include="..\..\mptrack\ProgressDialog.cpp" /> <ClCompile Include="..\..\mptrack\Reporting.cpp" /> <ClCompile Include="..\..\mptrack\ResizableDialog.cpp" /> Modified: trunk/OpenMPT/build/vs2019win10/OpenMPT-UTF8.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2019win10/OpenMPT-UTF8.vcxproj.filters Sun Apr 28 15:42:30 2024 (r20668) +++ trunk/OpenMPT/build/vs2019win10/OpenMPT-UTF8.vcxproj.filters Sun Apr 28 16:34:58 2024 (r20669) @@ -558,6 +558,9 @@ <ClInclude Include="..\..\mptrack\PlugNotFoundDlg.h"> <Filter>mptrack</Filter> </ClInclude> + <ClInclude Include="..\..\mptrack\PluginComboBox.h"> + <Filter>mptrack</Filter> + </ClInclude> <ClInclude Include="..\..\mptrack\ProgressDialog.h"> <Filter>mptrack</Filter> </ClInclude> @@ -1847,6 +1850,9 @@ <ClCompile Include="..\..\mptrack\PlugNotFoundDlg.cpp"> <Filter>mptrack</Filter> </ClCompile> + <ClCompile Include="..\..\mptrack\PluginComboBox.cpp"> + <Filter>mptrack</Filter> + </ClCompile> <ClCompile Include="..\..\mptrack\ProgressDialog.cpp"> <Filter>mptrack</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2019win10/OpenMPT.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2019win10/OpenMPT.vcxproj Sun Apr 28 15:42:30 2024 (r20668) +++ trunk/OpenMPT/build/vs2019win10/OpenMPT.vcxproj Sun Apr 28 16:34:58 2024 (r20669) @@ -1630,6 +1630,7 @@ <ClInclude Include="..\..\mptrack\PatternFont.h" /> <ClInclude Include="..\..\mptrack\PatternGotoDialog.h" /> <ClInclude Include="..\..\mptrack\PlugNotFoundDlg.h" /> + <ClInclude Include="..\..\mptrack\PluginComboBox.h" /> <ClInclude Include="..\..\mptrack\ProgressDialog.h" /> <ClInclude Include="..\..\mptrack\Reporting.h" /> <ClInclude Include="..\..\mptrack\ResizableDialog.h" /> @@ -2061,6 +2062,7 @@ <ClCompile Include="..\..\mptrack\PatternFont.cpp" /> <ClCompile Include="..\..\mptrack\PatternGotoDialog.cpp" /> <ClCompile Include="..\..\mptrack\PlugNotFoundDlg.cpp" /> + <ClCompile Include="..\..\mptrack\PluginComboBox.cpp" /> <ClCompile Include="..\..\mptrack\ProgressDialog.cpp" /> <ClCompile Include="..\..\mptrack\Reporting.cpp" /> <ClCompile Include="..\..\mptrack\ResizableDialog.cpp" /> Modified: trunk/OpenMPT/build/vs2019win10/OpenMPT.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2019win10/OpenMPT.vcxproj.filters Sun Apr 28 15:42:30 2024 (r20668) +++ trunk/OpenMPT/build/vs2019win10/OpenMPT.vcxproj.filters Sun Apr 28 16:34:58 2024 (r20669) @@ -558,6 +558,9 @@ <ClInclude Include="..\..\mptrack\PlugNotFoundDlg.h"> <Filter>mptrack</Filter> </ClInclude> + <ClInclude Include="..\..\mptrack\PluginComboBox.h"> + <Filter>mptrack</Filter> + </ClInclude> <ClInclude Include="..\..\mptrack\ProgressDialog.h"> <Filter>mptrack</Filter> </ClInclude> @@ -1847,6 +1850,9 @@ <ClCompile Include="..\..\mptrack\PlugNotFoundDlg.cpp"> <Filter>mptrack</Filter> </ClCompile> + <ClCompile Include="..\..\mptrack\PluginComboBox.cpp"> + <Filter>mptrack</Filter> + </ClCompile> <ClCompile Include="..\..\mptrack\ProgressDialog.cpp"> <Filter>mptrack</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2019win7/OpenMPT-ANSI.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2019win7/OpenMPT-ANSI.vcxproj Sun Apr 28 15:42:30 2024 (r20668) +++ trunk/OpenMPT/build/vs2019win7/OpenMPT-ANSI.vcxproj Sun Apr 28 16:34:58 2024 (r20669) @@ -874,6 +874,7 @@ <ClInclude Include="..\..\mptrack\PatternFont.h" /> <ClInclude Include="..\..\mptrack\PatternGotoDialog.h" /> <ClInclude Include="..\..\mptrack\PlugNotFoundDlg.h" /> + <ClInclude Include="..\..\mptrack\PluginComboBox.h" /> <ClInclude Include="..\..\mptrack\ProgressDialog.h" /> <ClInclude Include="..\..\mptrack\Reporting.h" /> <ClInclude Include="..\..\mptrack\ResizableDialog.h" /> @@ -1305,6 +1306,7 @@ <ClCompile Include="..\..\mptrack\PatternFont.cpp" /> <ClCompile Include="..\..\mptrack\PatternGotoDialog.cpp" /> <ClCompile Include="..\..\mptrack\PlugNotFoundDlg.cpp" /> + <ClCompile Include="..\..\mptrack\PluginComboBox.cpp" /> <ClCompile Include="..\..\mptrack\ProgressDialog.cpp" /> <ClCompile Include="..\..\mptrack\Reporting.cpp" /> <ClCompile Include="..\..\mptrack\ResizableDialog.cpp" /> Modified: trunk/OpenMPT/build/vs2019win7/OpenMPT-ANSI.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2019win7/OpenMPT-ANSI.vcxproj.filters Sun Apr 28 15:42:30 2024 (r20668) +++ trunk/OpenMPT/build/vs2019win7/OpenMPT-ANSI.vcxproj.filters Sun Apr 28 16:34:58 2024 (r20669) @@ -558,6 +558,9 @@ <ClInclude Include="..\..\mptrack\PlugNotFoundDlg.h"> <Filter>mptrack</Filter> </ClInclude> + <ClInclude Include="..\..\mptrack\PluginComboBox.h"> + <Filter>mptrack</Filter> + </ClInclude> <ClInclude Include="..\..\mptrack\ProgressDialog.h"> <Filter>mptrack</Filter> </ClInclude> @@ -1847,6 +1850,9 @@ <ClCompile Include="..\..\mptrack\PlugNotFoundDlg.cpp"> <Filter>mptrack</Filter> </ClCompile> + <ClCompile Include="..\..\mptrack\PluginComboBox.cpp"> + <Filter>mptrack</Filter> + </ClCompile> <ClCompile Include="..\..\mptrack\ProgressDialog.cpp"> <Filter>mptrack</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2019win7/OpenMPT-UTF8.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2019win7/OpenMPT-UTF8.vcxproj Sun Apr 28 15:42:30 2024 (r20668) +++ trunk/OpenMPT/build/vs2019win7/OpenMPT-UTF8.vcxproj Sun Apr 28 16:34:58 2024 (r20669) @@ -874,6 +874,7 @@ <ClInclude Include="..\..\mptrack\PatternFont.h" /> <ClInclude Include="..\..\mptrack\PatternGotoDialog.h" /> <ClInclude Include="..\..\mptrack\PlugNotFoundDlg.h" /> + <ClInclude Include="..\..\mptrack\PluginComboBox.h" /> <ClInclude Include="..\..\mptrack\ProgressDialog.h" /> <ClInclude Include="..\..\mptrack\Reporting.h" /> <ClInclude Include="..\..\mptrack\ResizableDialog.h" /> @@ -1305,6 +1306,7 @@ <ClCompile Include="..\..\mptrack\PatternFont.cpp" /> <ClCompile Include="..\..\mptrack\PatternGotoDialog.cpp" /> <ClCompile Include="..\..\mptrack\PlugNotFoundDlg.cpp" /> + <ClCompile Include="..\..\mptrack\PluginComboBox.cpp" /> <ClCompile Include="..\..\mptrack\ProgressDialog.cpp" /> <ClCompile Include="..\..\mptrack\Reporting.cpp" /> <ClCompile Include="..\..\mptrack\ResizableDialog.cpp" /> Modified: trunk/OpenMPT/build/vs2019win7/OpenMPT-UTF8.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2019win7/OpenMPT-UTF8.vcxproj.filters Sun Apr 28 15:42:30 2024 (r20668) +++ trunk/OpenMPT/build/vs2019win7/OpenMPT-UTF8.vcxproj.filters Sun Apr 28 16:34:58 2024 (r20669) @@ -558,6 +558,9 @@ <ClInclude Include="..\..\mptrack\PlugNotFoundDlg.h"> <Filter>mptrack</Filter> </ClInclude> + <ClInclude Include="..\..\mptrack\PluginComboBox.h"> + <Filter>mptrack</Filter> + </ClInclude> <ClInclude Include="..\..\mptrack\ProgressDialog.h"> <Filter>mptrack</Filter> </ClInclude> @@ -1847,6 +1850,9 @@ <ClCompile Include="..\..\mptrack\PlugNotFoundDlg.cpp"> <Filter>mptrack</Filter> </ClCompile> + <ClCompile Include="..\..\mptrack\PluginComboBox.cpp"> + <Filter>mptrack</Filter> + </ClCompile> <ClCompile Include="..\..\mptrack\ProgressDialog.cpp"> <Filter>mptrack</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2019win7/OpenMPT.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2019win7/OpenMPT.vcxproj Sun Apr 28 15:42:30 2024 (r20668) +++ trunk/OpenMPT/build/vs2019win7/OpenMPT.vcxproj Sun Apr 28 16:34:58 2024 (r20669) @@ -874,6 +874,7 @@ <ClInclude Include="..\..\mptrack\PatternFont.h" /> <ClInclude Include="..\..\mptrack\PatternGotoDialog.h" /> <ClInclude Include="..\..\mptrack\PlugNotFoundDlg.h" /> + <ClInclude Include="..\..\mptrack\PluginComboBox.h" /> <ClInclude Include="..\..\mptrack\ProgressDialog.h" /> <ClInclude Include="..\..\mptrack\Reporting.h" /> <ClInclude Include="..\..\mptrack\ResizableDialog.h" /> @@ -1305,6 +1306,7 @@ <ClCompile Include="..\..\mptrack\PatternFont.cpp" /> <ClCompile Include="..\..\mptrack\PatternGotoDialog.cpp" /> <ClCompile Include="..\..\mptrack\PlugNotFoundDlg.cpp" /> + <ClCompile Include="..\..\mptrack\PluginComboBox.cpp" /> <ClCompile Include="..\..\mptrack\ProgressDialog.cpp" /> <ClCompile Include="..\..\mptrack\Reporting.cpp" /> <ClCompile Include="..\..\mptrack\ResizableDialog.cpp" /> Modified: trunk/OpenMPT/build/vs2019win7/OpenMPT.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2019win7/OpenMPT.vcxproj.filters Sun Apr 28 15:42:30 2024 (r20668) +++ trunk/OpenMPT/build/vs2019win7/OpenMPT.vcxproj.filters Sun Apr 28 16:34:58 2024 (r20669) @@ -558,6 +558,9 @@ <ClInclude Include="..\..\mptrack\PlugNotFoundDlg.h"> <Filter>mptrack</Filter> </ClInclude> + <ClInclude Include="..\..\mptrack\PluginComboBox.h"> + <Filter>mptrack</Filter> + </ClInclude> <ClInclude Include="..\..\mptrack\ProgressDialog.h"> <Filter>mptrack</Filter> </ClInclude> @@ -1847,6 +1850,9 @@ <ClCompile Include="..\..\mptrack\PlugNotFoundDlg.cpp"> <Filter>mptrack</Filter> </ClCompile> + <ClCompile Include="..\..\mptrack\PluginComboBox.cpp"> + <Filter>mptrack</Filter> + </ClCompile> <ClCompile Include="..\..\mptrack\ProgressDialog.cpp"> <Filter>mptrack</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2019win81/OpenMPT-ANSI.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2019win81/OpenMPT-ANSI.vcxproj Sun Apr 28 15:42:30 2024 (r20668) +++ trunk/OpenMPT/build/vs2019win81/OpenMPT-ANSI.vcxproj Sun Apr 28 16:34:58 2024 (r20669) @@ -874,6 +874,7 @@ <ClInclude Include="..\..\mptrack\PatternFont.h" /> <ClInclude Include="..\..\mptrack\PatternGotoDialog.h" /> <ClInclude Include="..\..\mptrack\PlugNotFoundDlg.h" /> + <ClInclude Include="..\..\mptrack\PluginComboBox.h" /> <ClInclude Include="..\..\mptrack\ProgressDialog.h" /> <ClInclude Include="..\..\mptrack\Reporting.h" /> <ClInclude Include="..\..\mptrack\ResizableDialog.h" /> @@ -1305,6 +1306,7 @@ <ClCompile Include="..\..\mptrack\PatternFont.cpp" /> <ClCompile Include="..\..\mptrack\PatternGotoDialog.cpp" /> <ClCompile Include="..\..\mptrack\PlugNotFoundDlg.cpp" /> + <ClCompile Include="..\..\mptrack\PluginComboBox.cpp" /> <ClCompile Include="..\..\mptrack\ProgressDialog.cpp" /> <ClCompile Include="..\..\mptrack\Reporting.cpp" /> <ClCompile Include="..\..\mptrack\ResizableDialog.cpp" /> Modified: trunk/OpenMPT/build/vs2019win81/OpenMPT-ANSI.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2019win81/OpenMPT-ANSI.vcxproj.filters Sun Apr 28 15:42:30 2024 (r20668) +++ trunk/OpenMPT/build/vs2019win81/OpenMPT-ANSI.vcxproj.filters Sun Apr 28 16:34:58 2024 (r20669) @@ -558,6 +558,9 @@ <ClInclude Include="..\..\mptrack\PlugNotFoundDlg.h"> <Filter>mptrack</Filter> </ClInclude> + <ClInclude Include="..\..\mptrack\PluginComboBox.h"> + <Filter>mptrack</Filter> + </ClInclude> <ClInclude Include="..\..\mptrack\ProgressDialog.h"> <Filter>mptrack</Filter> </ClInclude> @@ -1847,6 +1850,9 @@ <ClCompile Include="..\..\mptrack\PlugNotFoundDlg.cpp"> <Filter>mptrack</Filter> </ClCompile> + <ClCompile Include="..\..\mptrack\PluginComboBox.cpp"> + <Filter>mptrack</Filter> + </ClCompile> <ClCompile Include="..\..\mptrack\ProgressDialog.cpp"> <Filter>mptrack</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2019win81/OpenMPT-UTF8.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2019win81/OpenMPT-UTF8.vcxproj Sun Apr 28 15:42:30 2024 (r20668) +++ trunk/OpenMPT/build/vs2019win81/OpenMPT-UTF8.vcxproj Sun Apr 28 16:34:58 2024 (r20669) @@ -874,6 +874,7 @@ <ClInclude Include="..\..\mptrack\PatternFont.h" /> <ClInclude Include="..\..\mptrack\PatternGotoDialog.h" /> <ClInclude Include="..\..\mptrack\PlugNotFoundDlg.h" /> + <ClInclude Include="..\..\mptrack\PluginComboBox.h" /> <ClInclude Include="..\..\mptrack\ProgressDialog.h" /> <ClInclude Include="..\..\mptrack\Reporting.h" /> <ClInclude Include="..\..\mptrack\ResizableDialog.h" /> @@ -1305,6 +1306,7 @@ <ClCompile Include="..\..\mptrack\PatternFont.cpp" /> <ClCompile Include="..\..\mptrack\PatternGotoDialog.cpp" /> <ClCompile Include="..\..\mptrack\PlugNotFoundDlg.cpp" /> + <ClCompile Include="..\..\mptrack\PluginComboBox.cpp" /> <ClCompile Include="..\..\mptrack\ProgressDialog.cpp" /> <ClCompile Include="..\..\mptrack\Reporting.cpp" /> <ClCompile Include="..\..\mptrack\ResizableDialog.cpp" /> Modified: trunk/OpenMPT/build/vs2019win81/OpenMPT-UTF8.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2019win81/OpenMPT-UTF8.vcxproj.filters Sun Apr 28 15:42:30 2024 (r20668) +++ trunk/OpenMPT/build/vs2019win81/OpenMPT-UTF8.vcxproj.filters Sun Apr 28 16:34:58 2024 (r20669) @@ -558,6 +558,9 @@ <ClInclude Include="..\..\mptrack\PlugNotFoundDlg.h"> <Filter>mptrack</Filter> </ClInclude> + <ClInclude Include="..\..\mptrack\PluginComboBox.h"> + <Filter>mptrack</Filter> + </ClInclude> <ClInclude Include="..\..\mptrack\ProgressDialog.h"> <Filter>mptrack</Filter> </ClInclude> @@ -1847,6 +1850,9 @@ <ClCompile Include="..\..\mptrack\PlugNotFoundDlg.cpp"> <Filter>mptrack</Filter> </ClCompile> + <ClCompile Include="..\..\mptrack\PluginComboBox.cpp"> + <Filter>mptrack</Filter> + </ClCompile> <ClCompile Include="..\..\mptrack\ProgressDialog.cpp"> <Filter>mptrack</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2019win81/OpenMPT.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2019win81/OpenMPT.vcxproj Sun Apr 28 15:42:30 2024 (r20668) +++ trunk/OpenMPT/build/vs2019win81/OpenMPT.vcxproj Sun Apr 28 16:34:58 2024 (r20669) @@ -874,6 +874,7 @@ <ClInclude Include="..\..\mptrack\PatternFont.h" /> <ClInclude Include="..\..\mptrack\PatternGotoDialog.h" /> <ClInclude Include="..\..\mptrack\PlugNotFoundDlg.h" /> + <ClInclude Include="..\..\mptrack\PluginComboBox.h" /> <ClInclude Include="..\..\mptrack\ProgressDialog.h" /> <ClInclude Include="..\..\mptrack\Reporting.h" /> <ClInclude Include="..\..\mptrack\ResizableDialog.h" /> @@ -1305,6 +1306,7 @@ <ClCompile Include="..\..\mptrack\PatternFont.cpp" /> <ClCompile Include="..\..\mptrack\PatternGotoDialog.cpp" /> <ClCompile Include="..\..\mptrack\PlugNotFoundDlg.cpp" /> + <ClCompile Include="..\..\mptrack\PluginComboBox.cpp" /> <ClCompile Include="..\..\mptrack\ProgressDialog.cpp" /> <ClCompile Include="..\..\mptrack\Reporting.cpp" /> <ClCompile Include="..\..\mptrack\ResizableDialog.cpp" /> Modified: trunk/OpenMPT/build/vs2019win81/OpenMPT.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2019win81/OpenMPT.vcxproj.filters Sun Apr 28 15:42:30 2024 (r20668) +++ trunk/OpenMPT/build/vs2019win81/OpenMPT.vcxproj.filters Sun Apr 28 16:34:58 2024 (r20669) @@ -558,6 +558,9 @@ <ClInclude Include="..\..\mptrack\PlugNotFoundDlg.h"> <Filter>mptrack</Filter> </ClInclude> + <ClInclude Include="..\..\mptrack\PluginComboBox.h"> + <Filter>mptrack</Filter> + </ClInclude> <ClInclude Include="..\..\mptrack\ProgressDialog.h"> <Filter>mptrack</Filter> </ClInclude> @@ -1847,6 +1850,9 @@ <ClCompile Include="..\..\mptrack\PlugNotFoundDlg.cpp"> <Filter>mptrack</Filter> </ClCompile> + <ClCompile Include="..\..\mptrack\PluginComboBox.cpp"> + <Filter>mptrack</Filter> + </ClCompile> <ClCompile Include="..\..\mptrack\ProgressDialog.cpp"> <Filter>mptrack</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2022win10/OpenMPT-ANSI.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2022win10/OpenMPT-ANSI.vcxproj Sun Apr 28 15:42:30 2024 (r20668) +++ trunk/OpenMPT/build/vs2022win10/OpenMPT-ANSI.vcxproj Sun Apr 28 16:34:58 2024 (r20669) @@ -1670,6 +1670,7 @@ <ClInclude Include="..\..\mptrack\PatternFont.h" /> <ClInclude Include="..\..\mptrack\PatternGotoDialog.h" /> <ClInclude Include="..\..\mptrack\PlugNotFoundDlg.h" /> + <ClInclude Include="..\..\mptrack\PluginComboBox.h" /> <ClInclude Include="..\..\mptrack\ProgressDialog.h" /> <ClInclude Include="..\..\mptrack\Reporting.h" /> <ClInclude Include="..\..\mptrack\ResizableDialog.h" /> @@ -2101,6 +2102,7 @@ <ClCompile Include="..\..\mptrack\PatternFont.cpp" /> <ClCompile Include="..\..\mptrack\PatternGotoDialog.cpp" /> <ClCompile Include="..\..\mptrack\PlugNotFoundDlg.cpp" /> + <ClCompile Include="..\..\mptrack\PluginComboBox.cpp" /> <ClCompile Include="..\..\mptrack\ProgressDialog.cpp" /> <ClCompile Include="..\..\mptrack\Reporting.cpp" /> <ClCompile Include="..\..\mptrack\ResizableDialog.cpp" /> Modified: trunk/OpenMPT/build/vs2022win10/OpenMPT-ANSI.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2022win10/OpenMPT-ANSI.vcxproj.filters Sun Apr 28 15:42:30 2024 (r20668) +++ trunk/OpenMPT/build/vs2022win10/OpenMPT-ANSI.vcxproj.filters Sun Apr 28 16:34:58 2024 (r20669) @@ -558,6 +558,9 @@ <ClInclude Include="..\..\mptrack\PlugNotFoundDlg.h"> <Filter>mptrack</Filter> </ClInclude> + <ClInclude Include="..\..\mptrack\PluginComboBox.h"> + <Filter>mptrack</Filter> + </ClInclude> <ClInclude Include="..\..\mptrack\ProgressDialog.h"> <Filter>mptrack</Filter> </ClInclude> @@ -1847,6 +1850,9 @@ <ClCompile Include="..\..\mptrack\PlugNotFoundDlg.cpp"> <Filter>mptrack</Filter> </ClCompile> + <ClCompile Include="..\..\mptrack\PluginComboBox.cpp"> + <Filter>mptrack</Filter> + </ClCompile> <ClCompile Include="..\..\mptrack\ProgressDialog.cpp"> <Filter>mptrack</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2022win10/OpenMPT-UTF8.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2022win10/OpenMPT-UTF8.vcxproj Sun Apr 28 15:42:30 2024 (r20668) +++ trunk/OpenMPT/build/vs2022win10/OpenMPT-UTF8.vcxproj Sun Apr 28 16:34:58 2024 (r20669) @@ -1670,6 +1670,7 @@ <ClInclude Include="..\..\mptrack\PatternFont.h" /> <ClInclude Include="..\..\mptrack\PatternGotoDialog.h" /> <ClInclude Include="..\..\mptrack\PlugNotFoundDlg.h" /> + <ClInclude Include="..\..\mptrack\PluginComboBox.h" /> <ClInclude Include="..\..\mptrack\ProgressDialog.h" /> <ClInclude Include="..\..\mptrack\Reporting.h" /> <ClInclude Include="..\..\mptrack\ResizableDialog.h" /> @@ -2101,6 +2102,7 @@ <ClCompile Include="..\..\mptrack\PatternFont.cpp" /> <ClCompile Include="..\..\mptrack\PatternGotoDialog.cpp" /> <ClCompile Include="..\..\mptrack\PlugNotFoundDlg.cpp" /> + <ClCompile Include="..\..\mptrack\PluginComboBox.cpp" /> <ClCompile Include="..\..\mptrack\ProgressDialog.cpp" /> <ClCompile Include="..\..\mptrack\Reporting.cpp" /> <ClCompile Include="..\..\mptrack\ResizableDialog.cpp" /> Modified: trunk/OpenMPT/build/vs2022win10/OpenMPT-UTF8.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2022win10/OpenMPT-UTF8.vcxproj.filters Sun Apr 28 15:42:30 2024 (r20668) +++ trunk/OpenMPT/build/vs2022win10/OpenMPT-UTF8.vcxproj.filters Sun Apr 28 16:34:58 2024 (r20669) @@ -558,6 +558,9 @@ <ClInclude Include="..\..\mptrack\PlugNotFoundDlg.h"> <Filter>mptrack</Filter> </ClInclude> + <ClInclude Include="..\..\mptrack\PluginComboBox.h"> + <Filter>mptrack</Filter> + </ClInclude> <ClInclude Include="..\..\mptrack\ProgressDialog.h"> <Filter>mptrack</Filter> </ClInclude> @@ -1847,6 +1850,9 @@ <ClCompile Include="..\..\mptrack\PlugNotFoundDlg.cpp"> <Filter>mptrack</Filter> </ClCompile> + <ClCompile Include="..\..\mptrack\PluginComboBox.cpp"> + <Filter>mptrack</Filter> + </ClCompile> <ClCompile Include="..\..\mptrack\ProgressDialog.cpp"> <Filter>mptrack</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2022win10/OpenMPT.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2022win10/OpenMPT.vcxproj Sun Apr 28 15:42:30 2024 (r20668) +++ trunk/OpenMPT/build/vs2022win10/OpenMPT.vcxproj Sun Apr 28 16:34:58 2024 (r20669) @@ -1670,6 +1670,7 @@ <ClInclude Include="..\..\mptrack\PatternFont.h" /> <ClInclude Include="..\..\mptrack\PatternGotoDialog.h" /> <ClInclude Include="..\..\mptrack\PlugNotFoundDlg.h" /> + <ClInclude Include="..\..\mptrack\PluginComboBox.h" /> <ClInclude Include="..\..\mptrack\ProgressDialog.h" /> <ClInclude Include="..\..\mptrack\Reporting.h" /> <ClInclude Include="..\..\mptrack\ResizableDialog.h" /> @@ -2101,6 +2102,7 @@ <ClCompile Include="..\..\mptrack\PatternFont.cpp" /> <ClCompile Include="..\..\mptrack\PatternGotoDialog.cpp" /> <ClCompile Include="..\..\mptrack\PlugNotFoundDlg.cpp" /> + <ClCompile Include="..\..\mptrack\PluginComboBox.cpp" /> <ClCompile Include="..\..\mptrack\ProgressDialog.cpp" /> <ClCompile Include="..\..\mptrack\Reporting.cpp" /> <ClCompile Include="..\..\mptrack\ResizableDialog.cpp" /> Modified: trunk/OpenMPT/build/vs2022win10/OpenMPT.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2022win10/OpenMPT.vcxproj.filters Sun Apr 28 15:42:30 2024 (r20668) +++ trunk/OpenMPT/build/vs2022win10/OpenMPT.vcxproj.filters Sun Apr 28 16:34:58 2024 (r20669) @@ -558,6 +558,9 @@ <ClInclude Include="..\..\mptrack\PlugNotFoundDlg.h"> <Filter>mptrack</Filter> </ClInclude> + <ClInclude Include="..\..\mptrack\PluginComboBox.h"> + <Filter>mptrack</Filter> + </ClInclude> <ClInclude Include="..\..\mptrack\ProgressDialog.h"> <Filter>mptrack</Filter> </ClInclude> @@ -1847,6 +1850,9 @@ <ClCompile Include="..\..\mptrack\PlugNotFoundDlg.cpp"> <Filter>mptrack</Filter> </ClCompile> + <ClCompile Include="..\..\mptrack\PluginComboBox.cpp"> + <Filter>mptrack</Filter> + </ClCompile> <ClCompile Include="..\..\mptrack\ProgressDialog.cpp"> <Filter>mptrack</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2022win10clang/OpenMPT-ANSI.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2022win10clang/OpenMPT-ANSI.vcxproj Sun Apr 28 15:42:30 2024 (r20668) +++ trunk/OpenMPT/build/vs2022win10clang/OpenMPT-ANSI.vcxproj Sun Apr 28 16:34:58 2024 (r20669) @@ -1626,6 +1626,7 @@ <ClInclude Include="..\..\mptrack\PatternFont.h" /> <ClInclude Include="..\..\mptrack\PatternGotoDialog.h" /> <ClInclude Include="..\..\mptrack\PlugNotFoundDlg.h" /> + <ClInclude Include="..\..\mptrack\PluginComboBox.h" /> <ClInclude Include="..\..\mptrack\ProgressDialog.h" /> <ClInclude Include="..\..\mptrack\Reporting.h" /> <ClInclude Include="..\..\mptrack\ResizableDialog.h" /> @@ -2057,6 +2058,7 @@ <ClCompile Include="..\..\mptrack\PatternFont.cpp" /> <ClCompile Include="..\..\mptrack\PatternGotoDialog.cpp" /> <ClCompile Include="..\..\mptrack\PlugNotFoundDlg.cpp" /> + <ClCompile Include="..\..\mptrack\PluginComboBox.cpp" /> <ClCompile Include="..\..\mptrack\ProgressDialog.cpp" /> <ClCompile Include="..\..\mptrack\Reporting.cpp" /> <ClCompile Include="..\..\mptrack\ResizableDialog.cpp" /> Modified: trunk/OpenMPT/build/vs2022win10clang/OpenMPT-ANSI.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2022win10clang/OpenMPT-ANSI.vcxproj.filters Sun Apr 28 15:42:30 2024 (r20668) +++ trunk/OpenMPT/build/vs2022win10clang/OpenMPT-ANSI.vcxproj.filters Sun Apr 28 16:34:58 2024 (r20669) @@ -516,6 +516,9 @@ <ClInclude Include="..\..\mptrack\PlugNotFoundDlg.h"> <Filter>mptrack</Filter> </ClInclude> + <ClInclude Include="..\..\mptrack\PluginComboBox.h"> + <Filter>mptrack</Filter> + </ClInclude> <ClInclude Include="..\..\mptrack\ProgressDialog.h"> <Filter>mptrack</Filter> </ClInclude> @@ -1805,6 +1808,9 @@ <ClCompile Include="..\..\mptrack\PlugNotFoundDlg.cpp"> <Filter>mptrack</Filter> </ClCompile> + <ClCompile Include="..\..\mptrack\PluginComboBox.cpp"> + <Filter>mptrack</Filter> + </ClCompile> <ClCompile Include="..\..\mptrack\ProgressDialog.cpp"> <Filter>mptrack</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2022win10clang/OpenMPT-UTF8.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2022win10clang/OpenMPT-UTF8.vcxproj Sun Apr 28 15:42:30 2024 (r20668) +++ trunk/OpenMPT/build/vs2022win10clang/OpenMPT-UTF8.vcxproj Sun Apr 28 16:34:58 2024 (r20669) @@ -1626,6 +1626,7 @@ <ClInclude Include="..\..\mptrack\PatternFont.h" /> <ClInclude Include="..\..\mptrack\PatternGotoDialog.h" /> <ClInclude Include="..\..\mptrack\PlugNotFoundDlg.h" /> + <ClInclude Include="..\..\mptrack\PluginComboBox.h" /> <ClInclude Include="..\..\mptrack\ProgressDialog.h" /> <ClInclude Include="..\..\mptrack\Reporting.h" /> <ClInclude Include="..\..\mptrack\ResizableDialog.h" /> @@ -2057,6 +2058,7 @@ <ClCompile Include="..\..\mptrack\PatternFont.cpp" /> <ClCompile Include="..\..\mptrack\PatternGotoDialog.cpp" /> <ClCompile Include="..\..\mptrack\PlugNotFoundDlg.cpp" /> + <ClCompile Include="..\..\mptrack\PluginComboBox.cpp" /> <ClCompile Include="..\..\mptrack\ProgressDialog.cpp" /> <ClCompile Include="..\..\mptrack\Reporting.cpp" /> <ClCompile Include="..\..\mptrack\ResizableDialog.cpp" /> Modified: trunk/OpenMPT/build/vs2022win10clang/OpenMPT-UTF8.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2022win10clang/OpenMPT-UTF8.vcxproj.filters Sun Apr 28 15:42:30 2024 (r20668) +++ trunk/OpenMPT/build/vs2022win10clang/OpenMPT-UTF8.vcxproj.filters Sun Apr 28 16:34:58 2024 (r20669) @@ -516,6 +516,9 @@ <ClInclude Include="..\..\mptrack\PlugNotFoundDlg.h"> <Filter>mptrack</Filter> </ClInclude> + <ClInclude Include="..\..\mptrack\PluginComboBox.h"> + <Filter>mptrack</Filter> + </ClInclude> <ClInclude Include="..\..\mptrack\ProgressDialog.h"> <Filter>mptrack</Filter> </ClInclude> @@ -1805,6 +1808,9 @@ <ClCompile Include="..\..\mptrack\PlugNotFoundDlg.cpp"> <Filter>mptrack</Filter> </ClCompile> + <ClCompile Include="..\..\mptrack\PluginComboBox.cpp"> + <Filter>mptrack</Filter> + </ClCompile> <ClCompile Include="..\..\mptrack\ProgressDialog.cpp"> <Filter>mptrack</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2022win10clang/OpenMPT.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2022win10clang/OpenMPT.vcxproj Sun Apr 28 15:42:30 2024 (r20668) +++ trunk/OpenMPT/build/vs2022win10clang/OpenMPT.vcxproj Sun Apr 28 16:34:58 2024 (r20669) @@ -1626,6 +1626,7 @@ <ClInclude Include="..\..\mptrack\PatternFont.h" /> <ClInclude Include="..\..\mptrack\PatternGotoDialog.h" /> <ClInclude Include="..\..\mptrack\PlugNotFoundDlg.h" /> + <ClInclude Include="..\..\mptrack\PluginComboBox.h" /> <ClInclude Include="..\..\mptrack\ProgressDialog.h" /> <ClInclude Include="..\..\mptrack\Reporting.h" /> <ClInclude Include="..\..\mptrack\ResizableDialog.h" /> @@ -2057,6 +2058,7 @@ <ClCompile Include="..\..\mptrack\PatternFont.cpp" /> <ClCompile Include="..\..\mptrack\PatternGotoDialog.cpp" /> <ClCompile Include="..\..\mptrack\PlugNotFoundDlg.cpp" /> + <ClCompile Include="..\..\mptrack\PluginComboBox.cpp" /> <ClCompile Include="..\..\mptrack\ProgressDialog.cpp" /> <ClCompile Include="..\..\mptrack\Reporting.cpp" /> <ClCompile Include="..\..\mptrack\ResizableDialog.cpp" /> Modified: trunk/OpenMPT/build/vs2022win10clang/OpenMPT.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2022win10clang/OpenMPT.vcxproj.filters Sun Apr 28 15:42:30 2024 (r20668) +++ trunk/OpenMPT/build/vs2022win10clang/OpenMPT.vcxproj.filters Sun Apr 28 16:34:58 2024 (r20669) @@ -516,6 +516,9 @@ <ClInclude Include="..\..\mptrack\PlugNotFoundDlg.h"> <Filter>mptrack</Filter> </ClInclude> + <ClInclude Include="..\..\mptrack\PluginComboBox.h"> + <Filter>mptrack</Filter> + </ClInclude> <ClInclude Include="..\..\mptrack\ProgressDialog.h"> <Filter>mptrack</Filter> </ClInclude> @@ -1805,6 +1808,9 @@ <ClCompile Include="..\..\mptrack\PlugNotFoundDlg.cpp"> <Filter>mptrack</Filter> </ClCompile> + <ClCompile Include="..\..\mptrack\PluginComboBox.cpp"> + <Filter>mptrack</Filter> + </ClCompile> <ClCompile Include="..\..\mptrack\ProgressDialog.cpp"> <Filter>mptrack</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2022win7/OpenMPT-ANSI.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2022win7/OpenMPT-ANSI.vcxproj Sun Apr 28 15:42:30 2024 (r20668) +++ trunk/OpenMPT/build/vs2022win7/OpenMPT-ANSI.vcxproj Sun Apr 28 16:34:58 2024 (r20669) @@ -894,6 +894,7 @@ <ClInclude Include="..\..\mptrack\PatternFont.h" /> <ClInclude Include="..\..\mptrack\PatternGotoDialog.h" /> <ClInclude Include="..\..\mptrack\PlugNotFoundDlg.h" /> + <ClInclude Include="..\..\mptrack\PluginComboBox.h" /> <ClInclude Include="..\..\mptrack\ProgressDialog.h" /> <ClInclude Include="..\..\mptrack\Reporting.h" /> <ClInclude Include="..\..\mptrack\ResizableDialog.h" /> @@ -1325,6 +1326,7 @@ <ClCompile Include="..\..\mptrack\PatternFont.cpp" /> <ClCompile Include="..\..\mptrack\PatternGotoDialog.cpp" /> <ClCompile Include="..\..\mptrack\PlugNotFoundDlg.cpp" /> + <ClCompile Include="..\..\mptrack\PluginComboBox.cpp" /> <ClCompile Include="..\..\mptrack\ProgressDialog.cpp" /> <ClCompile Include="..\..\mptrack\Reporting.cpp" /> <ClCompile Include="..\..\mptrack\ResizableDialog.cpp" /> Modified: trunk/OpenMPT/build/vs2022win7/OpenMPT-ANSI.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2022win7/OpenMPT-ANSI.vcxproj.filters Sun Apr 28 15:42:30 2024 (r20668) +++ trunk/OpenMPT/build/vs2022win7/OpenMPT-ANSI.vcxproj.filters Sun Apr 28 16:34:58 2024 (r20669) @@ -558,6 +558,9 @@ <ClInclude Include="..\..\mptrack\PlugNotFoundDlg.h"> <Filter>mptrack</Filter> </ClInclude> + <ClInclude Include="..\..\mptrack\PluginComboBox.h"> + <Filter>mptrack</Filter> + </ClInclude> <ClInclude Include="..\..\mptrack\ProgressDialog.h"> <Filter>mptrack</Filter> </ClInclude> @@ -1847,6 +1850,9 @@ <ClCompile Include="..\..\mptrack\PlugNotFoundDlg.cpp"> <Filter>mptrack</Filter> </ClCompile> + <ClCompile Include="..\..\mptrack\PluginComboBox.cpp"> + <Filter>mptrack</Filter> + </ClCompile> <ClCompile Include="..\..\mptrack\ProgressDialog.cpp"> <Filter>mptrack</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2022win7/OpenMPT-UTF8.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2022win7/OpenMPT-UTF8.vcxproj Sun Apr 28 15:42:30 2024 (r20668) +++ trunk/OpenMPT/build/vs2022win7/OpenMPT-UTF8.vcxproj Sun Apr 28 16:34:58 2024 (r20669) @@ -894,6 +894,7 @@ <ClInclude Include="..\..\mptrack\PatternFont.h" /> <ClInclude Include="..\..\mptrack\PatternGotoDialog.h" /> <ClInclude Include="..\..\mptrack\PlugNotFoundDlg.h" /> + <ClInclude Include="..\..\mptrack\PluginComboBox.h" /> <ClInclude Include="..\..\mptrack\ProgressDialog.h" /> <ClInclude Include="..\..\mptrack\Reporting.h" /> <ClInclude Include="..\..\mptrack\ResizableDialog.h" /> @@ -1325,6 +1326,7 @@ <ClCompile Include="..\..\mptrack\PatternFont.cpp" /> <ClCompile Include="..\..\mptrack\PatternGotoDialog.cpp" /> <ClCompile Include="..\..\mptrack\PlugNotFoundDlg.cpp" /> + <ClCompile Include="..\..\mptrack\PluginComboBox.cpp" /> <ClCompile Include="..\..\mptrack\ProgressDialog.cpp" /> <ClCompile Include="..\..\mptrack\Reporting.cpp" /> <ClCompile Include="..\..\mptrack\ResizableDialog.cpp" /> Modified: trunk/OpenMPT/build/vs2022win7/OpenMPT-UTF8.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2022win7/OpenMPT-UTF8.vcxproj.filters Sun Apr 28 15:42:30 2024 (r20668) +++ trunk/OpenMPT/build/vs2022win7/OpenMPT-UTF8.vcxproj.filters Sun Apr 28 16:34:58 2024 (r20669) @@ -558,6 +558,9 @@ <ClInclude Include="..\..\mptrack\PlugNotFoundDlg.h"> <Filter>mptrack</Filter> </ClInclude> + <ClInclude Include="..\..\mptrack\PluginComboBox.h"> + <Filter>mptrack</Filter> + </ClInclude> <ClInclude Include="..\..\mptrack\ProgressDialog.h"> <Filter>mptrack</Filter> </ClInclude> @@ -1847,6 +1850,9 @@ <ClCompile Include="..\..\mptrack\PlugNotFoundDlg.cpp"> <Filter>mptrack</Filter> </ClCompile> + <ClCompile Include="..\..\mptrack\PluginComboBox.cpp"> + <Filter>mptrack</Filter> + </ClCompile> <ClCompile Include="..\..\mptrack\ProgressDialog.cpp"> <Filter>mptrack</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2022win7/OpenMPT.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2022win7/OpenMPT.vcxproj Sun Apr 28 15:42:30 2024 (r20668) +++ trunk/OpenMPT/build/vs2022win7/OpenMPT.vcxproj Sun Apr 28 16:34:58 2024 (r20669) @@ -894,6 +894,7 @@ <ClInclude Include="..\..\mptrack\PatternFont.h" /> <ClInclude Include="..\..\mptrack\PatternGotoDialog.h" /> <ClInclude Include="..\..\mptrack\PlugNotFoundDlg.h" /> + <ClInclude Include="..\..\mptrack\PluginComboBox.h" /> <ClInclude Include="..\..\mptrack\ProgressDialog.h" /> <ClInclude Include="..\..\mptrack\Reporting.h" /> <ClInclude Include="..\..\mptrack\ResizableDialog.h" /> @@ -1325,6 +1326,7 @@ <ClCompile Include="..\..\mptrack\PatternFont.cpp" /> <ClCompile Include="..\..\mptrack\PatternGotoDialog.cpp" /> <ClCompile Include="..\..\mptrack\PlugNotFoundDlg.cpp" /> + <ClCompile Include="..\..\mptrack\PluginComboBox.cpp" /> <ClCompile Include="..\..\mptrack\ProgressDialog.cpp" /> <ClCompile Include="..\..\mptrack\Reporting.cpp" /> <ClCompile Include="..\..\mptrack\ResizableDialog.cpp" /> Modified: trunk/OpenMPT/build/vs2022win7/OpenMPT.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2022win7/OpenMPT.vcxproj.filters Sun Apr 28 15:42:30 2024 (r20668) +++ trunk/OpenMPT/build/vs2022win7/OpenMPT.vcxproj.filters Sun Apr 28 16:34:58 2024 (r20669) @@ -558,6 +558,9 @@ <ClInclude Include="..\..\mptrack\PlugNotFoundDlg.h"> <Filter>mptrack</Filter> </ClInclude> + <ClInclude Include="..\..\mptrack\PluginComboBox.h"> + <Filter>mptrack</Filter> + </ClInclude> <ClInclude Include="..\..\mptrack\ProgressDialog.h"> <Filter>mptrack</Filter> </ClInclude> @@ -1847,6 +1850,9 @@ <ClCompile Include="..\..\mptrack\PlugNotFoundDlg.cpp"> <Filter>mptrack</Filter> </ClCompile> + <ClCompile Include="..\..\mptrack\PluginComboBox.cpp"> + <Filter>mptrack</Filter> + </ClCompile> <ClCompile Include="..\..\mptrack\ProgressDialog.cpp"> <Filter>mptrack</Filter> </ClCompile> Modified: trunk/OpenMPT/build/vs2022win81/OpenMPT-ANSI.vcxproj ============================================================================== --- trunk/OpenMPT/build/vs2022win81/OpenMPT-ANSI.vcxproj Sun Apr 28 15:42:30 2024 (r20668) +++ trunk/OpenMPT/build/vs2022win81/OpenMPT-ANSI.vcxproj Sun Apr 28 16:34:58 2024 (r20669) @@ -894,6 +894,7 @@ <ClInclude Include="..\..\mptrack\PatternFont.h" /> <ClInclude Include="..\..\mptrack\PatternGotoDialog.h" /> <ClInclude Include="..\..\mptrack\PlugNotFoundDlg.h" /> + <ClInclude Include="..\..\mptrack\PluginComboBox.h" /> <ClInclude Include="..\..\mptrack\ProgressDialog.h" /> <ClInclude Include="..\..\mptrack\Reporting.h" /> <ClInclude Include="..\..\mptrack\ResizableDialog.h" /> @@ -1325,6 +1326,7 @@ <ClCompile Include="..\..\mptrack\PatternFont.cpp" /> <ClCompile Include="..\..\mptrack\PatternGotoDialog.cpp" /> <ClCompile Include="..\..\mptrack\PlugNotFoundDlg.cpp" /> + <ClCompile Include="..\..\mptrack\PluginComboBox.cpp" /> <ClCompile Include="..\..\mptrack\ProgressDialog.cpp" /> <ClCompile Include="..\..\mptrack\Reporting.cpp" /> <ClCompile Include="..\..\mptrack\ResizableDialog.cpp" /> Modified: trunk/OpenMPT/build/vs2022win81/OpenMPT-ANSI.vcxproj.filters ============================================================================== --- trunk/OpenMPT/build/vs2022win81/OpenMPT-ANSI.vcxproj.filters Sun Apr 28 15:42:30 2024 (r20668) +++ trunk/OpenMPT/build/vs2022win81/OpenMPT-ANSI.vcxproj.filters Sun Apr 28 16:34:58 2024 (r20669) @@ -558,6 +558,9 @@ <ClInclude Include="..\..\mptrack\PlugNotFoundDlg.h"> <Filter>mptrack</Filter> </ClInclude> + <ClInclude Include="..\..\mptrack\PluginComboBox.h"> + <Filter>mptrack</Filter> + </ClInclude> <ClInclude Include="..\..\mptrack\ProgressDialog.h"> <Filter>mptrack</Filter> </ClInclude> @@ -1847,6 +1850,9 @@ <ClCompile Include="..\..\mptrack\PlugNotFoundDlg.cpp"> <Filter>mptrack</Filter> </ClCompile> + <ClCompile Include="..\..\mptrack\PluginComboBox.cpp"> + <Filter>mptrack</Filter> + </ClCompile> <ClCompile Include="..\..\mptrack\ProgressDialog.cpp"> <Filter>mptrack</Filter> ... [truncated message content] |
|
From: <sv...@op...> - 2024-04-28 13:42:42
|
Author: sagamusix Date: Sun Apr 28 15:42:30 2024 New Revision: 20668 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20668 Log: Merged revision(s) 20667 from trunk/OpenMPT: [Fix] Find/Replace: In the plugin parameter dropdown, parameter 999 was missing if the number of plugin parameters was unknown. [Fix] When changing the output plugin from the LFO plugin's editor, the change was not reflected in the General tab. ........ Modified: branches/OpenMPT-1.31/ (props changed) branches/OpenMPT-1.31/mptrack/PatternFindReplaceDlg.cpp branches/OpenMPT-1.31/mptrack/plugins/LFOPluginEditor.cpp Modified: branches/OpenMPT-1.31/mptrack/PatternFindReplaceDlg.cpp ============================================================================== --- branches/OpenMPT-1.31/mptrack/PatternFindReplaceDlg.cpp Sun Apr 28 15:42:13 2024 (r20667) +++ branches/OpenMPT-1.31/mptrack/PatternFindReplaceDlg.cpp Sun Apr 28 15:42:30 2024 (r20668) @@ -510,8 +510,8 @@ AddPluginParameternamesToCombobox(m_cbnPCParam, *m_sndFile.m_MixPlugins[plug].pMixPlugin); } else { - m_cbnPCParam.InitStorage(ModCommand::maxColumnValue, 20); - for(int i = 0; i < ModCommand::maxColumnValue; i++) + m_cbnPCParam.InitStorage(ModCommand::maxColumnValue + 1, 20); + for(int i = 0; i < ModCommand::maxColumnValue + 1; i++) { wsprintf(s, _T("%02u: Parameter %02u"), static_cast<unsigned int>(i), static_cast<unsigned int>(i)); m_cbnPCParam.SetItemData(m_cbnPCParam.AddString(s), i); Modified: branches/OpenMPT-1.31/mptrack/plugins/LFOPluginEditor.cpp ============================================================================== --- branches/OpenMPT-1.31/mptrack/plugins/LFOPluginEditor.cpp Sun Apr 28 15:42:13 2024 (r20667) +++ branches/OpenMPT-1.31/mptrack/plugins/LFOPluginEditor.cpp Sun Apr 28 15:42:30 2024 (r20668) @@ -373,6 +373,8 @@ m_lfoPlugin.GetSoundFile().m_MixPlugins[m_lfoPlugin.GetSlot()].SetOutputPlugin(plug); m_lfoPlugin.SetModified(); UpdateParamDisplays(); + if(CModDoc *modDoc = m_lfoPlugin.GetSoundFile().GetpModDoc(); modDoc != nullptr) + modDoc->UpdateAllViews(nullptr, PluginHint(m_lfoPlugin.GetSlot() + 1).Info(), this); } } } |
|
From: <sv...@op...> - 2024-04-28 13:42:25
|
Author: sagamusix Date: Sun Apr 28 15:42:13 2024 New Revision: 20667 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20667 Log: [Fix] Find/Replace: In the plugin parameter dropdown, parameter 999 was missing if the number of plugin parameters was unknown. [Fix] When changing the output plugin from the LFO plugin's editor, the change was not reflected in the General tab. Modified: trunk/OpenMPT/mptrack/PatternFindReplaceDlg.cpp trunk/OpenMPT/mptrack/plugins/LFOPluginEditor.cpp Modified: trunk/OpenMPT/mptrack/PatternFindReplaceDlg.cpp ============================================================================== --- trunk/OpenMPT/mptrack/PatternFindReplaceDlg.cpp Sun Apr 28 00:16:56 2024 (r20666) +++ trunk/OpenMPT/mptrack/PatternFindReplaceDlg.cpp Sun Apr 28 15:42:13 2024 (r20667) @@ -509,8 +509,8 @@ AddPluginParameternamesToCombobox(m_cbnPCParam, *m_sndFile.m_MixPlugins[plug].pMixPlugin); } else { - m_cbnPCParam.InitStorage(ModCommand::maxColumnValue, 20); - for(int i = 0; i < ModCommand::maxColumnValue; i++) + m_cbnPCParam.InitStorage(ModCommand::maxColumnValue + 1, 20); + for(int i = 0; i < ModCommand::maxColumnValue + 1; i++) { wsprintf(s, _T("%02u: Parameter %02u"), static_cast<unsigned int>(i), static_cast<unsigned int>(i)); m_cbnPCParam.SetItemData(m_cbnPCParam.AddString(s), i); Modified: trunk/OpenMPT/mptrack/plugins/LFOPluginEditor.cpp ============================================================================== --- trunk/OpenMPT/mptrack/plugins/LFOPluginEditor.cpp Sun Apr 28 00:16:56 2024 (r20666) +++ trunk/OpenMPT/mptrack/plugins/LFOPluginEditor.cpp Sun Apr 28 15:42:13 2024 (r20667) @@ -373,6 +373,8 @@ m_lfoPlugin.GetSoundFile().m_MixPlugins[m_lfoPlugin.GetSlot()].SetOutputPlugin(plug); m_lfoPlugin.SetModified(); UpdateParamDisplays(); + if(CModDoc *modDoc = m_lfoPlugin.GetSoundFile().GetpModDoc(); modDoc != nullptr) + modDoc->UpdateAllViews(nullptr, PluginHint(m_lfoPlugin.GetSlot() + 1).Info(), this); } } } |
|
From: <sv...@op...> - 2024-04-27 22:17:07
|
Author: sagamusix Date: Sun Apr 28 00:16:56 2024 New Revision: 20666 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20666 Log: Merged revision(s) 20662 from trunk/OpenMPT: [Fix] Opal: With mix rates exceeding 131kHz, it was possible that the interpolated output overflowed. The new linear interpolation is based on OpenMPT's own mixer code, and may also be slightly faster because it divides by SampleRate only once (https://bugs.openmpt.org/view.php?id=1775). ........ Modified: branches/OpenMPT-1.28/ (props changed) branches/OpenMPT-1.28/soundlib/opal.h Modified: branches/OpenMPT-1.28/soundlib/opal.h ============================================================================== --- branches/OpenMPT-1.28/soundlib/opal.h Sun Apr 28 00:15:29 2024 (r20665) +++ branches/OpenMPT-1.28/soundlib/opal.h Sun Apr 28 00:16:56 2024 (r20666) @@ -21,6 +21,7 @@ #include <cstdint> +#include "../common/mptBaseUtils.h" @@ -563,9 +564,9 @@ } // Mix with the partial accumulation - int32_t omblend = SampleRate - SampleAccum; - *left = static_cast<uint16_t>((LastOutput[0] * omblend + CurrOutput[0] * SampleAccum) / SampleRate); - *right = static_cast<uint16_t>((LastOutput[1] * omblend + CurrOutput[1] * SampleAccum) / SampleRate); + const int32_t fract = Util::muldivr(SampleAccum, 65536, SampleRate); + *left = static_cast<int16_t>(LastOutput[0] + ((fract * (CurrOutput[0] - LastOutput[0])) / 65536)); + *right = static_cast<int16_t>(LastOutput[1] + ((fract * (CurrOutput[1] - LastOutput[1])) / 65536)); SampleAccum += OPL3SampleRate; } @@ -595,14 +596,14 @@ else if (leftmix > 0x7FFF) left = 0x7FFF; else - left = static_cast<uint16_t>(leftmix); + left = static_cast<int16_t>(leftmix); if (rightmix < -0x8000) right = -0x8000; else if (rightmix > 0x7FFF) right = 0x7FFF; else - right = static_cast<uint16_t>(rightmix); + right = static_cast<int16_t>(rightmix); Clock++; |
|
From: <sv...@op...> - 2024-04-27 22:15:37
|
Author: sagamusix Date: Sun Apr 28 00:15:29 2024 New Revision: 20665 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20665 Log: Merged revision(s) 20660-20662 from trunk/OpenMPT: [Fix] S3M: In mono mode, the ratio between sample and OPL volume was incorrect (https://bugs.openmpt.org/view.php?id=1774). ........ [Fix] Opal: With mix rates exceeding 131kHz, it was possible that the interpolated output overflowed. The new linear interpolation is based on OpenMPT's own mixer code, and may also be slightly faster because it divides by SampleRate only once (https://bugs.openmpt.org/view.php?id=1775). ........ Modified: branches/OpenMPT-1.29/ (props changed) branches/OpenMPT-1.29/soundlib/Load_s3m.cpp branches/OpenMPT-1.29/soundlib/opal.h Modified: branches/OpenMPT-1.29/soundlib/Load_s3m.cpp ============================================================================== --- branches/OpenMPT-1.29/soundlib/Load_s3m.cpp Sun Apr 28 00:14:57 2024 (r20664) +++ branches/OpenMPT-1.29/soundlib/Load_s3m.cpp Sun Apr 28 00:15:29 2024 (r20665) @@ -425,15 +425,18 @@ else m_nSamplePreAmp = std::max(fileHeader.masterVolume & 0x7F, 0x10); // Bit 7 = Stereo (we always use stereo) - const bool isStereo = (fileHeader.masterVolume & 0x80) != 0 || m_dwLastSavedWithVersion; - if(!isStereo) - m_nSamplePreAmp = Util::muldivr_unsigned(m_nSamplePreAmp, 8, 11); - // Approximately as loud as in DOSBox and a real SoundBlaster 16 m_nVSTiVolume = 36; if(isSchism && fileHeader.cwtv < SchismVersionFromDate<2018, 11, 12>::Version(S3MFileHeader::trkSchismTracker)) m_nVSTiVolume = 64; + const bool isStereo = (fileHeader.masterVolume & 0x80) != 0 || m_dwLastSavedWithVersion; + if(!isStereo) + { + m_nSamplePreAmp = Util::muldivr_unsigned(m_nSamplePreAmp, 8, 11); + m_nVSTiVolume = Util::muldivr_unsigned(m_nVSTiVolume, 8, 11); + } + // Channel setup m_nChannels = 4; std::bitset<32> isAdlibChannel; @@ -477,8 +480,7 @@ // Read extended channel panning if(fileHeader.usePanningTable == S3MFileHeader::idPanning) { - uint8 pan[32]; - file.ReadArray(pan); + const auto pan = file.ReadArray<uint8, 32>(); for(CHANNELINDEX i = 0; i < 32; i++) { if((pan[i] & 0x20) != 0 && (!isST3 || !isAdlibChannel[i])) @@ -782,7 +784,8 @@ // Write patterns enum class S3MChannelType : uint8 { kUnused = 0, kPCM = 1, kAdlib = 2 }; - FlagSet<S3MChannelType> channelType[32] = { S3MChannelType::kUnused }; + std::array<FlagSet<S3MChannelType>, 32> channelType; + channelType.fill(S3MChannelType::kUnused); bool globalCmdOnMutedChn = false; for(PATTERNINDEX pat = 0; pat < writePatterns; pat++) { Modified: branches/OpenMPT-1.29/soundlib/opal.h ============================================================================== --- branches/OpenMPT-1.29/soundlib/opal.h Sun Apr 28 00:14:57 2024 (r20664) +++ branches/OpenMPT-1.29/soundlib/opal.h Sun Apr 28 00:15:29 2024 (r20665) @@ -22,6 +22,7 @@ #include <cstdint> +#include "../common/mptBaseUtils.h" @@ -574,9 +575,9 @@ } // Mix with the partial accumulation - int32_t omblend = SampleRate - SampleAccum; - *left = static_cast<uint16_t>((LastOutput[0] * omblend + CurrOutput[0] * SampleAccum) / SampleRate); - *right = static_cast<uint16_t>((LastOutput[1] * omblend + CurrOutput[1] * SampleAccum) / SampleRate); + const int32_t fract = Util::muldivr(SampleAccum, 65536, SampleRate); + *left = static_cast<int16_t>(LastOutput[0] + ((fract * (CurrOutput[0] - LastOutput[0])) / 65536)); + *right = static_cast<int16_t>(LastOutput[1] + ((fract * (CurrOutput[1] - LastOutput[1])) / 65536)); SampleAccum += OPL3SampleRate; } @@ -606,14 +607,14 @@ else if (leftmix > 0x7FFF) left = 0x7FFF; else - left = static_cast<uint16_t>(leftmix); + left = static_cast<int16_t>(leftmix); if (rightmix < -0x8000) right = -0x8000; else if (rightmix > 0x7FFF) right = 0x7FFF; else - right = static_cast<uint16_t>(rightmix); + right = static_cast<int16_t>(rightmix); Clock++; |
|
From: <sv...@op...> - 2024-04-27 22:15:04
|
Author: sagamusix Date: Sun Apr 28 00:14:57 2024 New Revision: 20664 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20664 Log: Merged revision(s) 20660-20662 from trunk/OpenMPT: [Fix] S3M: In mono mode, the ratio between sample and OPL volume was incorrect (https://bugs.openmpt.org/view.php?id=1774). ........ [Fix] Opal: With mix rates exceeding 131kHz, it was possible that the interpolated output overflowed. The new linear interpolation is based on OpenMPT's own mixer code, and may also be slightly faster because it divides by SampleRate only once (https://bugs.openmpt.org/view.php?id=1775). ........ Modified: branches/OpenMPT-1.30/ (props changed) branches/OpenMPT-1.30/soundlib/Load_s3m.cpp branches/OpenMPT-1.30/soundlib/opal.h Modified: branches/OpenMPT-1.30/soundlib/Load_s3m.cpp ============================================================================== --- branches/OpenMPT-1.30/soundlib/Load_s3m.cpp Sun Apr 28 00:14:27 2024 (r20663) +++ branches/OpenMPT-1.30/soundlib/Load_s3m.cpp Sun Apr 28 00:14:57 2024 (r20664) @@ -432,15 +432,18 @@ else m_nSamplePreAmp = std::max(fileHeader.masterVolume & 0x7F, 0x10); // Bit 7 = Stereo (we always use stereo) - const bool isStereo = (fileHeader.masterVolume & 0x80) != 0 || m_dwLastSavedWithVersion; - if(!isStereo) - m_nSamplePreAmp = Util::muldivr_unsigned(m_nSamplePreAmp, 8, 11); - // Approximately as loud as in DOSBox and a real SoundBlaster 16 m_nVSTiVolume = 36; if(isSchism && schismDateVersion < SchismVersionFromDate<2018, 11, 12>::date) m_nVSTiVolume = 64; + const bool isStereo = (fileHeader.masterVolume & 0x80) != 0 || m_dwLastSavedWithVersion; + if(!isStereo) + { + m_nSamplePreAmp = Util::muldivr_unsigned(m_nSamplePreAmp, 8, 11); + m_nVSTiVolume = Util::muldivr_unsigned(m_nVSTiVolume, 8, 11); + } + // Channel setup m_nChannels = 4; std::bitset<32> isAdlibChannel; @@ -484,8 +487,7 @@ // Read extended channel panning if(fileHeader.usePanningTable == S3MFileHeader::idPanning) { - uint8 pan[32]; - file.ReadArray(pan); + const auto pan = file.ReadArray<uint8, 32>(); for(CHANNELINDEX i = 0; i < 32; i++) { if((pan[i] & 0x20) != 0 && (!isST3 || !isAdlibChannel[i])) @@ -818,7 +820,8 @@ // Write patterns enum class S3MChannelType : uint8 { kUnused = 0, kPCM = 1, kAdlib = 2 }; - FlagSet<S3MChannelType> channelType[32] = { S3MChannelType::kUnused }; + std::array<FlagSet<S3MChannelType>, 32> channelType; + channelType.fill(S3MChannelType::kUnused); bool globalCmdOnMutedChn = false; for(PATTERNINDEX pat = 0; pat < writePatterns; pat++) { Modified: branches/OpenMPT-1.30/soundlib/opal.h ============================================================================== --- branches/OpenMPT-1.30/soundlib/opal.h Sun Apr 28 00:14:27 2024 (r20663) +++ branches/OpenMPT-1.30/soundlib/opal.h Sun Apr 28 00:14:57 2024 (r20664) @@ -22,6 +22,7 @@ #include <cstdint> +#include "../common/mptBaseUtils.h" @@ -574,9 +575,9 @@ } // Mix with the partial accumulation - int32_t omblend = SampleRate - SampleAccum; - *left = static_cast<uint16_t>((LastOutput[0] * omblend + CurrOutput[0] * SampleAccum) / SampleRate); - *right = static_cast<uint16_t>((LastOutput[1] * omblend + CurrOutput[1] * SampleAccum) / SampleRate); + const int32_t fract = Util::muldivr(SampleAccum, 65536, SampleRate); + *left = static_cast<int16_t>(LastOutput[0] + ((fract * (CurrOutput[0] - LastOutput[0])) / 65536)); + *right = static_cast<int16_t>(LastOutput[1] + ((fract * (CurrOutput[1] - LastOutput[1])) / 65536)); SampleAccum += OPL3SampleRate; } @@ -606,14 +607,14 @@ else if (leftmix > 0x7FFF) left = 0x7FFF; else - left = static_cast<uint16_t>(leftmix); + left = static_cast<int16_t>(leftmix); if (rightmix < -0x8000) right = -0x8000; else if (rightmix > 0x7FFF) right = 0x7FFF; else - right = static_cast<uint16_t>(rightmix); + right = static_cast<int16_t>(rightmix); Clock++; |
|
From: <sv...@op...> - 2024-04-27 22:14:39
|
Author: sagamusix Date: Sun Apr 28 00:14:27 2024 New Revision: 20663 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20663 Log: Merged revision(s) 20662 from trunk/OpenMPT: [Fix] Opal: With mix rates exceeding 131kHz, it was possible that the interpolated output overflowed. The new linear interpolation is based on OpenMPT's own mixer code, and may also be slightly faster because it divides by SampleRate only once (https://bugs.openmpt.org/view.php?id=1775). ........ Modified: branches/OpenMPT-1.31/ (props changed) branches/OpenMPT-1.31/soundlib/opal.h Modified: branches/OpenMPT-1.31/soundlib/opal.h ============================================================================== --- branches/OpenMPT-1.31/soundlib/opal.h Sun Apr 28 00:13:39 2024 (r20662) +++ branches/OpenMPT-1.31/soundlib/opal.h Sun Apr 28 00:14:27 2024 (r20663) @@ -22,6 +22,7 @@ #include <cstdint> +#include "../common/mptBaseUtils.h" @@ -574,9 +575,9 @@ } // Mix with the partial accumulation - int32_t omblend = SampleRate - SampleAccum; - *left = static_cast<uint16_t>((LastOutput[0] * omblend + CurrOutput[0] * SampleAccum) / SampleRate); - *right = static_cast<uint16_t>((LastOutput[1] * omblend + CurrOutput[1] * SampleAccum) / SampleRate); + const int32_t fract = Util::muldivr(SampleAccum, 65536, SampleRate); + *left = static_cast<int16_t>(LastOutput[0] + ((fract * (CurrOutput[0] - LastOutput[0])) / 65536)); + *right = static_cast<int16_t>(LastOutput[1] + ((fract * (CurrOutput[1] - LastOutput[1])) / 65536)); SampleAccum += OPL3SampleRate; } @@ -606,14 +607,14 @@ else if (leftmix > 0x7FFF) left = 0x7FFF; else - left = static_cast<uint16_t>(leftmix); + left = static_cast<int16_t>(leftmix); if (rightmix < -0x8000) right = -0x8000; else if (rightmix > 0x7FFF) right = 0x7FFF; else - right = static_cast<uint16_t>(rightmix); + right = static_cast<int16_t>(rightmix); Clock++; |
|
From: <sv...@op...> - 2024-04-27 22:13:53
|
Author: sagamusix Date: Sun Apr 28 00:13:39 2024 New Revision: 20662 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20662 Log: [Fix] Opal: With mix rates exceeding 131kHz, it was possible that the interpolated output overflowed. The new linear interpolation is based on OpenMPT's own mixer code, and may also be slightly faster because it divides by SampleRate only once (https://bugs.openmpt.org/view.php?id=1775). Modified: trunk/OpenMPT/soundlib/opal.h Modified: trunk/OpenMPT/soundlib/opal.h ============================================================================== --- trunk/OpenMPT/soundlib/opal.h Fri Apr 26 22:06:39 2024 (r20661) +++ trunk/OpenMPT/soundlib/opal.h Sun Apr 28 00:13:39 2024 (r20662) @@ -22,6 +22,7 @@ #include <cstdint> +#include "../common/mptBaseUtils.h" @@ -574,9 +575,9 @@ } // Mix with the partial accumulation - int32_t omblend = SampleRate - SampleAccum; - *left = static_cast<uint16_t>((LastOutput[0] * omblend + CurrOutput[0] * SampleAccum) / SampleRate); - *right = static_cast<uint16_t>((LastOutput[1] * omblend + CurrOutput[1] * SampleAccum) / SampleRate); + const int32_t fract = Util::muldivr(SampleAccum, 65536, SampleRate); + *left = static_cast<int16_t>(LastOutput[0] + ((fract * (CurrOutput[0] - LastOutput[0])) / 65536)); + *right = static_cast<int16_t>(LastOutput[1] + ((fract * (CurrOutput[1] - LastOutput[1])) / 65536)); SampleAccum += OPL3SampleRate; } @@ -606,14 +607,14 @@ else if (leftmix > 0x7FFF) left = 0x7FFF; else - left = static_cast<uint16_t>(leftmix); + left = static_cast<int16_t>(leftmix); if (rightmix < -0x8000) right = -0x8000; else if (rightmix > 0x7FFF) right = 0x7FFF; else - right = static_cast<uint16_t>(rightmix); + right = static_cast<int16_t>(rightmix); Clock++; |
|
From: <sv...@op...> - 2024-04-26 20:06:49
|
Author: sagamusix Date: Fri Apr 26 22:06:39 2024 New Revision: 20661 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20661 Log: Merged revision(s) 20660 from trunk/OpenMPT: [Fix] S3M: In mono mode, the ratio between sample and OPL volume was incorrect (https://bugs.openmpt.org/view.php?id=1774). ........ Modified: branches/OpenMPT-1.31/ (props changed) branches/OpenMPT-1.31/soundlib/Load_s3m.cpp Modified: branches/OpenMPT-1.31/soundlib/Load_s3m.cpp ============================================================================== --- branches/OpenMPT-1.31/soundlib/Load_s3m.cpp Fri Apr 26 22:06:14 2024 (r20660) +++ branches/OpenMPT-1.31/soundlib/Load_s3m.cpp Fri Apr 26 22:06:39 2024 (r20661) @@ -439,15 +439,18 @@ else m_nSamplePreAmp = std::max(fileHeader.masterVolume & 0x7F, 0x10); // Bit 7 = Stereo (we always use stereo) - const bool isStereo = (fileHeader.masterVolume & 0x80) != 0 || m_dwLastSavedWithVersion; - if(!isStereo) - m_nSamplePreAmp = Util::muldivr_unsigned(m_nSamplePreAmp, 8, 11); - // Approximately as loud as in DOSBox and a real SoundBlaster 16 m_nVSTiVolume = 36; if(isSchism && schismDateVersion < SchismVersionFromDate<2018, 11, 12>::date) m_nVSTiVolume = 64; + const bool isStereo = (fileHeader.masterVolume & 0x80) != 0 || m_dwLastSavedWithVersion; + if(!isStereo) + { + m_nSamplePreAmp = Util::muldivr_unsigned(m_nSamplePreAmp, 8, 11); + m_nVSTiVolume = Util::muldivr_unsigned(m_nVSTiVolume, 8, 11); + } + // Channel setup m_nChannels = 4; std::bitset<32> isAdlibChannel; @@ -491,8 +494,7 @@ // Read extended channel panning if(fileHeader.usePanningTable == S3MFileHeader::idPanning) { - uint8 pan[32]; - file.ReadArray(pan); + const auto pan = file.ReadArray<uint8, 32>(); for(CHANNELINDEX i = 0; i < 32; i++) { if((pan[i] & 0x20) != 0 && (!isST3 || !isAdlibChannel[i])) @@ -839,7 +841,8 @@ // Write patterns enum class S3MChannelType : uint8 { kUnused = 0, kPCM = 1, kAdlib = 2 }; - FlagSet<S3MChannelType> channelType[32] = { S3MChannelType::kUnused }; + std::array<FlagSet<S3MChannelType>, 32> channelType; + channelType.fill(S3MChannelType::kUnused); bool globalCmdOnMutedChn = false; for(PATTERNINDEX pat = 0; pat < writePatterns; pat++) { |
|
From: <sv...@op...> - 2024-04-26 20:06:22
|
Author: sagamusix Date: Fri Apr 26 22:06:14 2024 New Revision: 20660 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20660 Log: [Fix] S3M: In mono mode, the ratio between sample and OPL volume was incorrect (https://bugs.openmpt.org/view.php?id=1774). Modified: trunk/OpenMPT/soundlib/Load_s3m.cpp Modified: trunk/OpenMPT/soundlib/Load_s3m.cpp ============================================================================== --- trunk/OpenMPT/soundlib/Load_s3m.cpp Fri Apr 26 19:21:20 2024 (r20659) +++ trunk/OpenMPT/soundlib/Load_s3m.cpp Fri Apr 26 22:06:14 2024 (r20660) @@ -435,15 +435,18 @@ else m_nSamplePreAmp = std::max(fileHeader.masterVolume & 0x7F, 0x10); // Bit 7 = Stereo (we always use stereo) - const bool isStereo = (fileHeader.masterVolume & 0x80) != 0 || m_dwLastSavedWithVersion; - if(!isStereo) - m_nSamplePreAmp = Util::muldivr_unsigned(m_nSamplePreAmp, 8, 11); - // Approximately as loud as in DOSBox and a real SoundBlaster 16 m_nVSTiVolume = 36; if(isSchism && schismDateVersion < SchismVersionFromDate<2018, 11, 12>::date) m_nVSTiVolume = 64; + const bool isStereo = (fileHeader.masterVolume & 0x80) != 0 || m_dwLastSavedWithVersion; + if(!isStereo) + { + m_nSamplePreAmp = Util::muldivr_unsigned(m_nSamplePreAmp, 8, 11); + m_nVSTiVolume = Util::muldivr_unsigned(m_nVSTiVolume, 8, 11); + } + // Channel setup m_nChannels = 4; std::bitset<32> isAdlibChannel; @@ -488,8 +491,7 @@ if(fileHeader.usePanningTable == S3MFileHeader::idPanning) { bool hasChannelsWithoutPanning = false; - uint8 pan[32]; - file.ReadArray(pan); + const auto pan = file.ReadArray<uint8, 32>(); for(CHANNELINDEX i = 0; i < 32; i++) { if((pan[i] & 0x20) != 0 && (!isST3 || !isAdlibChannel[i])) @@ -847,7 +849,8 @@ // Write patterns enum class S3MChannelType : uint8 { kUnused = 0, kPCM = 1, kAdlib = 2 }; - FlagSet<S3MChannelType> channelType[32] = { S3MChannelType::kUnused }; + std::array<FlagSet<S3MChannelType>, 32> channelType; + channelType.fill(S3MChannelType::kUnused); bool globalCmdOnMutedChn = false; for(PATTERNINDEX pat = 0; pat < writePatterns; pat++) { |
|
From: <sv...@op...> - 2024-04-26 17:21:32
|
Author: manx Date: Fri Apr 26 19:21:20 2024 New Revision: 20659 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20659 Log: [Doc] libopenmpt: Document MinGW-w64 mcfgthread threading model as supported. Modified: branches/OpenMPT-1.31/doc/libopenmpt/dependencies.md Modified: branches/OpenMPT-1.31/doc/libopenmpt/dependencies.md ============================================================================== --- branches/OpenMPT-1.31/doc/libopenmpt/dependencies.md Fri Apr 26 19:07:20 2024 (r20658) +++ branches/OpenMPT-1.31/doc/libopenmpt/dependencies.md Fri Apr 26 19:21:20 2024 (r20659) @@ -24,7 +24,7 @@ * **GCC 7.1** or higher * **Clang 6** or higher * **MinGW-W64 7.1** or higher (it is recommended to preferably use - posix threading model as opposed to win32 threading model) + mcfgthread or posix threading model as opposed to win32 threading model) * **emscripten 3.1.1** or higher * **DJGPP GCC 7.1** or higher * any other **C++20 or C++17 compliant** compiler |
|
From: <sv...@op...> - 2024-04-26 17:07:27
|
Author: manx Date: Fri Apr 26 19:07:20 2024 New Revision: 20658 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20658 Log: [Doc] libopenmpt: Document supported MinGW-w64 GCC versions and threading models. Modified: trunk/OpenMPT/doc/libopenmpt/dependencies.md Modified: trunk/OpenMPT/doc/libopenmpt/dependencies.md ============================================================================== --- trunk/OpenMPT/doc/libopenmpt/dependencies.md Fri Apr 26 16:58:08 2024 (r20657) +++ trunk/OpenMPT/doc/libopenmpt/dependencies.md Fri Apr 26 19:07:20 2024 (r20658) @@ -23,8 +23,10 @@ * **Microsoft Visual Studio 2017 XP targeting toolset** * **GCC 7.1** or higher * **Clang 6** or higher - * **MinGW-W64 7.1** or higher (it is recommended to preferably use - posix threading model as opposed to win32 threading model) + * **MinGW-W64 7.1 (posix threading model)** or higher + * **MinGW-W64 13.1 (mcfgthread threading model)** or higher + * **MinGW-W64 7.1 (win32 threading model)** up to + **MinGW-W64 13.0 (win32 threading model)** * **emscripten 3.1.1** or higher * **DJGPP GCC 7.1** or higher * any other **C++20 or C++17 compliant** compiler |
|
From: <sv...@op...> - 2024-04-26 14:58:21
|
Author: manx Date: Fri Apr 26 16:58:08 2024 New Revision: 20657 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20657 Log: Merged revision(s) 20654 from trunk/OpenMPT: [Mod] Include mpt/check before mpt/base in stdafx.h. ........ Modified: branches/OpenMPT-1.31/ (props changed) branches/OpenMPT-1.31/common/stdafx.h Modified: branches/OpenMPT-1.31/common/stdafx.h ============================================================================== --- branches/OpenMPT-1.31/common/stdafx.h Fri Apr 26 16:57:35 2024 (r20656) +++ branches/OpenMPT-1.31/common/stdafx.h Fri Apr 26 16:58:08 2024 (r20657) @@ -63,7 +63,6 @@ #endif -#include "mpt/base/span.hpp" #include "mpt/check/compiler.hpp" #include "mpt/check/libc.hpp" #if defined(MPT_WITH_MFC) @@ -72,6 +71,8 @@ #if MPT_OS_WINDOWS #include "mpt/check/windows.hpp" #endif + +#include "mpt/base/span.hpp" #include "mpt/exception/exception.hpp" #include "mpt/exception/exception_text.hpp" #include "mpt/out_of_memory/out_of_memory.hpp" |
|
From: <sv...@op...> - 2024-04-26 14:57:49
|
Author: manx Date: Fri Apr 26 16:57:35 2024 New Revision: 20656 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20656 Log: [Mod] mpt/check/libcxx.hpp: GCC 13 added the mcfgthread backend for Windows which the Debian MinGW-w64 GCC packages now use in place of the old Win32 backend. Clarify error message. We cannot detect mcfgthread vs. pthread, thus we cannot warn if mcfgthread is selected and an unsupported (<Win7) Windows version is targeted. Modified: trunk/OpenMPT/src/mpt/check/libcxx.hpp Modified: trunk/OpenMPT/src/mpt/check/libcxx.hpp ============================================================================== --- trunk/OpenMPT/src/mpt/check/libcxx.hpp Fri Apr 26 16:24:33 2024 (r20655) +++ trunk/OpenMPT/src/mpt/check/libcxx.hpp Fri Apr 26 16:57:35 2024 (r20656) @@ -8,8 +8,8 @@ #include "mpt/base/detect_quirks.hpp" #ifndef MPT_CHECK_LIBCXX_IGNORE_WARNING_NO_THREADS -#if MPT_OS_WINDOWS && MPT_WIN_BEFORE(MPT_WIN_VISTA) && MPT_LIBCXX_GNU_AT_LEAST(13) && !defined(_GLIBCXX_HAS_GTHREADS) -#error "GNU libstdc++ is compiled without gthreads support (likely due to using Win32 threading model as opposed to POSIX threading model. This a severely crippled C++11 implementation and no is no longer supported for targetting Windows before Vista as of release 13 because non-threading standard library headers fail to compile." +#if MPT_OS_WINDOWS && MPT_WIN_BEFORE(MPT_WIN_7) && MPT_LIBCXX_GNU_AT_LEAST(13) && !defined(_GLIBCXX_HAS_GTHREADS) +#error "GNU libstdc++ is compiled without gthreads support (likely due to using Win32 threading model as opposed to POSIX or mcfgthread threading model. This a severely crippled C++11 implementation and no is no longer supported ofr libstdc++ version 13 or later." #endif #endif |
3 messages has been excluded from this view by a project administrator.
