modplug-svn-commit Mailing List for modplug (Page 97)

A music tracker software for Windows.

Brought to you by: lpchip, manxorist, rewbs, saga-games

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 (120)	Sep	Oct	Nov	Dec

Flat | Threaded

<< < 1 .. 95 96 97 98 99 .. 962 > >> (Page 97 of 962)

[OMPT-svn-commit] OpenMPT r21614 - branches/OpenMPT-1.31

From: <sv...@op...> - 2024-09-19 11:26:20

Author: manx
Date: Thu Sep 19 13:26:08 2024
New Revision: 21614
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21614

Log:
Merged revision(s) 21613 from trunk/OpenMPT:
[Fix] build: Makefile: Fix line endings of licenses in DOS package.
........

Modified:
   branches/OpenMPT-1.31/   (props changed)
   branches/OpenMPT-1.31/Makefile

Modified: branches/OpenMPT-1.31/Makefile
==============================================================================
--- branches/OpenMPT-1.31/Makefile	Thu Sep 19 13:25:34 2024	(r21613)
+++ branches/OpenMPT-1.31/Makefile	Thu Sep 19 13:26:08 2024	(r21614)
@@ -1861,8 +1861,8 @@
 	svn export ./LICENSE                         bin/$(FLAVOUR_DIR)dist-dos/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/LICENSE.TXT          --native-eol CRLF
 	svn export ./src/mpt/LICENSE.BSD-3-Clause.txt bin/$(FLAVOUR_DIR)dist-dos/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/LICENSES/MPT_BSD3.TXT --native-eol CRLF
 	svn export ./src/mpt/LICENSE.BSL-1.0.txt     bin/$(FLAVOUR_DIR)dist-dos/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/LICENSES/MPT_BSL1.TXT --native-eol CRLF
-	cp include/allegro42/readme.txt              bin/$(FLAVOUR_DIR)dist-dos/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/LICENSES/ALLEGRO.TXT
-	cp include/cwsdpmi/bin/$(FLAVOUR_DIR)cwsdpmi.doc           bin/$(FLAVOUR_DIR)dist-dos/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/LICENSES/CWSDPMI.TXT
+	cp include/allegro42/readme.txt              bin/$(FLAVOUR_DIR)dist-dos/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/LICENSES/ALLEGRO.TXT --native-eol CRLF
+	cp include/cwsdpmi/bin/$(FLAVOUR_DIR)cwsdpmi.doc           bin/$(FLAVOUR_DIR)dist-dos/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/LICENSES/CWSDPMI.TXT --native-eol CRLF
 ifeq ($(ALLOW_LGPL),1)
 	svn export ./include/mpg123/COPYING          bin/$(FLAVOUR_DIR)dist-dos/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/LICENSES/MPG123.TXT   --native-eol CRLF
 	svn export ./include/mpg123/AUTHORS          bin/$(FLAVOUR_DIR)dist-dos/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/LICENSES/MPG123_A.TXT --native-eol CRLF

[OMPT-svn-commit] OpenMPT r21613 - trunk/OpenMPT

From: <sv...@op...> - 2024-09-19 11:25:48

Author: manx
Date: Thu Sep 19 13:25:34 2024
New Revision: 21613
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21613

Log:
[Fix] build: Makefile: Fix line endings of licenses in DOS package.

Modified:
   trunk/OpenMPT/Makefile

Modified: trunk/OpenMPT/Makefile
==============================================================================
--- trunk/OpenMPT/Makefile	Thu Sep 19 13:21:13 2024	(r21612)
+++ trunk/OpenMPT/Makefile	Thu Sep 19 13:25:34 2024	(r21613)
@@ -2019,8 +2019,8 @@
 	svn export ./LICENSE                         bin/$(FLAVOUR_DIR)dist-dos/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/LICENSE.TXT          --native-eol CRLF
 	svn export ./src/mpt/LICENSE.BSD-3-Clause.txt bin/$(FLAVOUR_DIR)dist-dos/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/LICENSES/MPT_BSD3.TXT --native-eol CRLF
 	svn export ./src/mpt/LICENSE.BSL-1.0.txt     bin/$(FLAVOUR_DIR)dist-dos/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/LICENSES/MPT_BSL1.TXT --native-eol CRLF
-	cp include/allegro42/readme.txt              bin/$(FLAVOUR_DIR)dist-dos/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/LICENSES/ALLEGRO.TXT
-	cp include/cwsdpmi/bin/$(FLAVOUR_DIR)cwsdpmi.doc           bin/$(FLAVOUR_DIR)dist-dos/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/LICENSES/CWSDPMI.TXT
+	cp include/allegro42/readme.txt              bin/$(FLAVOUR_DIR)dist-dos/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/LICENSES/ALLEGRO.TXT --native-eol CRLF
+	cp include/cwsdpmi/bin/$(FLAVOUR_DIR)cwsdpmi.doc           bin/$(FLAVOUR_DIR)dist-dos/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/LICENSES/CWSDPMI.TXT --native-eol CRLF
 ifeq ($(ALLOW_LGPL),1)
 	svn export ./include/mpg123/COPYING          bin/$(FLAVOUR_DIR)dist-dos/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/LICENSES/MPG123.TXT   --native-eol CRLF
 	svn export ./include/mpg123/AUTHORS          bin/$(FLAVOUR_DIR)dist-dos/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/LICENSES/MPG123_A.TXT --native-eol CRLF

[OMPT-svn-commit] OpenMPT r21612 - trunk/OpenMPT/soundlib

From: <sv...@op...> - 2024-09-19 11:21:25

Author: sagamusix
Date: Thu Sep 19 13:21:13 2024
New Revision: 21612
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21612

Log:
[Fix] MID: Loading samples when using MIDI + accompanying soundfont file was broken since r21370 (https://bugs.openmpt.org/view.php?id=1817).

Modified:
   trunk/OpenMPT/soundlib/Load_mid.cpp

Modified: trunk/OpenMPT/soundlib/Load_mid.cpp
==============================================================================
--- trunk/OpenMPT/soundlib/Load_mid.cpp	Thu Sep 19 13:02:25 2024	(r21611)
+++ trunk/OpenMPT/soundlib/Load_mid.cpp	Thu Sep 19 13:21:13 2024	(r21612)
@@ -1319,12 +1319,14 @@
 	}
 
 	std::unique_ptr<CDLSBank> cachedBank, embeddedBank;
+	FileReader *bankFile = nullptr;
 
 	if(CDLSBank::IsDLSBank(file))
 	{
 		// Soundfont embedded in MIDI file
 		embeddedBank = std::make_unique<CDLSBank>();
 		embeddedBank->Open(file);
+		bankFile = &file;
 	} else
 	{
 		// Soundfont with same name as MIDI file
@@ -1352,7 +1354,7 @@
 		else if(pIns->nMidiProgram)
 			midiCode = (pIns->nMidiProgram - 1) & 0x7F;
 
-		if(embeddedBank && embeddedBank->FindAndExtract(*this, ins, midiCode >= 0x80, &file))
+		if(embeddedBank && embeddedBank->FindAndExtract(*this, ins, midiCode >= 0x80, bankFile))
 		{
 			continue;
 		}

[OMPT-svn-commit] OpenMPT r21611 - trunk/OpenMPT/build/auto

From: <sv...@op...> - 2024-09-19 11:02:37

Author: manx
Date: Thu Sep 19 13:02:25 2024
New Revision: 21611
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21611

Log:
[Var] Small cleanup.

Modified:
   trunk/OpenMPT/build/auto/package_libopenmpt_multi_args.cmd
   trunk/OpenMPT/build/auto/package_libopenmpt_retro_winxp.cmd

Modified: trunk/OpenMPT/build/auto/package_libopenmpt_multi_args.cmd
==============================================================================
--- trunk/OpenMPT/build/auto/package_libopenmpt_multi_args.cmd	Thu Sep 19 11:10:17 2024	(r21610)
+++ trunk/OpenMPT/build/auto/package_libopenmpt_multi_args.cmd	Thu Sep 19 13:02:25 2024	(r21611)
@@ -70,7 +70,7 @@
 rem copy /y ..\..\include\r8brain\LICENSE                        .\Licenses\License.R8Brain.txt || goto error
 rem copy /y ..\..\include\rtaudio\README.md                      .\Licenses\License.RtAudio.txt || goto error
 rem copy /y ..\..\include\rtmidi\LICENSE                         .\Licenses\License.RtMidi.txt || goto error
-rem copy /y ..\include\SignalsmithStretch\SignalsmithStretch\LICENSE.txt .\Licenses\License.SignalsmithStretch.txt || goto error
+rem copy /y ..\..\include\SignalsmithStretch\SignalsmithStretch\LICENSE.txt .\Licenses\License.SignalsmithStretch.txt || goto error
 rem copy /y ..\..\include\stb_vorbis\stb_vorbis.c                .\Licenses\License.stb_vorbis.txt || goto error
 rem copy /y ..\..\include\unrar\license.txt                      .\Licenses\License.UnRAR.txt || goto error
 copy /y ..\..\include\vorbis\COPYING                         .\Licenses\License.Vorbis.txt || goto error
@@ -190,7 +190,7 @@
 rem copy /y ..\..\include\r8brain\LICENSE                        .\Licenses\License.R8Brain.txt || goto error
 rem copy /y ..\..\include\rtaudio\README.md                      .\Licenses\License.RtAudio.txt || goto error
 rem copy /y ..\..\include\rtmidi\LICENSE                         .\Licenses\License.RtMidi.txt || goto error
-rem copy /y ..\include\SignalsmithStretch\SignalsmithStretch\LICENSE.txt .\Licenses\License.SignalsmithStretch.txt || goto error
+rem copy /y ..\..\include\SignalsmithStretch\SignalsmithStretch\LICENSE.txt .\Licenses\License.SignalsmithStretch.txt || goto error
 rem copy /y ..\..\include\stb_vorbis\stb_vorbis.c                .\Licenses\License.stb_vorbis.txt || goto error
 rem copy /y ..\..\include\unrar\license.txt                      .\Licenses\License.UnRAR.txt || goto error
 copy /y ..\..\include\vorbis\COPYING                         .\Licenses\License.Vorbis.txt || goto error

Modified: trunk/OpenMPT/build/auto/package_libopenmpt_retro_winxp.cmd
==============================================================================
--- trunk/OpenMPT/build/auto/package_libopenmpt_retro_winxp.cmd	Thu Sep 19 11:10:17 2024	(r21610)
+++ trunk/OpenMPT/build/auto/package_libopenmpt_retro_winxp.cmd	Thu Sep 19 13:02:25 2024	(r21611)
@@ -64,7 +64,7 @@
 rem copy /y ..\..\include\r8brain\LICENSE                        .\Licenses\License.R8Brain.txt || goto error
 rem copy /y ..\..\include\rtaudio\README.md                      .\Licenses\License.RtAudio.txt || goto error
 rem copy /y ..\..\include\rtmidi\LICENSE                         .\Licenses\License.RtMidi.txt || goto error
-rem copy /y ..\include\SignalsmithStretch\SignalsmithStretch\LICENSE.txt .\Licenses\License.SignalsmithStretch.txt || goto error
+rem copy /y ..\..\include\SignalsmithStretch\SignalsmithStretch\LICENSE.txt .\Licenses\License.SignalsmithStretch.txt || goto error
 rem copy /y ..\..\include\stb_vorbis\stb_vorbis.c                .\Licenses\License.stb_vorbis.txt || goto error
 rem copy /y ..\..\include\unrar\license.txt                      .\Licenses\License.UnRAR.txt || goto error
 copy /y ..\..\include\vorbis\COPYING                         .\Licenses\License.Vorbis.txt || goto error
@@ -148,7 +148,7 @@
 rem copy /y ..\..\include\r8brain\LICENSE                        .\Licenses\License.R8Brain.txt || goto error
 rem copy /y ..\..\include\rtaudio\README.md                      .\Licenses\License.RtAudio.txt || goto error
 rem copy /y ..\..\include\rtmidi\LICENSE                         .\Licenses\License.RtMidi.txt || goto error
-rem copy /y ..\include\SignalsmithStretch\SignalsmithStretch\LICENSE.txt .\Licenses\License.SignalsmithStretch.txt || goto error
+rem copy /y ..\..\include\SignalsmithStretch\SignalsmithStretch\LICENSE.txt .\Licenses\License.SignalsmithStretch.txt || goto error
 rem copy /y ..\..\include\stb_vorbis\stb_vorbis.c                .\Licenses\License.stb_vorbis.txt || goto error
 rem copy /y ..\..\include\unrar\license.txt                      .\Licenses\License.UnRAR.txt || goto error
 copy /y ..\..\include\vorbis\COPYING                         .\Licenses\License.Vorbis.txt || goto error

[OMPT-svn-commit] OpenMPT r21610 - trunk/OpenMPT/tracklib

From: <sv...@op...> - 2024-09-19 09:10:28

Author: sagamusix
Date: Thu Sep 19 11:10:17 2024
New Revision: 21610
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21610

Log:
[Fix] Fix previous commit.

Modified:
   trunk/OpenMPT/tracklib/TimeStretchPitchShift.h

Modified: trunk/OpenMPT/tracklib/TimeStretchPitchShift.h
==============================================================================
--- trunk/OpenMPT/tracklib/TimeStretchPitchShift.h	Thu Sep 19 11:09:19 2024	(r21609)
+++ trunk/OpenMPT/tracklib/TimeStretchPitchShift.h	Thu Sep 19 11:10:17 2024	(r21610)
@@ -44,7 +44,7 @@
 
 	Base(UpdateProgressFunc updateProgress, PrepareUndoFunc prepareUndo,
 		CSoundFile &sndFile, SAMPLEINDEX sample, float pitch, float stretchRatio, SmpLength start, SmpLength end);
-	virtual ~Base();
+	virtual ~Base() = default;
 
 	virtual Result Process() = 0;

[OMPT-svn-commit] OpenMPT r21609 - trunk/OpenMPT/tracklib

From: <sv...@op...> - 2024-09-19 09:09:34

Author: sagamusix
Date: Thu Sep 19 11:09:19 2024
New Revision: 21609
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21609

Log:
[Fix] Add virtual destructor to TimeStretchPitchShift::Base class.

Modified:
   trunk/OpenMPT/tracklib/TimeStretchPitchShift.h

Modified: trunk/OpenMPT/tracklib/TimeStretchPitchShift.h
==============================================================================
--- trunk/OpenMPT/tracklib/TimeStretchPitchShift.h	Wed Sep 18 23:27:33 2024	(r21608)
+++ trunk/OpenMPT/tracklib/TimeStretchPitchShift.h	Thu Sep 19 11:09:19 2024	(r21609)
@@ -44,6 +44,7 @@
 
 	Base(UpdateProgressFunc updateProgress, PrepareUndoFunc prepareUndo,
 		CSoundFile &sndFile, SAMPLEINDEX sample, float pitch, float stretchRatio, SmpLength start, SmpLength end);
+	virtual ~Base();
 
 	virtual Result Process() = 0;

[OMPT-svn-commit] OpenMPT r21608 - in trunk/OpenMPT: build/auto build/premake build/vs2017winxp build/vs2017winxp/ext build/vs2017winxpansi build/vs2017winxpansi/ext build/vs2019win7 build/vs2019win7/ext build/vs2022win10 build/vs2022win10/ext build/vs2022win10clang build/vs2022win10clang/ext build/vs2022win7 build/vs2022win7/ext build/vs2022win8 build/vs2022win8/ext build/vs2022win81 build/vs2022win81/ext common include/SignalsmithStretch include/SignalsmithStretch/SignalsmithStretch include/SignalsmithStretch/SignalsmithStretch/dsp include/smbPitchShift include/soundtouch installer mptrack tracklib

From: <sv...@op...> - 2024-09-18 21:27:48

Author: sagamusix
Date: Wed Sep 18 23:27:33 2024
New Revision: 21608
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21608

Log:
[Imp] Replace smbPitchShift and Soundtouch with Signalsmith Stretch and a custom "Akai"-like implementation. Both of the new implementations can handle any pitch shifting and time stretching amounts, and apply both changes simultaneously (https://bugs.openmpt.org/view.php?id=1808).
[Mod] OpenMPT: Version is now 1.32.00.24

Added:
   trunk/OpenMPT/build/premake/ext-SignalsmithStretch.lua   (contents, props changed)
   trunk/OpenMPT/include/SignalsmithStretch/
   trunk/OpenMPT/include/SignalsmithStretch/OpenMPT.txt   (contents, props changed)
   trunk/OpenMPT/include/SignalsmithStretch/SignalsmithStretch/
   trunk/OpenMPT/include/SignalsmithStretch/SignalsmithStretch/LICENSE.txt   (contents, props changed)
   trunk/OpenMPT/include/SignalsmithStretch/SignalsmithStretch/README.md   (contents, props changed)
   trunk/OpenMPT/include/SignalsmithStretch/SignalsmithStretch/dsp/
   trunk/OpenMPT/include/SignalsmithStretch/SignalsmithStretch/dsp/LICENSE.txt   (contents, props changed)
   trunk/OpenMPT/include/SignalsmithStretch/SignalsmithStretch/dsp/README.md   (contents, props changed)
   trunk/OpenMPT/include/SignalsmithStretch/SignalsmithStretch/dsp/common.h   (contents, props changed)
   trunk/OpenMPT/include/SignalsmithStretch/SignalsmithStretch/dsp/curves.h   (contents, props changed)
   trunk/OpenMPT/include/SignalsmithStretch/SignalsmithStretch/dsp/delay.h   (contents, props changed)
   trunk/OpenMPT/include/SignalsmithStretch/SignalsmithStretch/dsp/envelopes.h   (contents, props changed)
   trunk/OpenMPT/include/SignalsmithStretch/SignalsmithStretch/dsp/fft.h   (contents, props changed)
   trunk/OpenMPT/include/SignalsmithStretch/SignalsmithStretch/dsp/filters.h   (contents, props changed)
   trunk/OpenMPT/include/SignalsmithStretch/SignalsmithStretch/dsp/mix.h   (contents, props changed)
   trunk/OpenMPT/include/SignalsmithStretch/SignalsmithStretch/dsp/perf.h   (contents, props changed)
   trunk/OpenMPT/include/SignalsmithStretch/SignalsmithStretch/dsp/rates.h   (contents, props changed)
   trunk/OpenMPT/include/SignalsmithStretch/SignalsmithStretch/dsp/spectral.h   (contents, props changed)
   trunk/OpenMPT/include/SignalsmithStretch/SignalsmithStretch/dsp/windows.h   (contents, props changed)
   trunk/OpenMPT/include/SignalsmithStretch/SignalsmithStretch/signalsmith-stretch.h   (contents, props changed)
   trunk/OpenMPT/tracklib/TimeStretchPitchShift.cpp   (contents, props changed)
   trunk/OpenMPT/tracklib/TimeStretchPitchShift.h   (contents, props changed)
Deleted:
   trunk/OpenMPT/build/premake/ext-smbPitchShift.lua
   trunk/OpenMPT/build/premake/ext-soundtouch.lua
   trunk/OpenMPT/build/vs2017winxp/ext/smbPitchShift.vcxproj
   trunk/OpenMPT/build/vs2017winxp/ext/soundtouch.vcxproj
   trunk/OpenMPT/build/vs2017winxp/ext/soundtouch.vcxproj.filters
   trunk/OpenMPT/build/vs2017winxpansi/ext/smbPitchShift.vcxproj
   trunk/OpenMPT/build/vs2017winxpansi/ext/soundtouch.vcxproj
   trunk/OpenMPT/build/vs2017winxpansi/ext/soundtouch.vcxproj.filters
   trunk/OpenMPT/build/vs2019win7/ext/smbPitchShift.vcxproj
   trunk/OpenMPT/build/vs2019win7/ext/soundtouch.vcxproj
   trunk/OpenMPT/build/vs2019win7/ext/soundtouch.vcxproj.filters
   trunk/OpenMPT/build/vs2022win10/ext/smbPitchShift.vcxproj
   trunk/OpenMPT/build/vs2022win10/ext/soundtouch.vcxproj
   trunk/OpenMPT/build/vs2022win10/ext/soundtouch.vcxproj.filters
   trunk/OpenMPT/build/vs2022win10clang/ext/smbPitchShift.vcxproj
   trunk/OpenMPT/build/vs2022win10clang/ext/soundtouch.vcxproj
   trunk/OpenMPT/build/vs2022win10clang/ext/soundtouch.vcxproj.filters
   trunk/OpenMPT/build/vs2022win7/ext/smbPitchShift.vcxproj
   trunk/OpenMPT/build/vs2022win7/ext/soundtouch.vcxproj
   trunk/OpenMPT/build/vs2022win7/ext/soundtouch.vcxproj.filters
   trunk/OpenMPT/build/vs2022win8/ext/smbPitchShift.vcxproj
   trunk/OpenMPT/build/vs2022win8/ext/soundtouch.vcxproj
   trunk/OpenMPT/build/vs2022win8/ext/soundtouch.vcxproj.filters
   trunk/OpenMPT/build/vs2022win81/ext/smbPitchShift.vcxproj
   trunk/OpenMPT/build/vs2022win81/ext/soundtouch.vcxproj
   trunk/OpenMPT/build/vs2022win81/ext/soundtouch.vcxproj.filters
   trunk/OpenMPT/include/smbPitchShift/
   trunk/OpenMPT/include/soundtouch/
Modified:
   trunk/OpenMPT/build/auto/build_openmpt_release_packages_multiarch.py
   trunk/OpenMPT/build/auto/build_openmpt_release_packages_retro.py
   trunk/OpenMPT/build/auto/package_libopenmpt_multi_args.cmd
   trunk/OpenMPT/build/auto/package_libopenmpt_retro_winxp.cmd
   trunk/OpenMPT/build/auto/update_package_template.cmd
   trunk/OpenMPT/build/auto/update_package_template_retro.cmd
   trunk/OpenMPT/build/premake/mpt-OpenMPT.lua
   trunk/OpenMPT/build/premake/premake.lua
   trunk/OpenMPT/build/vs2017winxp/OpenMPT-ANSI.sln
   trunk/OpenMPT/build/vs2017winxp/OpenMPT-ANSI.vcxproj
   trunk/OpenMPT/build/vs2017winxp/OpenMPT-ANSI.vcxproj.filters
   trunk/OpenMPT/build/vs2017winxp/OpenMPT-UTF8.sln
   trunk/OpenMPT/build/vs2017winxp/OpenMPT-UTF8.vcxproj
   trunk/OpenMPT/build/vs2017winxp/OpenMPT-UTF8.vcxproj.filters
   trunk/OpenMPT/build/vs2017winxp/OpenMPT.sln
   trunk/OpenMPT/build/vs2017winxp/OpenMPT.vcxproj
   trunk/OpenMPT/build/vs2017winxp/OpenMPT.vcxproj.filters
   trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-ANSI.sln
   trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-ANSI.vcxproj
   trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-ANSI.vcxproj.filters
   trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-UTF8.sln
   trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-UTF8.vcxproj
   trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-UTF8.vcxproj.filters
   trunk/OpenMPT/build/vs2017winxpansi/OpenMPT.sln
   trunk/OpenMPT/build/vs2017winxpansi/OpenMPT.vcxproj
   trunk/OpenMPT/build/vs2017winxpansi/OpenMPT.vcxproj.filters
   trunk/OpenMPT/build/vs2019win7/OpenMPT-ANSI.sln
   trunk/OpenMPT/build/vs2019win7/OpenMPT-ANSI.vcxproj
   trunk/OpenMPT/build/vs2019win7/OpenMPT-ANSI.vcxproj.filters
   trunk/OpenMPT/build/vs2019win7/OpenMPT-UTF8.sln
   trunk/OpenMPT/build/vs2019win7/OpenMPT-UTF8.vcxproj
   trunk/OpenMPT/build/vs2019win7/OpenMPT-UTF8.vcxproj.filters
   trunk/OpenMPT/build/vs2019win7/OpenMPT.sln
   trunk/OpenMPT/build/vs2019win7/OpenMPT.vcxproj
   trunk/OpenMPT/build/vs2019win7/OpenMPT.vcxproj.filters
   trunk/OpenMPT/build/vs2022win10/OpenMPT-ANSI.sln
   trunk/OpenMPT/build/vs2022win10/OpenMPT-ANSI.vcxproj
   trunk/OpenMPT/build/vs2022win10/OpenMPT-ANSI.vcxproj.filters
   trunk/OpenMPT/build/vs2022win10/OpenMPT-UTF8.sln
   trunk/OpenMPT/build/vs2022win10/OpenMPT-UTF8.vcxproj
   trunk/OpenMPT/build/vs2022win10/OpenMPT-UTF8.vcxproj.filters
   trunk/OpenMPT/build/vs2022win10/OpenMPT.sln
   trunk/OpenMPT/build/vs2022win10/OpenMPT.vcxproj
   trunk/OpenMPT/build/vs2022win10/OpenMPT.vcxproj.filters
   trunk/OpenMPT/build/vs2022win10clang/OpenMPT-ANSI.sln
   trunk/OpenMPT/build/vs2022win10clang/OpenMPT-ANSI.vcxproj
   trunk/OpenMPT/build/vs2022win10clang/OpenMPT-ANSI.vcxproj.filters
   trunk/OpenMPT/build/vs2022win10clang/OpenMPT-UTF8.sln
   trunk/OpenMPT/build/vs2022win10clang/OpenMPT-UTF8.vcxproj
   trunk/OpenMPT/build/vs2022win10clang/OpenMPT-UTF8.vcxproj.filters
   trunk/OpenMPT/build/vs2022win10clang/OpenMPT.sln
   trunk/OpenMPT/build/vs2022win10clang/OpenMPT.vcxproj
   trunk/OpenMPT/build/vs2022win10clang/OpenMPT.vcxproj.filters
   trunk/OpenMPT/build/vs2022win7/OpenMPT-ANSI.sln
   trunk/OpenMPT/build/vs2022win7/OpenMPT-ANSI.vcxproj
   trunk/OpenMPT/build/vs2022win7/OpenMPT-ANSI.vcxproj.filters
   trunk/OpenMPT/build/vs2022win7/OpenMPT-UTF8.sln
   trunk/OpenMPT/build/vs2022win7/OpenMPT-UTF8.vcxproj
   trunk/OpenMPT/build/vs2022win7/OpenMPT-UTF8.vcxproj.filters
   trunk/OpenMPT/build/vs2022win7/OpenMPT.sln
   trunk/OpenMPT/build/vs2022win7/OpenMPT.vcxproj
   trunk/OpenMPT/build/vs2022win7/OpenMPT.vcxproj.filters
   trunk/OpenMPT/build/vs2022win8/OpenMPT-ANSI.sln
   trunk/OpenMPT/build/vs2022win8/OpenMPT-ANSI.vcxproj
   trunk/OpenMPT/build/vs2022win8/OpenMPT-ANSI.vcxproj.filters
   trunk/OpenMPT/build/vs2022win8/OpenMPT-UTF8.sln
   trunk/OpenMPT/build/vs2022win8/OpenMPT-UTF8.vcxproj
   trunk/OpenMPT/build/vs2022win8/OpenMPT-UTF8.vcxproj.filters
   trunk/OpenMPT/build/vs2022win8/OpenMPT.sln
   trunk/OpenMPT/build/vs2022win8/OpenMPT.vcxproj
   trunk/OpenMPT/build/vs2022win8/OpenMPT.vcxproj.filters
   trunk/OpenMPT/build/vs2022win81/OpenMPT-ANSI.sln
   trunk/OpenMPT/build/vs2022win81/OpenMPT-ANSI.vcxproj
   trunk/OpenMPT/build/vs2022win81/OpenMPT-ANSI.vcxproj.filters
   trunk/OpenMPT/build/vs2022win81/OpenMPT-UTF8.sln
   trunk/OpenMPT/build/vs2022win81/OpenMPT-UTF8.vcxproj
   trunk/OpenMPT/build/vs2022win81/OpenMPT-UTF8.vcxproj.filters
   trunk/OpenMPT/build/vs2022win81/OpenMPT.sln
   trunk/OpenMPT/build/vs2022win81/OpenMPT.vcxproj
   trunk/OpenMPT/build/vs2022win81/OpenMPT.vcxproj.filters
   trunk/OpenMPT/common/version.cpp
   trunk/OpenMPT/common/versionNumber.h
   trunk/OpenMPT/installer/install-multi-arch-retro.iss
   trunk/OpenMPT/installer/install-multi-arch.iss
   trunk/OpenMPT/mptrack/CDecimalSupport.cpp
   trunk/OpenMPT/mptrack/Ctrl_smp.cpp
   trunk/OpenMPT/mptrack/Ctrl_smp.h
   trunk/OpenMPT/mptrack/PSRatioCalc.cpp
   trunk/OpenMPT/mptrack/PSRatioCalc.h
   trunk/OpenMPT/mptrack/mptrack.rc

Modified: trunk/OpenMPT/build/auto/build_openmpt_release_packages_multiarch.py
==============================================================================
--- trunk/OpenMPT/build/auto/build_openmpt_release_packages_multiarch.py	Wed Sep 18 17:14:07 2024	(r21607)
+++ trunk/OpenMPT/build/auto/build_openmpt_release_packages_multiarch.py	Wed Sep 18 23:27:33 2024	(r21608)
@@ -92,7 +92,6 @@
 	copy_file(from_path, to_path, "OpenMPT.exe")
 	copy_file(from_path, to_path, "openmpt-lame.dll")
 	copy_file(from_path, to_path, "openmpt-mpg123.dll")
-	copy_file(from_path, to_path, "openmpt-soundtouch.dll")
 	copy_file(from_path, to_path, "openmpt-wine-support.zip")
 
 def copy_pluginbridge(from_path, arch, to_path):
@@ -104,7 +103,6 @@
 	copy_file(from_path, to_path, "OpenMPT.pdb")
 	copy_file(from_path, to_path, "openmpt-lame.pdb")
 	copy_file(from_path, to_path, "openmpt-mpg123.pdb")
-	copy_file(from_path, to_path, "openmpt-soundtouch.pdb")
 
 def copy_symbols_pluginbridge(from_path, to_path, arch):
 	copy_file(from_path, to_path, "PluginBridge-" + arch + ".pdb")

Modified: trunk/OpenMPT/build/auto/build_openmpt_release_packages_retro.py
==============================================================================
--- trunk/OpenMPT/build/auto/build_openmpt_release_packages_retro.py	Wed Sep 18 17:14:07 2024	(r21607)
+++ trunk/OpenMPT/build/auto/build_openmpt_release_packages_retro.py	Wed Sep 18 23:27:33 2024	(r21608)
@@ -84,7 +84,6 @@
 	copy_file(from_path, to_path, "OpenMPT.exe")
 	copy_file(from_path, to_path, "openmpt-lame.dll")
 	copy_file(from_path, to_path, "openmpt-mpg123.dll")
-	copy_file(from_path, to_path, "openmpt-soundtouch.dll")
 	copy_file(from_path, to_path, "openmpt-wine-support.zip")
 
 def copy_pluginbridge(from_path, arch, to_path):
@@ -96,7 +95,6 @@
 	copy_file(from_path, to_path, "OpenMPT.pdb")
 	copy_file(from_path, to_path, "openmpt-lame.pdb")
 	copy_file(from_path, to_path, "openmpt-mpg123.pdb")
-	copy_file(from_path, to_path, "openmpt-soundtouch.pdb")
 
 def copy_symbols_pluginbridge(from_path, to_path, arch):
 	copy_file(from_path, to_path, "PluginBridge-" + arch + ".pdb")

Modified: trunk/OpenMPT/build/auto/package_libopenmpt_multi_args.cmd
==============================================================================
--- trunk/OpenMPT/build/auto/package_libopenmpt_multi_args.cmd	Wed Sep 18 17:14:07 2024	(r21607)
+++ trunk/OpenMPT/build/auto/package_libopenmpt_multi_args.cmd	Wed Sep 18 23:27:33 2024	(r21608)
@@ -70,8 +70,7 @@
 rem copy /y ..\..\include\r8brain\LICENSE                        .\Licenses\License.R8Brain.txt || goto error
 rem copy /y ..\..\include\rtaudio\README.md                      .\Licenses\License.RtAudio.txt || goto error
 rem copy /y ..\..\include\rtmidi\LICENSE                         .\Licenses\License.RtMidi.txt || goto error
-rem copy /y ..\..\include\smbPitchShift\smbPitchShift.cpp        .\Licenses\License.smbPitchShift.txt || goto error
-rem copy /y ..\..\include\soundtouch\COPYING.TXT                 .\Licenses\License.SoundTouch.txt || goto error
+rem copy /y ..\include\SignalsmithStretch\SignalsmithStretch\LICENSE.txt .\Licenses\License.SignalsmithStretch.txt || goto error
 rem copy /y ..\..\include\stb_vorbis\stb_vorbis.c                .\Licenses\License.stb_vorbis.txt || goto error
 rem copy /y ..\..\include\unrar\license.txt                      .\Licenses\License.UnRAR.txt || goto error
 copy /y ..\..\include\vorbis\COPYING                         .\Licenses\License.Vorbis.txt || goto error
@@ -191,8 +190,7 @@
 rem copy /y ..\..\include\r8brain\LICENSE                        .\Licenses\License.R8Brain.txt || goto error
 rem copy /y ..\..\include\rtaudio\README.md                      .\Licenses\License.RtAudio.txt || goto error
 rem copy /y ..\..\include\rtmidi\LICENSE                         .\Licenses\License.RtMidi.txt || goto error
-rem copy /y ..\..\include\smbPitchShift\smbPitchShift.cpp        .\Licenses\License.smbPitchShift.txt || goto error
-rem copy /y ..\..\include\soundtouch\COPYING.TXT                 .\Licenses\License.SoundTouch.txt || goto error
+rem copy /y ..\include\SignalsmithStretch\SignalsmithStretch\LICENSE.txt .\Licenses\License.SignalsmithStretch.txt || goto error
 rem copy /y ..\..\include\stb_vorbis\stb_vorbis.c                .\Licenses\License.stb_vorbis.txt || goto error
 rem copy /y ..\..\include\unrar\license.txt                      .\Licenses\License.UnRAR.txt || goto error
 copy /y ..\..\include\vorbis\COPYING                         .\Licenses\License.Vorbis.txt || goto error

Modified: trunk/OpenMPT/build/auto/package_libopenmpt_retro_winxp.cmd
==============================================================================
--- trunk/OpenMPT/build/auto/package_libopenmpt_retro_winxp.cmd	Wed Sep 18 17:14:07 2024	(r21607)
+++ trunk/OpenMPT/build/auto/package_libopenmpt_retro_winxp.cmd	Wed Sep 18 23:27:33 2024	(r21608)
@@ -64,8 +64,7 @@
 rem copy /y ..\..\include\r8brain\LICENSE                        .\Licenses\License.R8Brain.txt || goto error
 rem copy /y ..\..\include\rtaudio\README.md                      .\Licenses\License.RtAudio.txt || goto error
 rem copy /y ..\..\include\rtmidi\LICENSE                         .\Licenses\License.RtMidi.txt || goto error
-rem copy /y ..\..\include\smbPitchShift\smbPitchShift.cpp        .\Licenses\License.smbPitchShift.txt || goto error
-rem copy /y ..\..\include\soundtouch\COPYING.TXT                 .\Licenses\License.SoundTouch.txt || goto error
+rem copy /y ..\include\SignalsmithStretch\SignalsmithStretch\LICENSE.txt .\Licenses\License.SignalsmithStretch.txt || goto error
 rem copy /y ..\..\include\stb_vorbis\stb_vorbis.c                .\Licenses\License.stb_vorbis.txt || goto error
 rem copy /y ..\..\include\unrar\license.txt                      .\Licenses\License.UnRAR.txt || goto error
 copy /y ..\..\include\vorbis\COPYING                         .\Licenses\License.Vorbis.txt || goto error
@@ -149,8 +148,7 @@
 rem copy /y ..\..\include\r8brain\LICENSE                        .\Licenses\License.R8Brain.txt || goto error
 rem copy /y ..\..\include\rtaudio\README.md                      .\Licenses\License.RtAudio.txt || goto error
 rem copy /y ..\..\include\rtmidi\LICENSE                         .\Licenses\License.RtMidi.txt || goto error
-rem copy /y ..\..\include\smbPitchShift\smbPitchShift.cpp        .\Licenses\License.smbPitchShift.txt || goto error
-rem copy /y ..\..\include\soundtouch\COPYING.TXT                 .\Licenses\License.SoundTouch.txt || goto error
+rem copy /y ..\include\SignalsmithStretch\SignalsmithStretch\LICENSE.txt .\Licenses\License.SignalsmithStretch.txt || goto error
 rem copy /y ..\..\include\stb_vorbis\stb_vorbis.c                .\Licenses\License.stb_vorbis.txt || goto error
 rem copy /y ..\..\include\unrar\license.txt                      .\Licenses\License.UnRAR.txt || goto error
 copy /y ..\..\include\vorbis\COPYING                         .\Licenses\License.Vorbis.txt || goto error

Modified: trunk/OpenMPT/build/auto/update_package_template.cmd
==============================================================================
--- trunk/OpenMPT/build/auto/update_package_template.cmd	Wed Sep 18 17:14:07 2024	(r21607)
+++ trunk/OpenMPT/build/auto/update_package_template.cmd	Wed Sep 18 23:27:33 2024	(r21608)
@@ -31,8 +31,7 @@
 copy /y ..\include\rtaudio\README.md                      .\Licenses\License.RtAudio.txt || goto error
 copy /y ..\include\rtkit\rtkit.h                          .\Licenses\License.RealtimeKit.txt || goto error
 copy /y ..\include\rtmidi\LICENSE                         .\Licenses\License.RtMidi.txt || goto error
-copy /y ..\include\smbPitchShift\smbPitchShift.cpp        .\Licenses\License.smbPitchShift.txt || goto error
-copy /y ..\include\soundtouch\COPYING.TXT                 .\Licenses\License.SoundTouch.txt || goto error
+copy /y ..\include\SignalsmithStretch\SignalsmithStretch\LICENSE.txt .\Licenses\License.SignalsmithStretch.txt || goto error
 rem copy /y ..\include\stb_vorbis\stb_vorbis.c                .\Licenses\License.stb_vorbis.txt || goto error
 copy /y ..\include\unrar\license.txt                      .\Licenses\License.UnRAR.txt || goto error
 copy /y ..\include\vorbis\COPYING                         .\Licenses\License.Vorbis.txt || goto error

Modified: trunk/OpenMPT/build/auto/update_package_template_retro.cmd
==============================================================================
--- trunk/OpenMPT/build/auto/update_package_template_retro.cmd	Wed Sep 18 17:14:07 2024	(r21607)
+++ trunk/OpenMPT/build/auto/update_package_template_retro.cmd	Wed Sep 18 23:27:33 2024	(r21608)
@@ -31,8 +31,7 @@
 copy /y ..\include\rtaudio\README.md                      .\Licenses\License.RtAudio.txt || goto error
 copy /y ..\include\rtkit\rtkit.h                          .\Licenses\License.RealtimeKit.txt || goto error
 copy /y ..\include\rtmidi\LICENSE                         .\Licenses\License.RtMidi.txt || goto error
-copy /y ..\include\smbPitchShift\smbPitchShift.cpp        .\Licenses\License.smbPitchShift.txt || goto error
-copy /y ..\include\soundtouch\COPYING.TXT                 .\Licenses\License.SoundTouch.txt || goto error
+copy /y ..\include\SignalsmithStretch\SignalsmithStretch\LICENSE.txt Licenses\License.SignalsmithStretch.txt || goto error
 rem copy /y ..\include\stb_vorbis\stb_vorbis.c                .\Licenses\License.stb_vorbis.txt || goto error
 copy /y ..\include\unrar\license.txt                      .\Licenses\License.UnRAR.txt || goto error
 copy /y ..\include\vorbis\COPYING                         .\Licenses\License.Vorbis.txt || goto error

Added: trunk/OpenMPT/build/premake/ext-SignalsmithStretch.lua
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ trunk/OpenMPT/build/premake/ext-SignalsmithStretch.lua	Wed Sep 18 23:27:33 2024	(r21608)
@@ -0,0 +1,9 @@
+
+function mpt_use_signalsmith_stretch ()
+	-- header-only library
+	filter {}
+	includedirs {
+		"../../include/SignalsmithStretch",
+	}
+	filter {}
+end

Modified: trunk/OpenMPT/build/premake/mpt-OpenMPT.lua
==============================================================================
--- trunk/OpenMPT/build/premake/mpt-OpenMPT.lua	Wed Sep 18 17:14:07 2024	(r21607)
+++ trunk/OpenMPT/build/premake/mpt-OpenMPT.lua	Wed Sep 18 23:27:33 2024	(r21608)
@@ -69,10 +69,8 @@
 	defines { "MPT_WITH_RTAUDIO" }
 	mpt_use_rtmidi()
 	defines { "MPT_WITH_RTMIDI" }
-	mpt_use_smbpitchshift()
-	defines { "MPT_WITH_SMBPITCHSHIFT" }
-	mpt_use_soundtouch()
-	defines { "MPT_WITH_SOUNDTOUCH" }
+	mpt_use_signalsmith_stretch()
+	defines { "MPT_WITH_SIGNALSMITH_STRETCH" }
 	mpt_use_unrar()
 	defines { "MPT_WITH_UNRAR" }
 	mpt_use_vorbis()

Modified: trunk/OpenMPT/build/premake/premake.lua
==============================================================================
--- trunk/OpenMPT/build/premake/premake.lua	Wed Sep 18 17:14:07 2024	(r21607)
+++ trunk/OpenMPT/build/premake/premake.lua	Wed Sep 18 23:27:33 2024	(r21608)
@@ -314,8 +314,7 @@
  dofile "../../build/premake/ext-r8brain.lua"
  dofile "../../build/premake/ext-rtaudio.lua"
  dofile "../../build/premake/ext-rtmidi.lua"
- dofile "../../build/premake/ext-smbPitchShift.lua"
- dofile "../../build/premake/ext-soundtouch.lua"
+ dofile "../../build/premake/ext-SignalsmithStretch.lua"
  dofile "../../build/premake/ext-UnRAR.lua"
  dofile "../../build/premake/ext-vorbis.lua"
  dofile "../../build/premake/ext-zlib.lua"
@@ -350,8 +349,7 @@
  dofile "../../build/premake/ext-r8brain.lua"
  dofile "../../build/premake/ext-rtaudio.lua"
  dofile "../../build/premake/ext-rtmidi.lua"
- dofile "../../build/premake/ext-smbPitchShift.lua"
- dofile "../../build/premake/ext-soundtouch.lua"
+ dofile "../../build/premake/ext-SignalsmithStretch.lua"
  dofile "../../build/premake/ext-UnRAR.lua"
  dofile "../../build/premake/ext-vorbis.lua"
  dofile "../../build/premake/ext-zlib.lua"
@@ -386,8 +384,7 @@
  dofile "../../build/premake/ext-r8brain.lua"
  dofile "../../build/premake/ext-rtaudio.lua"
  dofile "../../build/premake/ext-rtmidi.lua"
- dofile "../../build/premake/ext-smbPitchShift.lua"
- dofile "../../build/premake/ext-soundtouch.lua"
+ dofile "../../build/premake/ext-SignalsmithStretch.lua"
  dofile "../../build/premake/ext-UnRAR.lua"
  dofile "../../build/premake/ext-vorbis.lua"
  dofile "../../build/premake/ext-zlib.lua"

Modified: trunk/OpenMPT/build/vs2017winxp/OpenMPT-ANSI.sln
==============================================================================
--- trunk/OpenMPT/build/vs2017winxp/OpenMPT-ANSI.sln	Wed Sep 18 17:14:07 2024	(r21607)
+++ trunk/OpenMPT/build/vs2017winxp/OpenMPT-ANSI.sln	Wed Sep 18 23:27:33 2024	(r21608)
@@ -43,10 +43,6 @@
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "rtmidi", "ext\rtmidi.vcxproj", "{05BBD03D-0985-4D76-8DDD-534DA631C3A8}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "smbPitchShift", "ext\smbPitchShift.vcxproj", "{89AF16DD-32CC-4A7E-B219-5F117D761F9F}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "soundtouch", "ext\soundtouch.vcxproj", "{F5F8F6DE-84CF-4E9D-91EA-D9B5E2AA36CD}"
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "updatesigntool", "updatesigntool.vcxproj", "{89B3630F-5728-4902-8258-D4DBC532E185}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vorbis", "ext\vorbis.vcxproj", "{B544DCB7-16E5-41BC-B51B-7EAD8CFDFA05}"
@@ -573,54 +569,6 @@
 		{05BBD03D-0985-4D76-8DDD-534DA631C3A8}.Release|Win32.Build.0 = Release|Win32
 		{05BBD03D-0985-4D76-8DDD-534DA631C3A8}.Release|x64.ActiveCfg = Release|x64
 		{05BBD03D-0985-4D76-8DDD-534DA631C3A8}.Release|x64.Build.0 = Release|x64
-		{89AF16DD-32CC-4A7E-B219-5F117D761F9F}.CheckedShared|Win32.ActiveCfg = CheckedShared|Win32
-		{89AF16DD-32CC-4A7E-B219-5F117D761F9F}.CheckedShared|Win32.Build.0 = CheckedShared|Win32
-		{89AF16DD-32CC-4A7E-B219-5F117D761F9F}.CheckedShared|x64.ActiveCfg = CheckedShared|x64
-		{89AF16DD-32CC-4A7E-B219-5F117D761F9F}.CheckedShared|x64.Build.0 = CheckedShared|x64
-		{89AF16DD-32CC-4A7E-B219-5F117D761F9F}.Checked|Win32.ActiveCfg = Checked|Win32
-		{89AF16DD-32CC-4A7E-B219-5F117D761F9F}.Checked|Win32.Build.0 = Checked|Win32
-		{89AF16DD-32CC-4A7E-B219-5F117D761F9F}.Checked|x64.ActiveCfg = Checked|x64
-		{89AF16DD-32CC-4A7E-B219-5F117D761F9F}.Checked|x64.Build.0 = Checked|x64
-		{89AF16DD-32CC-4A7E-B219-5F117D761F9F}.DebugShared|Win32.ActiveCfg = DebugShared|Win32
-		{89AF16DD-32CC-4A7E-B219-5F117D761F9F}.DebugShared|Win32.Build.0 = DebugShared|Win32
-		{89AF16DD-32CC-4A7E-B219-5F117D761F9F}.DebugShared|x64.ActiveCfg = DebugShared|x64
-		{89AF16DD-32CC-4A7E-B219-5F117D761F9F}.DebugShared|x64.Build.0 = DebugShared|x64
-		{89AF16DD-32CC-4A7E-B219-5F117D761F9F}.Debug|Win32.ActiveCfg = Debug|Win32
-		{89AF16DD-32CC-4A7E-B219-5F117D761F9F}.Debug|Win32.Build.0 = Debug|Win32
-		{89AF16DD-32CC-4A7E-B219-5F117D761F9F}.Debug|x64.ActiveCfg = Debug|x64
-		{89AF16DD-32CC-4A7E-B219-5F117D761F9F}.Debug|x64.Build.0 = Debug|x64
-		{89AF16DD-32CC-4A7E-B219-5F117D761F9F}.ReleaseShared|Win32.ActiveCfg = ReleaseShared|Win32
-		{89AF16DD-32CC-4A7E-B219-5F117D761F9F}.ReleaseShared|Win32.Build.0 = ReleaseShared|Win32
-		{89AF16DD-32CC-4A7E-B219-5F117D761F9F}.ReleaseShared|x64.ActiveCfg = ReleaseShared|x64
-		{89AF16DD-32CC-4A7E-B219-5F117D761F9F}.ReleaseShared|x64.Build.0 = ReleaseShared|x64
-		{89AF16DD-32CC-4A7E-B219-5F117D761F9F}.Release|Win32.ActiveCfg = Release|Win32
-		{89AF16DD-32CC-4A7E-B219-5F117D761F9F}.Release|Win32.Build.0 = Release|Win32
-		{89AF16DD-32CC-4A7E-B219-5F117D761F9F}.Release|x64.ActiveCfg = Release|x64
-		{89AF16DD-32CC-4A7E-B219-5F117D761F9F}.Release|x64.Build.0 = Release|x64
-		{F5F8F6DE-84CF-4E9D-91EA-D9B5E2AA36CD}.CheckedShared|Win32.ActiveCfg = CheckedShared|Win32
-		{F5F8F6DE-84CF-4E9D-91EA-D9B5E2AA36CD}.CheckedShared|Win32.Build.0 = CheckedShared|Win32
-		{F5F8F6DE-84CF-4E9D-91EA-D9B5E2AA36CD}.CheckedShared|x64.ActiveCfg = CheckedShared|x64
-		{F5F8F6DE-84CF-4E9D-91EA-D9B5E2AA36CD}.CheckedShared|x64.Build.0 = CheckedShared|x64
-		{F5F8F6DE-84CF-4E9D-91EA-D9B5E2AA36CD}.Checked|Win32.ActiveCfg = Checked|Win32
-		{F5F8F6DE-84CF-4E9D-91EA-D9B5E2AA36CD}.Checked|Win32.Build.0 = Checked|Win32
-		{F5F8F6DE-84CF-4E9D-91EA-D9B5E2AA36CD}.Checked|x64.ActiveCfg = Checked|x64
-		{F5F8F6DE-84CF-4E9D-91EA-D9B5E2AA36CD}.Checked|x64.Build.0 = Checked|x64
-		{F5F8F6DE-84CF-4E9D-91EA-D9B5E2AA36CD}.DebugShared|Win32.ActiveCfg = DebugShared|Win32
-		{F5F8F6DE-84CF-4E9D-91EA-D9B5E2AA36CD}.DebugShared|Win32.Build.0 = DebugShared|Win32
-		{F5F8F6DE-84CF-4E9D-91EA-D9B5E2AA36CD}.DebugShared|x64.ActiveCfg = DebugShared|x64
-		{F5F8F6DE-84CF-4E9D-91EA-D9B5E2AA36CD}.DebugShared|x64.Build.0 = DebugShared|x64
-		{F5F8F6DE-84CF-4E9D-91EA-D9B5E2AA36CD}.Debug|Win32.ActiveCfg = Debug|Win32
-		{F5F8F6DE-84CF-4E9D-91EA-D9B5E2AA36CD}.Debug|Win32.Build.0 = Debug|Win32
-		{F5F8F6DE-84CF-4E9D-91EA-D9B5E2AA36CD}.Debug|x64.ActiveCfg = Debug|x64
-		{F5F8F6DE-84CF-4E9D-91EA-D9B5E2AA36CD}.Debug|x64.Build.0 = Debug|x64
-		{F5F8F6DE-84CF-4E9D-91EA-D9B5E2AA36CD}.ReleaseShared|Win32.ActiveCfg = ReleaseShared|Win32
-		{F5F8F6DE-84CF-4E9D-91EA-D9B5E2AA36CD}.ReleaseShared|Win32.Build.0 = ReleaseShared|Win32
-		{F5F8F6DE-84CF-4E9D-91EA-D9B5E2AA36CD}.ReleaseShared|x64.ActiveCfg = ReleaseShared|x64
-		{F5F8F6DE-84CF-4E9D-91EA-D9B5E2AA36CD}.ReleaseShared|x64.Build.0 = ReleaseShared|x64
-		{F5F8F6DE-84CF-4E9D-91EA-D9B5E2AA36CD}.Release|Win32.ActiveCfg = Release|Win32
-		{F5F8F6DE-84CF-4E9D-91EA-D9B5E2AA36CD}.Release|Win32.Build.0 = Release|Win32
-		{F5F8F6DE-84CF-4E9D-91EA-D9B5E2AA36CD}.Release|x64.ActiveCfg = Release|x64
-		{F5F8F6DE-84CF-4E9D-91EA-D9B5E2AA36CD}.Release|x64.Build.0 = Release|x64
 		{89B3630F-5728-4902-8258-D4DBC532E185}.CheckedShared|Win32.ActiveCfg = CheckedShared|Win32
 		{89B3630F-5728-4902-8258-D4DBC532E185}.CheckedShared|Win32.Build.0 = CheckedShared|Win32
 		{89B3630F-5728-4902-8258-D4DBC532E185}.CheckedShared|x64.ActiveCfg = CheckedShared|x64

Modified: trunk/OpenMPT/build/vs2017winxp/OpenMPT-ANSI.vcxproj
==============================================================================
--- trunk/OpenMPT/build/vs2017winxp/OpenMPT-ANSI.vcxproj	Wed Sep 18 17:14:07 2024	(r21607)
+++ trunk/OpenMPT/build/vs2017winxp/OpenMPT-ANSI.vcxproj	Wed Sep 18 23:27:33 2024	(r21608)
@@ -313,8 +313,8 @@
       <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>PCH.h</PrecompiledHeaderFile>
       <WarningLevel>Level4</WarningLevel>
-      <PreprocessorDefinitions>MPT_BUILD_RETRO;MPT_CHECK_CXX_IGNORE_PREPROCESSOR;DEBUG;MPT_BUILD_DEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0501;NTDDI_VERSION=0x05010300;_CSTRING_DISABLE_NARROW_WIDE_CONVERSION;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;MPT_WITH_MFC;MPT_WITH_DIRECTSOUND;MPT_WITH_ANCIENT;CRYPTOPP_ENABLE_NAMESPACE_WEAK=1;MPT_WITH_CRYPTOPP;FLAC__NO_DLL;MPT_WITH_FLAC;MPT_WITH_LAME;MPT_WITH_LHASA;MPT_WITH_MINIZIP;MPG123_NO_LARGENAME;MPT_WITH_MPG123;MPT_WITH_NLOHMANNJSON;MPT_WITH_OGG;MPT_WITH_OPUS;MPT_WITH_OPUSENC;MPT_WITH_OPUSFILE;MPT_WITH_PORTAUDIO;MPT_WITH_R8BRAIN;MPT_WITH_RTAUDIO;MPT_WITH_RTMIDI;MPT_WITH_SMBPITCHSHIFT;MPT_WITH_SOUNDTOUCH;MPT_WITH_UNRAR;MPT_WITH_VORBIS;MPT_WITH_VORBISENC;MPT_WITH_VORBISFILE;MPT_WITH_ZLIB;MPT_BUILD_ENABLE_PCH;MODPLUG_TRACKER;NO_WARN_MBCS_MFC_DEPRECATION;MPT_CHECK_WINDOWS_IGNORE_WARNING_NO_UNICODE;%(Prepr
 ocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..\include\ancient\api;..\..\include\flac\include;..\..\include\lame\include;..\..\include\lhasa\lib\public;..\..\include\mpg123\src\include;..\..\include\nlohmann-json\include;..\..\include\ogg\include;..\..\include\opus\include;..\..\include\opusenc\include;..\..\include\opusfile\include;..\..\include\portaudio\include;..\..\include\rtaudio;..\..\include;..\..\include\vorbis\include;..\..\include\zlib;..\..\src;..\..\common;..\..\soundlib;$(IntDir)\svn_version;..\pch;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>MPT_BUILD_RETRO;MPT_CHECK_CXX_IGNORE_PREPROCESSOR;DEBUG;MPT_BUILD_DEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0501;NTDDI_VERSION=0x05010300;_CSTRING_DISABLE_NARROW_WIDE_CONVERSION;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;MPT_WITH_MFC;MPT_WITH_DIRECTSOUND;MPT_WITH_ANCIENT;CRYPTOPP_ENABLE_NAMESPACE_WEAK=1;MPT_WITH_CRYPTOPP;FLAC__NO_DLL;MPT_WITH_FLAC;MPT_WITH_LAME;MPT_WITH_LHASA;MPT_WITH_MINIZIP;MPG123_NO_LARGENAME;MPT_WITH_MPG123;MPT_WITH_NLOHMANNJSON;MPT_WITH_OGG;MPT_WITH_OPUS;MPT_WITH_OPUSENC;MPT_WITH_OPUSFILE;MPT_WITH_PORTAUDIO;MPT_WITH_R8BRAIN;MPT_WITH_RTAUDIO;MPT_WITH_RTMIDI;MPT_WITH_SIGNALSMITH_STRETCH;MPT_WITH_UNRAR;MPT_WITH_VORBIS;MPT_WITH_VORBISENC;MPT_WITH_VORBISFILE;MPT_WITH_ZLIB;MPT_BUILD_ENABLE_PCH;MODPLUG_TRACKER;NO_WARN_MBCS_MFC_DEPRECATION;MPT_CHECK_WINDOWS_IGNORE_WARNING_NO_UNICODE;%(PreprocessorDefinit
 ions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>..\..\include\ancient\api;..\..\include\flac\include;..\..\include\lame\include;..\..\include\lhasa\lib\public;..\..\include\mpg123\src\include;..\..\include\nlohmann-json\include;..\..\include\ogg\include;..\..\include\opus\include;..\..\include\opusenc\include;..\..\include\opusfile\include;..\..\include\portaudio\include;..\..\include\rtaudio;..\..\include\SignalsmithStretch;..\..\include;..\..\include\vorbis\include;..\..\include\zlib;..\..\src;..\..\common;..\..\soundlib;$(IntDir)\svn_version;..\pch;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <ForcedIncludeFiles>PCH.h</ForcedIncludeFiles>
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
       <Optimization>Disabled</Optimization>
@@ -326,8 +326,8 @@
       <LanguageStandard>stdcpp17</LanguageStandard>
     </ClCompile>
     <ResourceCompile>
-      <PreprocessorDefinitions>MPT_BUILD_RETRO;MPT_CHECK_CXX_IGNORE_PREPROCESSOR;DEBUG;MPT_BUILD_DEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0501;NTDDI_VERSION=0x05010300;_CSTRING_DISABLE_NARROW_WIDE_CONVERSION;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;MPT_WITH_MFC;MPT_WITH_DIRECTSOUND;MPT_WITH_ANCIENT;CRYPTOPP_ENABLE_NAMESPACE_WEAK=1;MPT_WITH_CRYPTOPP;FLAC__NO_DLL;MPT_WITH_FLAC;MPT_WITH_LAME;MPT_WITH_LHASA;MPT_WITH_MINIZIP;MPG123_NO_LARGENAME;MPT_WITH_MPG123;MPT_WITH_NLOHMANNJSON;MPT_WITH_OGG;MPT_WITH_OPUS;MPT_WITH_OPUSENC;MPT_WITH_OPUSFILE;MPT_WITH_PORTAUDIO;MPT_WITH_R8BRAIN;MPT_WITH_RTAUDIO;MPT_WITH_RTMIDI;MPT_WITH_SMBPITCHSHIFT;MPT_WITH_SOUNDTOUCH;MPT_WITH_UNRAR;MPT_WITH_VORBIS;MPT_WITH_VORBISENC;MPT_WITH_VORBISFILE;MPT_WITH_ZLIB;MPT_BUILD_ENABLE_PCH;MODPLUG_TRACKER;NO_WARN_MBCS_MFC_DEPRECATION;MPT_CHECK_WINDOWS_IGNORE_WARNING_NO_UNICODE;VER_ARC
 HNAME=\"x86\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..\include\ancient\api;..\..\include\flac\include;..\..\include\lame\include;..\..\include\lhasa\lib\public;..\..\include\mpg123\src\include;..\..\include\nlohmann-json\include;..\..\include\ogg\include;..\..\include\opus\include;..\..\include\opusenc\include;..\..\include\opusfile\include;..\..\include\portaudio\include;..\..\include\rtaudio;..\..\include;..\..\include\vorbis\include;..\..\include\zlib;..\..\src;..\..\common;..\..\soundlib;$(IntDir)\svn_version;..\pch;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>MPT_BUILD_RETRO;MPT_CHECK_CXX_IGNORE_PREPROCESSOR;DEBUG;MPT_BUILD_DEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0501;NTDDI_VERSION=0x05010300;_CSTRING_DISABLE_NARROW_WIDE_CONVERSION;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;MPT_WITH_MFC;MPT_WITH_DIRECTSOUND;MPT_WITH_ANCIENT;CRYPTOPP_ENABLE_NAMESPACE_WEAK=1;MPT_WITH_CRYPTOPP;FLAC__NO_DLL;MPT_WITH_FLAC;MPT_WITH_LAME;MPT_WITH_LHASA;MPT_WITH_MINIZIP;MPG123_NO_LARGENAME;MPT_WITH_MPG123;MPT_WITH_NLOHMANNJSON;MPT_WITH_OGG;MPT_WITH_OPUS;MPT_WITH_OPUSENC;MPT_WITH_OPUSFILE;MPT_WITH_PORTAUDIO;MPT_WITH_R8BRAIN;MPT_WITH_RTAUDIO;MPT_WITH_RTMIDI;MPT_WITH_SIGNALSMITH_STRETCH;MPT_WITH_UNRAR;MPT_WITH_VORBIS;MPT_WITH_VORBISENC;MPT_WITH_VORBISFILE;MPT_WITH_ZLIB;MPT_BUILD_ENABLE_PCH;MODPLUG_TRACKER;NO_WARN_MBCS_MFC_DEPRECATION;MPT_CHECK_WINDOWS_IGNORE_WARNING_NO_UNICODE;VER_ARCHNAME=\"x86\";
 %(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>..\..\include\ancient\api;..\..\include\flac\include;..\..\include\lame\include;..\..\include\lhasa\lib\public;..\..\include\mpg123\src\include;..\..\include\nlohmann-json\include;..\..\include\ogg\include;..\..\include\opus\include;..\..\include\opusenc\include;..\..\include\opusfile\include;..\..\include\portaudio\include;..\..\include\rtaudio;..\..\include\SignalsmithStretch;..\..\include;..\..\include\vorbis\include;..\..\include\zlib;..\..\src;..\..\common;..\..\soundlib;$(IntDir)\svn_version;..\pch;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -348,8 +348,8 @@
       <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>PCH.h</PrecompiledHeaderFile>
       <WarningLevel>Level4</WarningLevel>
-      <PreprocessorDefinitions>MPT_BUILD_RETRO;MPT_CHECK_CXX_IGNORE_PREPROCESSOR;DEBUG;MPT_BUILD_DEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0502;NTDDI_VERSION=0x05020200;_CSTRING_DISABLE_NARROW_WIDE_CONVERSION;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;MPT_WITH_MFC;MPT_WITH_DIRECTSOUND;MPT_WITH_ANCIENT;CRYPTOPP_ENABLE_NAMESPACE_WEAK=1;MPT_WITH_CRYPTOPP;FLAC__NO_DLL;MPT_WITH_FLAC;MPT_WITH_LAME;MPT_WITH_LHASA;MPT_WITH_MINIZIP;MPG123_NO_LARGENAME;MPT_WITH_MPG123;MPT_WITH_NLOHMANNJSON;MPT_WITH_OGG;MPT_WITH_OPUS;MPT_WITH_OPUSENC;MPT_WITH_OPUSFILE;MPT_WITH_PORTAUDIO;MPT_WITH_R8BRAIN;MPT_WITH_RTAUDIO;MPT_WITH_RTMIDI;MPT_WITH_SMBPITCHSHIFT;MPT_WITH_SOUNDTOUCH;MPT_WITH_UNRAR;MPT_WITH_VORBIS;MPT_WITH_VORBISENC;MPT_WITH_VORBISFILE;MPT_WITH_ZLIB;MPT_BUILD_ENABLE_PCH;MODPLUG_TRACKER;NO_WARN_MBCS_MFC_DEPRECATION;MPT_CHECK_WINDOWS_IGNORE_WARNING_NO_UNICODE;%(Prepr
 ocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..\include\ancient\api;..\..\include\flac\include;..\..\include\lame\include;..\..\include\lhasa\lib\public;..\..\include\mpg123\src\include;..\..\include\nlohmann-json\include;..\..\include\ogg\include;..\..\include\opus\include;..\..\include\opusenc\include;..\..\include\opusfile\include;..\..\include\portaudio\include;..\..\include\rtaudio;..\..\include;..\..\include\vorbis\include;..\..\include\zlib;..\..\src;..\..\common;..\..\soundlib;$(IntDir)\svn_version;..\pch;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>MPT_BUILD_RETRO;MPT_CHECK_CXX_IGNORE_PREPROCESSOR;DEBUG;MPT_BUILD_DEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0502;NTDDI_VERSION=0x05020200;_CSTRING_DISABLE_NARROW_WIDE_CONVERSION;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;MPT_WITH_MFC;MPT_WITH_DIRECTSOUND;MPT_WITH_ANCIENT;CRYPTOPP_ENABLE_NAMESPACE_WEAK=1;MPT_WITH_CRYPTOPP;FLAC__NO_DLL;MPT_WITH_FLAC;MPT_WITH_LAME;MPT_WITH_LHASA;MPT_WITH_MINIZIP;MPG123_NO_LARGENAME;MPT_WITH_MPG123;MPT_WITH_NLOHMANNJSON;MPT_WITH_OGG;MPT_WITH_OPUS;MPT_WITH_OPUSENC;MPT_WITH_OPUSFILE;MPT_WITH_PORTAUDIO;MPT_WITH_R8BRAIN;MPT_WITH_RTAUDIO;MPT_WITH_RTMIDI;MPT_WITH_SIGNALSMITH_STRETCH;MPT_WITH_UNRAR;MPT_WITH_VORBIS;MPT_WITH_VORBISENC;MPT_WITH_VORBISFILE;MPT_WITH_ZLIB;MPT_BUILD_ENABLE_PCH;MODPLUG_TRACKER;NO_WARN_MBCS_MFC_DEPRECATION;MPT_CHECK_WINDOWS_IGNORE_WARNING_NO_UNICODE;%(PreprocessorDefinit
 ions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>..\..\include\ancient\api;..\..\include\flac\include;..\..\include\lame\include;..\..\include\lhasa\lib\public;..\..\include\mpg123\src\include;..\..\include\nlohmann-json\include;..\..\include\ogg\include;..\..\include\opus\include;..\..\include\opusenc\include;..\..\include\opusfile\include;..\..\include\portaudio\include;..\..\include\rtaudio;..\..\include\SignalsmithStretch;..\..\include;..\..\include\vorbis\include;..\..\include\zlib;..\..\src;..\..\common;..\..\soundlib;$(IntDir)\svn_version;..\pch;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <ForcedIncludeFiles>PCH.h</ForcedIncludeFiles>
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
       <Optimization>Disabled</Optimization>
@@ -360,8 +360,8 @@
       <LanguageStandard>stdcpp17</LanguageStandard>
     </ClCompile>
     <ResourceCompile>
-      <PreprocessorDefinitions>MPT_BUILD_RETRO;MPT_CHECK_CXX_IGNORE_PREPROCESSOR;DEBUG;MPT_BUILD_DEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0502;NTDDI_VERSION=0x05020200;_CSTRING_DISABLE_NARROW_WIDE_CONVERSION;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;MPT_WITH_MFC;MPT_WITH_DIRECTSOUND;MPT_WITH_ANCIENT;CRYPTOPP_ENABLE_NAMESPACE_WEAK=1;MPT_WITH_CRYPTOPP;FLAC__NO_DLL;MPT_WITH_FLAC;MPT_WITH_LAME;MPT_WITH_LHASA;MPT_WITH_MINIZIP;MPG123_NO_LARGENAME;MPT_WITH_MPG123;MPT_WITH_NLOHMANNJSON;MPT_WITH_OGG;MPT_WITH_OPUS;MPT_WITH_OPUSENC;MPT_WITH_OPUSFILE;MPT_WITH_PORTAUDIO;MPT_WITH_R8BRAIN;MPT_WITH_RTAUDIO;MPT_WITH_RTMIDI;MPT_WITH_SMBPITCHSHIFT;MPT_WITH_SOUNDTOUCH;MPT_WITH_UNRAR;MPT_WITH_VORBIS;MPT_WITH_VORBISENC;MPT_WITH_VORBISFILE;MPT_WITH_ZLIB;MPT_BUILD_ENABLE_PCH;MODPLUG_TRACKER;NO_WARN_MBCS_MFC_DEPRECATION;MPT_CHECK_WINDOWS_IGNORE_WARNING_NO_UNICODE;VER_ARC
 HNAME=\"amd64\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..\include\ancient\api;..\..\include\flac\include;..\..\include\lame\include;..\..\include\lhasa\lib\public;..\..\include\mpg123\src\include;..\..\include\nlohmann-json\include;..\..\include\ogg\include;..\..\include\opus\include;..\..\include\opusenc\include;..\..\include\opusfile\include;..\..\include\portaudio\include;..\..\include\rtaudio;..\..\include;..\..\include\vorbis\include;..\..\include\zlib;..\..\src;..\..\common;..\..\soundlib;$(IntDir)\svn_version;..\pch;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>MPT_BUILD_RETRO;MPT_CHECK_CXX_IGNORE_PREPROCESSOR;DEBUG;MPT_BUILD_DEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0502;NTDDI_VERSION=0x05020200;_CSTRING_DISABLE_NARROW_WIDE_CONVERSION;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;MPT_WITH_MFC;MPT_WITH_DIRECTSOUND;MPT_WITH_ANCIENT;CRYPTOPP_ENABLE_NAMESPACE_WEAK=1;MPT_WITH_CRYPTOPP;FLAC__NO_DLL;MPT_WITH_FLAC;MPT_WITH_LAME;MPT_WITH_LHASA;MPT_WITH_MINIZIP;MPG123_NO_LARGENAME;MPT_WITH_MPG123;MPT_WITH_NLOHMANNJSON;MPT_WITH_OGG;MPT_WITH_OPUS;MPT_WITH_OPUSENC;MPT_WITH_OPUSFILE;MPT_WITH_PORTAUDIO;MPT_WITH_R8BRAIN;MPT_WITH_RTAUDIO;MPT_WITH_RTMIDI;MPT_WITH_SIGNALSMITH_STRETCH;MPT_WITH_UNRAR;MPT_WITH_VORBIS;MPT_WITH_VORBISENC;MPT_WITH_VORBISFILE;MPT_WITH_ZLIB;MPT_BUILD_ENABLE_PCH;MODPLUG_TRACKER;NO_WARN_MBCS_MFC_DEPRECATION;MPT_CHECK_WINDOWS_IGNORE_WARNING_NO_UNICODE;VER_ARCHNAME=\"amd64\
 ";%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>..\..\include\ancient\api;..\..\include\flac\include;..\..\include\lame\include;..\..\include\lhasa\lib\public;..\..\include\mpg123\src\include;..\..\include\nlohmann-json\include;..\..\include\ogg\include;..\..\include\opus\include;..\..\include\opusenc\include;..\..\include\opusfile\include;..\..\include\portaudio\include;..\..\include\rtaudio;..\..\include\SignalsmithStretch;..\..\include;..\..\include\vorbis\include;..\..\include\zlib;..\..\src;..\..\common;..\..\soundlib;$(IntDir)\svn_version;..\pch;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -382,8 +382,8 @@
       <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>PCH.h</PrecompiledHeaderFile>
       <WarningLevel>Level4</WarningLevel>
-      <PreprocessorDefinitions>MPT_BUILD_RETRO;MPT_CHECK_CXX_IGNORE_PREPROCESSOR;NDEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0501;NTDDI_VERSION=0x05010300;_CSTRING_DISABLE_NARROW_WIDE_CONVERSION;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;MPT_WITH_MFC;MPT_WITH_DIRECTSOUND;MPT_WITH_ANCIENT;CRYPTOPP_ENABLE_NAMESPACE_WEAK=1;MPT_WITH_CRYPTOPP;FLAC__NO_DLL;MPT_WITH_FLAC;MPT_WITH_LAME;MPT_WITH_LHASA;MPT_WITH_MINIZIP;MPG123_NO_LARGENAME;MPT_WITH_MPG123;MPT_WITH_NLOHMANNJSON;MPT_WITH_OGG;MPT_WITH_OPUS;MPT_WITH_OPUSENC;MPT_WITH_OPUSFILE;MPT_WITH_PORTAUDIO;MPT_WITH_R8BRAIN;MPT_WITH_RTAUDIO;MPT_WITH_RTMIDI;MPT_WITH_SMBPITCHSHIFT;MPT_WITH_SOUNDTOUCH;MPT_WITH_UNRAR;MPT_WITH_VORBIS;MPT_WITH_VORBISENC;MPT_WITH_VORBISFILE;MPT_WITH_ZLIB;MPT_BUILD_ENABLE_PCH;MODPLUG_TRACKER;NO_WARN_MBCS_MFC_DEPRECATION;MPT_CHECK_WINDOWS_IGNORE_WARNING_NO_UNICODE;%(PreprocessorDefiniti
 ons)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..\include\ancient\api;..\..\include\flac\include;..\..\include\lame\include;..\..\include\lhasa\lib\public;..\..\include\mpg123\src\include;..\..\include\nlohmann-json\include;..\..\include\ogg\include;..\..\include\opus\include;..\..\include\opusenc\include;..\..\include\opusfile\include;..\..\include\portaudio\include;..\..\include\rtaudio;..\..\include;..\..\include\vorbis\include;..\..\include\zlib;..\..\src;..\..\common;..\..\soundlib;$(IntDir)\svn_version;..\pch;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>MPT_BUILD_RETRO;MPT_CHECK_CXX_IGNORE_PREPROCESSOR;NDEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0501;NTDDI_VERSION=0x05010300;_CSTRING_DISABLE_NARROW_WIDE_CONVERSION;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;MPT_WITH_MFC;MPT_WITH_DIRECTSOUND;MPT_WITH_ANCIENT;CRYPTOPP_ENABLE_NAMESPACE_WEAK=1;MPT_WITH_CRYPTOPP;FLAC__NO_DLL;MPT_WITH_FLAC;MPT_WITH_LAME;MPT_WITH_LHASA;MPT_WITH_MINIZIP;MPG123_NO_LARGENAME;MPT_WITH_MPG123;MPT_WITH_NLOHMANNJSON;MPT_WITH_OGG;MPT_WITH_OPUS;MPT_WITH_OPUSENC;MPT_WITH_OPUSFILE;MPT_WITH_PORTAUDIO;MPT_WITH_R8BRAIN;MPT_WITH_RTAUDIO;MPT_WITH_RTMIDI;MPT_WITH_SIGNALSMITH_STRETCH;MPT_WITH_UNRAR;MPT_WITH_VORBIS;MPT_WITH_VORBISENC;MPT_WITH_VORBISFILE;MPT_WITH_ZLIB;MPT_BUILD_ENABLE_PCH;MODPLUG_TRACKER;NO_WARN_MBCS_MFC_DEPRECATION;MPT_CHECK_WINDOWS_IGNORE_WARNING_NO_UNICODE;%(PreprocessorDefinitions)</Preproce
 ssorDefinitions>
+      <AdditionalIncludeDirectories>..\..\include\ancient\api;..\..\include\flac\include;..\..\include\lame\include;..\..\include\lhasa\lib\public;..\..\include\mpg123\src\include;..\..\include\nlohmann-json\include;..\..\include\ogg\include;..\..\include\opus\include;..\..\include\opusenc\include;..\..\include\opusfile\include;..\..\include\portaudio\include;..\..\include\rtaudio;..\..\include\SignalsmithStretch;..\..\include;..\..\include\vorbis\include;..\..\include\zlib;..\..\src;..\..\common;..\..\soundlib;$(IntDir)\svn_version;..\pch;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <ForcedIncludeFiles>PCH.h</ForcedIncludeFiles>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <Optimization>MaxSpeed</Optimization>
@@ -398,8 +398,8 @@
       <LanguageStandard>stdcpp17</LanguageStandard>
     </ClCompile>
     <ResourceCompile>
-      <PreprocessorDefinitions>MPT_BUILD_RETRO;MPT_CHECK_CXX_IGNORE_PREPROCESSOR;NDEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0501;NTDDI_VERSION=0x05010300;_CSTRING_DISABLE_NARROW_WIDE_CONVERSION;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;MPT_WITH_MFC;MPT_WITH_DIRECTSOUND;MPT_WITH_ANCIENT;CRYPTOPP_ENABLE_NAMESPACE_WEAK=1;MPT_WITH_CRYPTOPP;FLAC__NO_DLL;MPT_WITH_FLAC;MPT_WITH_LAME;MPT_WITH_LHASA;MPT_WITH_MINIZIP;MPG123_NO_LARGENAME;MPT_WITH_MPG123;MPT_WITH_NLOHMANNJSON;MPT_WITH_OGG;MPT_WITH_OPUS;MPT_WITH_OPUSENC;MPT_WITH_OPUSFILE;MPT_WITH_PORTAUDIO;MPT_WITH_R8BRAIN;MPT_WITH_RTAUDIO;MPT_WITH_RTMIDI;MPT_WITH_SMBPITCHSHIFT;MPT_WITH_SOUNDTOUCH;MPT_WITH_UNRAR;MPT_WITH_VORBIS;MPT_WITH_VORBISENC;MPT_WITH_VORBISFILE;MPT_WITH_ZLIB;MPT_BUILD_ENABLE_PCH;MODPLUG_TRACKER;NO_WARN_MBCS_MFC_DEPRECATION;MPT_CHECK_WINDOWS_IGNORE_WARNING_NO_UNICODE;VER_ARCHNAME=\"x86\";%
 (PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..\include\ancient\api;..\..\include\flac\include;..\..\include\lame\include;..\..\include\lhasa\lib\public;..\..\include\mpg123\src\include;..\..\include\nlohmann-json\include;..\..\include\ogg\include;..\..\include\opus\include;..\..\include\opusenc\include;..\..\include\opusfile\include;..\..\include\portaudio\include;..\..\include\rtaudio;..\..\include;..\..\include\vorbis\include;..\..\include\zlib;..\..\src;..\..\common;..\..\soundlib;$(IntDir)\svn_version;..\pch;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>MPT_BUILD_RETRO;MPT_CHECK_CXX_IGNORE_PREPROCESSOR;NDEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0501;NTDDI_VERSION=0x05010300;_CSTRING_DISABLE_NARROW_WIDE_CONVERSION;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;MPT_WITH_MFC;MPT_WITH_DIRECTSOUND;MPT_WITH_ANCIENT;CRYPTOPP_ENABLE_NAMESPACE_WEAK=1;MPT_WITH_CRYPTOPP;FLAC__NO_DLL;MPT_WITH_FLAC;MPT_WITH_LAME;MPT_WITH_LHASA;MPT_WITH_MINIZIP;MPG123_NO_LARGENAME;MPT_WITH_MPG123;MPT_WITH_NLOHMANNJSON;MPT_WITH_OGG;MPT_WITH_OPUS;MPT_WITH_OPUSENC;MPT_WITH_OPUSFILE;MPT_WITH_PORTAUDIO;MPT_WITH_R8BRAIN;MPT_WITH_RTAUDIO;MPT_WITH_RTMIDI;MPT_WITH_SIGNALSMITH_STRETCH;MPT_WITH_UNRAR;MPT_WITH_VORBIS;MPT_WITH_VORBISENC;MPT_WITH_VORBISFILE;MPT_WITH_ZLIB;MPT_BUILD_ENABLE_PCH;MODPLUG_TRACKER;NO_WARN_MBCS_MFC_DEPRECATION;MPT_CHECK_WINDOWS_IGNORE_WARNING_NO_UNICODE;VER_ARCHNAME=\"x86\";%(PreprocessorD
 efinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>..\..\include\ancient\api;..\..\include\flac\include;..\..\include\lame\include;..\..\include\lhasa\lib\public;..\..\include\mpg123\src\include;..\..\include\nlohmann-json\include;..\..\include\ogg\include;..\..\include\opus\include;..\..\include\opusenc\include;..\..\include\opusfile\include;..\..\include\portaudio\include;..\..\include\rtaudio;..\..\include\SignalsmithStretch;..\..\include;..\..\include\vorbis\include;..\..\include\zlib;..\..\src;..\..\common;..\..\soundlib;$(IntDir)\svn_version;..\pch;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -421,8 +421,8 @@
       <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>PCH.h</PrecompiledHeaderFile>
       <WarningLevel>Level4</WarningLevel>
-      <PreprocessorDefinitions>MPT_BUILD_RETRO;MPT_CHECK_CXX_IGNORE_PREPROCESSOR;NDEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0502;NTDDI_VERSION=0x05020200;_CSTRING_DISABLE_NARROW_WIDE_CONVERSION;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;MPT_WITH_MFC;MPT_WITH_DIRECTSOUND;MPT_WITH_ANCIENT;CRYPTOPP_ENABLE_NAMESPACE_WEAK=1;MPT_WITH_CRYPTOPP;FLAC__NO_DLL;MPT_WITH_FLAC;MPT_WITH_LAME;MPT_WITH_LHASA;MPT_WITH_MINIZIP;MPG123_NO_LARGENAME;MPT_WITH_MPG123;MPT_WITH_NLOHMANNJSON;MPT_WITH_OGG;MPT_WITH_OPUS;MPT_WITH_OPUSENC;MPT_WITH_OPUSFILE;MPT_WITH_PORTAUDIO;MPT_WITH_R8BRAIN;MPT_WITH_RTAUDIO;MPT_WITH_RTMIDI;MPT_WITH_SMBPITCHSHIFT;MPT_WITH_SOUNDTOUCH;MPT_WITH_UNRAR;MPT_WITH_VORBIS;MPT_WITH_VORBISENC;MPT_WITH_VORBISFILE;MPT_WITH_ZLIB;MPT_BUILD_ENABLE_PCH;MODPLUG_TRACKER;NO_WARN_MBCS_MFC_DEPRECATION;MPT_CHECK_WINDOWS_IGNORE_WARNING_NO_UNICODE;%(PreprocessorDefiniti
 ons)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..\include\ancient\api;..\..\include\flac\include;..\..\include\lame\include;..\..\include\lhasa\lib\public;..\..\include\mpg123\src\include;..\..\include\nlohmann-json\include;..\..\include\ogg\include;..\..\include\opus\include;..\..\include\opusenc\include;..\..\include\opusfile\include;..\..\include\portaudio\include;..\..\include\rtaudio;..\..\include;..\..\include\vorbis\include;..\..\include\zlib;..\..\src;..\..\common;..\..\soundlib;$(IntDir)\svn_version;..\pch;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>MPT_BUILD_RETRO;MPT_CHECK_CXX_IGNORE_PREPROCESSOR;NDEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0502;NTDDI_VERSION=0x05020200;_CSTRING_DISABLE_NARROW_WIDE_CONVERSION;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;MPT_WITH_MFC;MPT_WITH_DIRECTSOUND;MPT_WITH_ANCIENT;CRYPTOPP_ENABLE_NAMESPACE_WEAK=1;MPT_WITH_CRYPTOPP;FLAC__NO_DLL;MPT_WITH_FLAC;MPT_WITH_LAME;MPT_WITH_LHASA;MPT_WITH_MINIZIP;MPG123_NO_LARGENAME;MPT_WITH_MPG123;MPT_WITH_NLOHMANNJSON;MPT_WITH_OGG;MPT_WITH_OPUS;MPT_WITH_OPUSENC;MPT_WITH_OPUSFILE;MPT_WITH_PORTAUDIO;MPT_WITH_R8BRAIN;MPT_WITH_RTAUDIO;MPT_WITH_RTMIDI;MPT_WITH_SIGNALSMITH_STRETCH;MPT_WITH_UNRAR;MPT_WITH_VORBIS;MPT_WITH_VORBISENC;MPT_WITH_VORBISFILE;MPT_WITH_ZLIB;MPT_BUILD_ENABLE_PCH;MODPLUG_TRACKER;NO_WARN_MBCS_MFC_DEPRECATION;MPT_CHECK_WINDOWS_IGNORE_WARNING_NO_UNICODE;%(PreprocessorDefinitions)</Preproce
 ssorDefinitions>
+      <AdditionalIncludeDirectories>..\..\include\ancient\api;..\..\include\flac\include;..\..\include\lame\include;..\..\include\lhasa\lib\public;..\..\include\mpg123\src\include;..\..\include\nlohmann-json\include;..\..\include\ogg\include;..\..\include\opus\include;..\..\include\opusenc\include;..\..\include\opusfile\include;..\..\include\portaudio\include;..\..\include\rtaudio;..\..\include\SignalsmithStretch;..\..\include;..\..\include\vorbis\include;..\..\include\zlib;..\..\src;..\..\common;..\..\soundlib;$(IntDir)\svn_version;..\pch;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <ForcedIncludeFiles>PCH.h</ForcedIncludeFiles>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <Optimization>MaxSpeed</Optimization>
@@ -436,8 +436,8 @@
       <LanguageStandard>stdcpp17</LanguageStandard>
     </ClCompile>
     <ResourceCompile>
-      <PreprocessorDefinitions>MPT_BUILD_RETRO;MPT_CHECK_CXX_IGNORE_PREPROCESSOR;NDEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0502;NTDDI_VERSION=0x05020200;_CSTRING_DISABLE_NARROW_WIDE_CONVERSION;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;MPT_WITH_MFC;MPT_WITH_DIRECTSOUND;MPT_WITH_ANCIENT;CRYPTOPP_ENABLE_NAMESPACE_WEAK=1;MPT_WITH_CRYPTOPP;FLAC__NO_DLL;MPT_WITH_FLAC;MPT_WITH_LAME;MPT_WITH_LHASA;MPT_WITH_MINIZIP;MPG123_NO_LARGENAME;MPT_WITH_MPG123;MPT_WITH_NLOHMANNJSON;MPT_WITH_OGG;MPT_WITH_OPUS;MPT_WITH_OPUSENC;MPT_WITH_OPUSFILE;MPT_WITH_PORTAUDIO;MPT_WITH_R8BRAIN;MPT_WITH_RTAUDIO;MPT_WITH_RTMIDI;MPT_WITH_SMBPITCHSHIFT;MPT_WITH_SOUNDTOUCH;MPT_WITH_UNRAR;MPT_WITH_VORBIS;MPT_WITH_VORBISENC;MPT_WITH_VORBISFILE;MPT_WITH_ZLIB;MPT_BUILD_ENABLE_PCH;MODPLUG_TRACKER;NO_WARN_MBCS_MFC_DEPRECATION;MPT_CHECK_WINDOWS_IGNORE_WARNING_NO_UNICODE;VER_ARCHNAME=\"amd64\"
 ;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..\include\ancient\api;..\..\include\flac\include;..\..\include\lame\include;..\..\include\lhasa\lib\public;..\..\include\mpg123\src\include;..\..\include\nlohmann-json\include;..\..\include\ogg\include;..\..\include\opus\include;..\..\include\opusenc\include;..\..\include\opusfile\include;..\..\include\portaudio\include;..\..\include\rtaudio;..\..\include;..\..\include\vorbis\include;..\..\include\zlib;..\..\src;..\..\common;..\..\soundlib;$(IntDir)\svn_version;..\pch;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>MPT_BUILD_RETRO;MPT_CHECK_CXX_IGNORE_PREPROCESSOR;NDEBUG;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0502;NTDDI_VERSION=0x05020200;_CSTRING_DISABLE_NARROW_WIDE_CONVERSION;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;MPT_WITH_MFC;MPT_WITH_DIRECTSOUND;MPT_WITH_ANCIENT;CRYPTOPP_ENABLE_NAMESPACE_WEAK=1;MPT_WITH_CRYPTOPP;FLAC__NO_DLL;MPT_WITH_FLAC;MPT_WITH_LAME;MPT_WITH_LHASA;MPT_WITH_MINIZIP;MPG123_NO_LARGENAME;MPT_WITH_MPG123;MPT_WITH_NLOHMANNJSON;MPT_WITH_OGG;MPT_WITH_OPUS;MPT_WITH_OPUSENC;MPT_WITH_OPUSFILE;MPT_WITH_PORTAUDIO;MPT_WITH_R8BRAIN;MPT_WITH_RTAUDIO;MPT_WITH_RTMIDI;MPT_WITH_SIGNALSMITH_STRETCH;MPT_WITH_UNRAR;MPT_WITH_VORBIS;MPT_WITH_VORBISENC;MPT_WITH_VORBISFILE;MPT_WITH_ZLIB;MPT_BUILD_ENABLE_PCH;MODPLUG_TRACKER;NO_WARN_MBCS_MFC_DEPRECATION;MPT_CHECK_WINDOWS_IGNORE_WARNING_NO_UNICODE;VER_ARCHNAME=\"amd64\";%(Preprocesso
 rDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>..\..\include\ancient\api;..\..\include\flac\include;..\..\include\lame\include;..\..\include\lhasa\lib\public;..\..\include\mpg123\src\include;..\..\include\nlohmann-json\include;..\..\include\ogg\include;..\..\include\opus\include;..\..\include\opusenc\include;..\..\include\opusfile\include;..\..\include\portaudio\include;..\..\include\rtaudio;..\..\include\SignalsmithStretch;..\..\include;..\..\include\vorbis\include;..\..\include\zlib;..\..\src;..\..\common;..\..\soundlib;$(IntDir)\svn_version;..\pch;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -459,8 +459,8 @@
       <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>PCH.h</PrecompiledHeaderFile>
       <WarningLevel>Level4</WarningLevel>
-      <PreprocessorDefinitions>MPT_BUILD_RETRO;MPT_CHECK_CXX_IGNORE_PREPROCESSOR;DEBUG;MPT_BUILD_CHECKED;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0501;NTDDI_VERSION=0x05010300;_CSTRING_DISABLE_NARROW_WIDE_CONVERSION;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;MPT_WITH_MFC;MPT_WITH_DIRECTSOUND;MPT_WITH_ANCIENT;CRYPTOPP_ENABLE_NAMESPACE_WEAK=1;MPT_WITH_CRYPTOPP;FLAC__NO_DLL;MPT_WITH_FLAC;MPT_WITH_LAME;MPT_WITH_LHASA;MPT_WITH_MINIZIP;MPG123_NO_LARGENAME;MPT_WITH_MPG123;MPT_WITH_NLOHMANNJSON;MPT_WITH_OGG;MPT_WITH_OPUS;MPT_WITH_OPUSENC;MPT_WITH_OPUSFILE;MPT_WITH_PORTAUDIO;MPT_WITH_R8BRAIN;MPT_WITH_RTAUDIO;MPT_WITH_RTMIDI;MPT_WITH_SMBPITCHSHIFT;MPT_WITH_SOUNDTOUCH;MPT_WITH_UNRAR;MPT_WITH_VORBIS;MPT_WITH_VORBISENC;MPT_WITH_VORBISFILE;MPT_WITH_ZLIB;MPT_BUILD_ENABLE_PCH;MODPLUG_TRACKER;NO_WARN_MBCS_MFC_DEPRECATION;MPT_CHECK_WINDOWS_IGNORE_WARNING_NO_UNICODE;%(Pre
 processorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..\include\ancient\api;..\..\include\flac\include;..\..\include\lame\include;..\..\include\lhasa\lib\public;..\..\include\mpg123\src\include;..\..\include\nlohmann-json\include;..\..\include\ogg\include;..\..\include\opus\include;..\..\include\opusenc\include;..\..\include\opusfile\include;..\..\include\portaudio\include;..\..\include\rtaudio;..\..\include;..\..\include\vorbis\include;..\..\include\zlib;..\..\src;..\..\common;..\..\soundlib;$(IntDir)\svn_version;..\pch;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>MPT_BUILD_RETRO;MPT_CHECK_CXX_IGNORE_PREPROCESSOR;DEBUG;MPT_BUILD_CHECKED;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0501;NTDDI_VERSION=0x05010300;_CSTRING_DISABLE_NARROW_WIDE_CONVERSION;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;MPT_WITH_MFC;MPT_WITH_DIRECTSOUND;MPT_WITH_ANCIENT;CRYPTOPP_ENABLE_NAMESPACE_WEAK=1;MPT_WITH_CRYPTOPP;FLAC__NO_DLL;MPT_WITH_FLAC;MPT_WITH_LAME;MPT_WITH_LHASA;MPT_WITH_MINIZIP;MPG123_NO_LARGENAME;MPT_WITH_MPG123;MPT_WITH_NLOHMANNJSON;MPT_WITH_OGG;MPT_WITH_OPUS;MPT_WITH_OPUSENC;MPT_WITH_OPUSFILE;MPT_WITH_PORTAUDIO;MPT_WITH_R8BRAIN;MPT_WITH_RTAUDIO;MPT_WITH_RTMIDI;MPT_WITH_SIGNALSMITH_STRETCH;MPT_WITH_UNRAR;MPT_WITH_VORBIS;MPT_WITH_VORBISENC;MPT_WITH_VORBISFILE;MPT_WITH_ZLIB;MPT_BUILD_ENABLE_PCH;MODPLUG_TRACKER;NO_WARN_MBCS_MFC_DEPRECATION;MPT_CHECK_WINDOWS_IGNORE_WARNING_NO_UNICODE;%(PreprocessorDefin
 itions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>..\..\include\ancient\api;..\..\include\flac\include;..\..\include\lame\include;..\..\include\lhasa\lib\public;..\..\include\mpg123\src\include;..\..\include\nlohmann-json\include;..\..\include\ogg\include;..\..\include\opus\include;..\..\include\opusenc\include;..\..\include\opusfile\include;..\..\include\portaudio\include;..\..\include\rtaudio;..\..\include\SignalsmithStretch;..\..\include;..\..\include\vorbis\include;..\..\include\zlib;..\..\src;..\..\common;..\..\soundlib;$(IntDir)\svn_version;..\pch;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <ForcedIncludeFiles>PCH.h</ForcedIncludeFiles>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <Optimization>Full</Optimization>
@@ -476,8 +476,8 @@
       <LanguageStandard>stdcpp17</LanguageStandard>
     </ClCompile>
     <ResourceCompile>
-      <PreprocessorDefinitions>MPT_BUILD_RETRO;MPT_CHECK_CXX_IGNORE_PREPROCESSOR;DEBUG;MPT_BUILD_CHECKED;MPT_BUILD_MSVC;WIN32;NOMINMAX;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_WIN32_WINNT=0x0501;NTDDI_VERSION=0x05010300;_CSTRING_DISABLE_NARROW_WIDE_CONVERSION;_AFX_NO_MFC_CONTROLS_IN_DIALOGS;MPT_WITH_MFC;MPT_WITH_DIRECTSOUND;MPT_WITH_ANCIENT;CRYPTOPP_ENABLE_NAMESPACE_WEAK=1;MPT_WITH_CRYPTOPP;FLAC__NO_DLL;MPT_WITH_FLAC;MPT_WITH_LAME;MPT_WITH_LHASA;MPT_WITH_MINIZIP;MPG123_NO_LARGENAME;MPT_WITH_MPG123;MPT_WITH_NLOHMANNJSON;MPT_WITH_OGG;MPT_WITH_OPUS;MPT_WITH_OPUSENC;MPT_WITH_OPUSFILE;MPT_WITH_PORTAUDIO;MPT_WITH_R8BRAIN;MPT_WITH_RTAUDIO;MPT_WITH_RTMIDI;MPT_WITH_SMBPITCHSHIFT;MPT_WITH_SOUNDTOUCH;MPT_WITH_UNRAR;MPT_WITH_VORBIS;MPT_WITH_VORBISENC;MPT_WITH_VORBISFILE;MPT_WITH_ZLIB;MPT_BUILD_ENABLE_PCH;MODPLUG_TRACKER;NO_WARN_MBCS_MFC_DEPRECATION;MPT_CHECK_WINDOWS_IGNORE_WARNING_NO_UNICODE;VER_A
 RCHNAME=\"x86\";%(PreprocessorDefinitio...
 
[truncated message content]

[OMPT-svn-commit] OpenMPT r21607 - in branches/OpenMPT-1.30: . soundlib

From: <sv...@op...> - 2024-09-18 15:14:19

Author: sagamusix
Date: Wed Sep 18 17:14:07 2024
New Revision: 21607
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21607

Log:
[Fix] Possible out-of-bounds read with malformed IT / MPTM / XM files using the SymMOD Echo plugin when modern tempo mode with an invalid rows per beat setting of 0 was used. This fix is a backport of the following:

Merged revision(s) 16484 from trunk/OpenMPT:
[Fix] Reject a rows per beat value of 0 when loading a file with modern tempo mode, as this would result in infinite tick length and thus undefined behaviour when trying to convert the tick length to int (found with afl++ + ubsan)
........

Modified:
   branches/OpenMPT-1.30/   (props changed)
   branches/OpenMPT-1.30/soundlib/Sndfile.cpp

Modified: branches/OpenMPT-1.30/soundlib/Sndfile.cpp
==============================================================================
--- branches/OpenMPT-1.30/soundlib/Sndfile.cpp	Wed Sep 18 11:50:33 2024	(r21606)
+++ branches/OpenMPT-1.30/soundlib/Sndfile.cpp	Wed Sep 18 17:14:07 2024	(r21607)
@@ -561,6 +561,8 @@
 	if(!m_nDefaultSpeed)
 		m_nDefaultSpeed = 6;
 
+	if(!m_nDefaultRowsPerBeat && m_nTempoMode == TempoMode::Modern)
+		m_nDefaultRowsPerBeat = 1;
 	if(m_nDefaultRowsPerMeasure < m_nDefaultRowsPerBeat)
 		m_nDefaultRowsPerMeasure = m_nDefaultRowsPerBeat;
 	LimitMax(m_nDefaultRowsPerBeat, MAX_ROWS_PER_BEAT);

[OMPT-svn-commit] OpenMPT r21606 - in branches/OpenMPT-1.28: . .github/workflows

From: <sv...@op...> - 2024-09-18 09:50:45

Author: manx
Date: Wed Sep 18 11:50:33 2024
New Revision: 21606
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21606

Log:
Merged revision(s) 21604 from branches/OpenMPT-1.30:
[Fix] build: CI: GitHub: macOS: Try to fix GitHub homebrew go breakage on macOS 12. See r21598 and r21599.
........

Modified:
   branches/OpenMPT-1.28/   (props changed)
   branches/OpenMPT-1.28/.github/workflows/macOS-12-Makefile.yml

Modified: branches/OpenMPT-1.28/.github/workflows/macOS-12-Makefile.yml
==============================================================================
--- branches/OpenMPT-1.28/.github/workflows/macOS-12-Makefile.yml	Wed Sep 18 11:50:11 2024	(r21605)
+++ branches/OpenMPT-1.28/.github/workflows/macOS-12-Makefile.yml	Wed Sep 18 11:50:33 2024	(r21606)
@@ -19,6 +19,8 @@
       run: brew pin swiftlint
     - name: fixup GitHub Homebrew xcbeautify breakage
       run: brew pin xcbeautify
+    - name: fixup GitHub Homebrew go breakage
+      run: brew unlink go@1.21
     - name: fixup GitHub Homebrew node breakage
       run: brew unlink node@18 && brew unlink node && brew link --overwrite node
     - name: fixup GitHub Homebrew python breakage

[OMPT-svn-commit] OpenMPT r21605 - in branches/OpenMPT-1.29: . .github/workflows

From: <sv...@op...> - 2024-09-18 09:50:18

Author: manx
Date: Wed Sep 18 11:50:11 2024
New Revision: 21605
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21605

Log:
Merged revision(s) 21604 from branches/OpenMPT-1.30:
[Fix] build: CI: GitHub: macOS: Try to fix GitHub homebrew go breakage on macOS 12. See r21598 and r21599.
........

Modified:
   branches/OpenMPT-1.29/   (props changed)
   branches/OpenMPT-1.29/.github/workflows/macOS-12-Makefile.yml

Modified: branches/OpenMPT-1.29/.github/workflows/macOS-12-Makefile.yml
==============================================================================
--- branches/OpenMPT-1.29/.github/workflows/macOS-12-Makefile.yml	Wed Sep 18 11:49:09 2024	(r21604)
+++ branches/OpenMPT-1.29/.github/workflows/macOS-12-Makefile.yml	Wed Sep 18 11:50:11 2024	(r21605)
@@ -19,6 +19,8 @@
       run: brew pin swiftlint
     - name: fixup GitHub Homebrew xcbeautify breakage
       run: brew pin xcbeautify
+    - name: fixup GitHub Homebrew go breakage
+      run: brew unlink go@1.21
     - name: fixup GitHub Homebrew node breakage
       run: brew unlink node@18 && brew unlink node && brew link --overwrite node
     - name: fixup GitHub Homebrew python breakage

[OMPT-svn-commit] OpenMPT r21604 - branches/OpenMPT-1.30/.github/workflows

From: <sv...@op...> - 2024-09-18 09:49:21

Author: manx
Date: Wed Sep 18 11:49:09 2024
New Revision: 21604
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21604

Log:
[Fix] build: CI: GitHub: macOS: Try to fix GitHub homebrew go breakage on macOS 12. See r21598 and r21599.

Modified:
   branches/OpenMPT-1.30/.github/workflows/macOS-12-Makefile.yml

Modified: branches/OpenMPT-1.30/.github/workflows/macOS-12-Makefile.yml
==============================================================================
--- branches/OpenMPT-1.30/.github/workflows/macOS-12-Makefile.yml	Wed Sep 18 11:48:01 2024	(r21603)
+++ branches/OpenMPT-1.30/.github/workflows/macOS-12-Makefile.yml	Wed Sep 18 11:49:09 2024	(r21604)
@@ -19,6 +19,8 @@
       run: brew pin swiftlint
     - name: fixup GitHub Homebrew xcbeautify breakage
       run: brew pin xcbeautify
+    - name: fixup GitHub Homebrew go breakage
+      run: brew unlink go@1.21
     - name: fixup GitHub Homebrew node breakage
       run: brew unlink node@18 && brew unlink node && brew link --overwrite node
     - name: fixup GitHub Homebrew python breakage

[OMPT-svn-commit] OpenMPT r21603 - in branches/OpenMPT-1.31: . .github/workflows

From: <sv...@op...> - 2024-09-18 09:48:13

Author: manx
Date: Wed Sep 18 11:48:01 2024
New Revision: 21603
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21603

Log:
Merged revision(s) 21598-21599 from trunk/OpenMPT:
[Fix] build: CI: GitHub: macOS: Try to fix GitHub homebrew go breakage on macOS 12.
........
[Fix] build: CI: GitHub: macOS: Try to fix GitHub homebrew go breakage on macOS 12.
........

Modified:
   branches/OpenMPT-1.31/   (props changed)
   branches/OpenMPT-1.31/.github/workflows/macOS-Autotools.yml
   branches/OpenMPT-1.31/.github/workflows/macOS-Makefile.yml

Modified: branches/OpenMPT-1.31/.github/workflows/macOS-Autotools.yml
==============================================================================
--- branches/OpenMPT-1.31/.github/workflows/macOS-Autotools.yml	Wed Sep 18 11:47:31 2024	(r21602)
+++ branches/OpenMPT-1.31/.github/workflows/macOS-Autotools.yml	Wed Sep 18 11:48:01 2024	(r21603)
@@ -29,6 +29,9 @@
     - name: fixup GitHub Homebrew xcbeautify breakage
       if: ${{ matrix.host == 'macos-12' }}
       run: brew pin xcbeautify
+    - name: fixup GitHub Homebrew go breakage
+      if: ${{ matrix.host == 'macos-12' }}
+      run: brew unlink go@1.21
     - name: fixup GitHub Homebrew node breakage
       if: ${{ matrix.host == 'macos-12' }}
       run: brew unlink node@18 && brew unlink node && brew link --overwrite node

Modified: branches/OpenMPT-1.31/.github/workflows/macOS-Makefile.yml
==============================================================================
--- branches/OpenMPT-1.31/.github/workflows/macOS-Makefile.yml	Wed Sep 18 11:47:31 2024	(r21602)
+++ branches/OpenMPT-1.31/.github/workflows/macOS-Makefile.yml	Wed Sep 18 11:48:01 2024	(r21603)
@@ -77,6 +77,9 @@
     - name: fixup GitHub Homebrew xcbeautify breakage
       if: ${{ matrix.host == 'macos-12' }}
       run: brew pin xcbeautify
+    - name: fixup GitHub Homebrew go breakage
+      if: ${{ matrix.host == 'macos-12' }}
+      run: brew unlink go@1.21
     - name: fixup GitHub Homebrew node breakage
       if: ${{ matrix.host == 'macos-12' }}
       run: brew unlink node@18 && brew unlink node && brew link --overwrite node

[OMPT-svn-commit] OpenMPT r21602 - in branches/OpenMPT-1.31: . openmpt123

From: <sv...@op...> - 2024-09-18 09:47:42

Author: manx
Date: Wed Sep 18 11:47:31 2024
New Revision: 21602
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21602

Log:
Merged revision(s) 21601 from trunk/OpenMPT:
[Fix] openmpt123: Add missing include.
........

Modified:
   branches/OpenMPT-1.31/   (props changed)
   branches/OpenMPT-1.31/openmpt123/openmpt123.hpp

Modified: branches/OpenMPT-1.31/openmpt123/openmpt123.hpp
==============================================================================
--- branches/OpenMPT-1.31/openmpt123/openmpt123.hpp	Wed Sep 18 10:14:23 2024	(r21601)
+++ branches/OpenMPT-1.31/openmpt123/openmpt123.hpp	Wed Sep 18 11:47:31 2024	(r21602)
@@ -33,6 +33,8 @@
 
 #include <string>
 
+#include <libopenmpt/libopenmpt.hpp>
+
 namespace mpt {
 inline namespace MPT_INLINE_NS {

[OMPT-svn-commit] OpenMPT r21601 - trunk/OpenMPT/openmpt123

From: <sv...@op...> - 2024-09-18 08:14:35

Author: manx
Date: Wed Sep 18 10:14:23 2024
New Revision: 21601
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21601

Log:
[Fix] openmpt123: Add missing include.

Modified:
   trunk/OpenMPT/openmpt123/openmpt123.hpp

Modified: trunk/OpenMPT/openmpt123/openmpt123.hpp
==============================================================================
--- trunk/OpenMPT/openmpt123/openmpt123.hpp	Wed Sep 18 10:05:28 2024	(r21600)
+++ trunk/OpenMPT/openmpt123/openmpt123.hpp	Wed Sep 18 10:14:23 2024	(r21601)
@@ -33,6 +33,8 @@
 
 #include <string>
 
+#include <libopenmpt/libopenmpt.hpp>
+
 namespace mpt {
 inline namespace MPT_INLINE_NS {

[OMPT-svn-commit] OpenMPT r21600 - trunk/OpenMPT/build

From: <sv...@op...> - 2024-09-18 08:05:36

Author: manx
Date: Wed Sep 18 10:05:28 2024
New Revision: 21600
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21600

Log:
[Fix] build: download_externals: Add fallback download for InnoSetup 5.5.8.

Modified:
   trunk/OpenMPT/build/download_externals.txt

Modified: trunk/OpenMPT/build/download_externals.txt
==============================================================================
--- trunk/OpenMPT/build/download_externals.txt	Wed Sep 18 09:58:16 2024	(r21599)
+++ trunk/OpenMPT/build/download_externals.txt	Wed Sep 18 10:05:28 2024	(r21600)
@@ -7,7 +7,7 @@
 "build/externals/python-3.12.6-embed-amd64.zip" 11061146 43e9eab6fce7e62f1badf478706e3df7f65a9bb0fdff2ee01f71c65425acd8d73e4e0dcc64a6ee59a7d934be7271a4f0b9fe3e0da62a5ba636663f628bd7fbd7 "https://www.python.org/ftp/python/3.12.6/python-3.12.6-embed-amd64.zip"
 "build/externals/innounp050.rar"                  141621 dbbc809308267a866db9d6b751fdeda6d179e1a65d8ddb14bb51984431ae91493f9a76105e1789b245732043a2c696c869ed10964b48cf59f81e55bd52f85330 "https://netcologne.dl.sourceforge.net/project/innounp/innounp/innounp 0.50/innounp050.rar" "https://deac-fra.dl.sourceforge.net/project/innounp/innounp/innounp 0.50/innounp050.rar"
 "build/externals/innosetup-6.3.3.exe"            5634744 785e7cdad84da42ddfc94f8e20b7150a92fbca1904cfa4d7e23f68b874fba134e9c91a1fb5a8291e7e334f57c1063061d3e8496a2d9e7c4d9415ea9f12a3522e "https://files.jrsoftware.org/is/6/innosetup-6.3.3.exe" "https://files.innosetup.nl/innosetup-6.3.3.exe"
-"build/externals/isetup-5.5.8-unicode.exe"       2342456 da7e27d85caec85b4194c7b1412c5a64c0ae12f22d903b94f2f4ee9ea0cb99c91b2d1dbb49262eefae8129e6b91f5c46f26f353011076e77e75f9c955fc5e1cb "https://files.jrsoftware.org/is/5/isetup-5.5.8-unicode.exe"
+"build/externals/isetup-5.5.8-unicode.exe"       2342456 da7e27d85caec85b4194c7b1412c5a64c0ae12f22d903b94f2f4ee9ea0cb99c91b2d1dbb49262eefae8129e6b91f5c46f26f353011076e77e75f9c955fc5e1cb "https://files.jrsoftware.org/is/5/isetup-5.5.8-unicode.exe" "https://web.archive.org/web/20230523165634id_/https://files.jrsoftware.org/is/5/isetup-5.5.8-unicode.exe"
 "build/externals/example_songs_ompt_1_30.7z"     4881392 bfecf7f97fd71bd52bcfb38307ccb98c751e6a0fa0c1f31208b22b9392f03ea3da8f9271327df2de4fc2e463e0c13c6a24107fbe18caf8f446b7e7cf93073fa5 "https://download.openmpt.org/resources/modules/example_songs_ompt_1_30.7z"
 "build/externals/allegro-4.2.3.1-hg.8+r8500.zip" 3872466 46cd8d4d7138b795dbc66994e953d0abc578c6d3c00615e3580237458529d33d7ad9d269a9778918d4b3719d75750d5cca74ff6bf38ad357a766472799ee9e7b "https://lib.openmpt.org/files/libopenmpt/contrib/allegro/allegro-4.2.3.1-hg.8+r8500.zip" "https://mercury.sexy/members/manx/liballegro-4.2/allegro-4.2.3.1-hg.8+r8500.zip"
 "build/externals/csdpmi7b.zip"                     71339 58c24691d27cead1cec92d334af551f37a3ba31de25a687d99399c28d822ec9f6ffccc9332bfce35e65dae4dd1210b54e54b223a4de17f5adcb11e2da004b834 "https://lib.openmpt.org/files/libopenmpt/contrib/djgpp/cwsdpmi/csdpmi7b.zip" "https://www.mirrorservice.org/sites/ftp.delorie.com/pub/djgpp/current/v2misc/csdpmi7b.zip" "https://djgpp.mirror.garr.it/current/v2misc/csdpmi7b.zip"

[OMPT-svn-commit] OpenMPT r21599 - trunk/OpenMPT/.github/workflows

From: <sv...@op...> - 2024-09-18 07:58:28

Author: manx
Date: Wed Sep 18 09:58:16 2024
New Revision: 21599
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21599

Log:
[Fix] build: CI: GitHub: macOS: Try to fix GitHub homebrew go breakage on macOS 12.

Modified:
   trunk/OpenMPT/.github/workflows/macOS-Autotools.yml
   trunk/OpenMPT/.github/workflows/macOS-Makefile.yml

Modified: trunk/OpenMPT/.github/workflows/macOS-Autotools.yml
==============================================================================
--- trunk/OpenMPT/.github/workflows/macOS-Autotools.yml	Wed Sep 18 09:36:53 2024	(r21598)
+++ trunk/OpenMPT/.github/workflows/macOS-Autotools.yml	Wed Sep 18 09:58:16 2024	(r21599)
@@ -33,7 +33,7 @@
       run: brew pin xcbeautify
     - name: fixup GitHub Homebrew go breakage
       if: ${{ matrix.host == 'macos-12' }}
-      run: brew unlink go@1.21 && brew unlink go && brew link --overwrite go
+      run: brew unlink go@1.21
     - name: fixup GitHub Homebrew node breakage
       if: ${{ matrix.host == 'macos-12' }}
       run: brew unlink node@18 && brew unlink node && brew link --overwrite node

Modified: trunk/OpenMPT/.github/workflows/macOS-Makefile.yml
==============================================================================
--- trunk/OpenMPT/.github/workflows/macOS-Makefile.yml	Wed Sep 18 09:36:53 2024	(r21598)
+++ trunk/OpenMPT/.github/workflows/macOS-Makefile.yml	Wed Sep 18 09:58:16 2024	(r21599)
@@ -81,7 +81,7 @@
       run: brew pin xcbeautify
     - name: fixup GitHub Homebrew go breakage
       if: ${{ matrix.host == 'macos-12' }}
-      run: brew unlink go@1.21 && brew unlink go && brew link --overwrite go
+      run: brew unlink go@1.21
     - name: fixup GitHub Homebrew node breakage
       if: ${{ matrix.host == 'macos-12' }}
       run: brew unlink node@18 && brew unlink node && brew link --overwrite node

[OMPT-svn-commit] OpenMPT r21598 - trunk/OpenMPT/.github/workflows

From: <sv...@op...> - 2024-09-18 07:37:05

Author: manx
Date: Wed Sep 18 09:36:53 2024
New Revision: 21598
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21598

Log:
[Fix] build: CI: GitHub: macOS: Try to fix GitHub homebrew go breakage on macOS 12.

Modified:
   trunk/OpenMPT/.github/workflows/macOS-Autotools.yml
   trunk/OpenMPT/.github/workflows/macOS-Makefile.yml

Modified: trunk/OpenMPT/.github/workflows/macOS-Autotools.yml
==============================================================================
--- trunk/OpenMPT/.github/workflows/macOS-Autotools.yml	Tue Sep 17 23:58:54 2024	(r21597)
+++ trunk/OpenMPT/.github/workflows/macOS-Autotools.yml	Wed Sep 18 09:36:53 2024	(r21598)
@@ -31,6 +31,9 @@
     - name: fixup GitHub Homebrew xcbeautify breakage
       if: ${{ matrix.host == 'macos-12' }}
       run: brew pin xcbeautify
+    - name: fixup GitHub Homebrew go breakage
+      if: ${{ matrix.host == 'macos-12' }}
+      run: brew unlink go@1.21 && brew unlink go && brew link --overwrite go
     - name: fixup GitHub Homebrew node breakage
       if: ${{ matrix.host == 'macos-12' }}
       run: brew unlink node@18 && brew unlink node && brew link --overwrite node

Modified: trunk/OpenMPT/.github/workflows/macOS-Makefile.yml
==============================================================================
--- trunk/OpenMPT/.github/workflows/macOS-Makefile.yml	Tue Sep 17 23:58:54 2024	(r21597)
+++ trunk/OpenMPT/.github/workflows/macOS-Makefile.yml	Wed Sep 18 09:36:53 2024	(r21598)
@@ -79,6 +79,9 @@
     - name: fixup GitHub Homebrew xcbeautify breakage
       if: ${{ matrix.host == 'macos-12' }}
       run: brew pin xcbeautify
+    - name: fixup GitHub Homebrew go breakage
+      if: ${{ matrix.host == 'macos-12' }}
+      run: brew unlink go@1.21 && brew unlink go && brew link --overwrite go
     - name: fixup GitHub Homebrew node breakage
       if: ${{ matrix.host == 'macos-12' }}
       run: brew unlink node@18 && brew unlink node && brew link --overwrite node

[OMPT-svn-commit] OpenMPT r21597 - trunk/OpenMPT/mptrack

From: <sv...@op...> - 2024-09-17 21:59:06

Author: sagamusix
Date: Tue Sep 17 23:58:54 2024
New Revision: 21597
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21597

Log:
[Mod/Fix] Key handling: Redefine kcNull as 0 instead of -1. It creates an extra dummy command list entry, but for views that don't handle the WM_MOD_KEYCOMMAND, this now allows their unhandled SendMessage return value to be interpreted as kcNull instead of kcFirst.
[Imp] Key map loading: When adding new default key bindings, allow multiple new bindings to be added for the same command.

Modified:
   trunk/OpenMPT/mptrack/CommandSet.cpp
   trunk/OpenMPT/mptrack/CommandSet.h
   trunk/OpenMPT/mptrack/KeyConfigDlg.cpp

Modified: trunk/OpenMPT/mptrack/CommandSet.cpp
==============================================================================
--- trunk/OpenMPT/mptrack/CommandSet.cpp	Tue Sep 17 23:58:22 2024	(r21596)
+++ trunk/OpenMPT/mptrack/CommandSet.cpp	Tue Sep 17 23:58:54 2024	(r21597)
@@ -563,6 +563,7 @@
 } CommandDefinitions[] =
 // clang-format off
 {
+	{KeyCommand::Dummy, kcNull, _T("")},
 	{1001, kcPatternRecord, _T("Enable Recording")},
 	{1002, kcPatternPlayRow, _T("Play Row")},
 	{1003, kcCursorCopy, _T("Quick Copy")},
@@ -1428,7 +1429,7 @@
 
 #ifdef MPT_BUILD_DEBUG
 	// Ensure that every visible command has a unique ID
-	for(size_t i = 0; i < kcNumCommands; i++)
+	for(size_t i = kcFirst; i < kcNumCommands; i++)
 	{
 		if(m_commands[i].ID() != 0 || !m_commands[i].IsHidden())
 		{
@@ -1499,7 +1500,7 @@
 	{
 		// In the first pass, only look for conflicts in the same context, since
 		// such conflicts are errors. Cross-context conflicts only emit warnings.
-		for(int curCmd = 0; curCmd < kcNumCommands; curCmd++)
+		for(int curCmd = kcFirst; curCmd < kcNumCommands; curCmd++)
 		{
 			if(m_commands[curCmd].IsDummy())
 				continue;
@@ -2012,7 +2013,7 @@
 		{
 			//propagate to InstrumentView
 			const auto newCmd = translatedCmds[std::distance(std::begin(propagateCmds), propCmd)];
-			if(0 <= inCmd && inCmd < kcNumCommands)
+			if(kcFirst <= inCmd && inCmd < kcNumCommands)
 			{
 				m_commands[newCmd].kcList.reserve(m_commands[inCmd].kcList.size());
 				for(auto kc : m_commands[inCmd].kcList)
@@ -2062,7 +2063,7 @@
 	const bool allowDupes = TrackerSettings::Instance().MiscAllowMultipleCommandsPerKey;
 
 	// Copy commandlist content into map:
-	for(UINT cmd = 0; cmd < kcNumCommands; cmd++)
+	for(UINT cmd = kcFirst; cmd < kcNumCommands; cmd++)
 	{
 		if(m_commands[cmd].IsDummy())
 			continue;
@@ -2268,7 +2269,7 @@
 		}
 
 		// Error checking
-		if(cmd < 0 || cmd >= kcNumCommands || kc.Context() >= kCtxMaxInputContexts || tokens.size() < 4)
+		if(cmd < kcFirst || cmd >= kcNumCommands || kc.Context() >= kCtxMaxInputContexts || tokens.size() < 4)
 		{
 			errorCount++;
 			if (errorCount < 10)
@@ -2347,6 +2348,7 @@
 	std::vector<HKL> layouts(GetKeyboardLayoutList(0, nullptr));
 	GetKeyboardLayoutList(static_cast<int>(layouts.size()), layouts.data());
 
+	CommandID lastAdded = kcNull;
 	for(const auto &kb : DefaultKeybindings)
 	{
 		if(onlyCommandsAfterVersion != Version{})
@@ -2357,7 +2359,7 @@
 			// Do not map shortcuts that already have custom keys assigned.
 			// In particular with default note keys, this can create awkward keymaps when loading
 			// e.g. an IT-style keymap and it contains two keys mapped to the same notes.
-			if(GetKeyListSize(kb.cmd) != 0)
+			if(kb.cmd != lastAdded && GetKeyListSize(kb.cmd) != 0)
 				continue;
 		}
 
@@ -2394,13 +2396,14 @@
 
 		m_commands[kb.cmd].kcList.push_back(kc);
 		EnforceAll(kc, kb.cmd, true);
+		lastAdded = kb.cmd;
 	}
 }
 
 
 CommandID CCommandSet::FindCmd(uint32 uid) const
 {
-	for(int i = 0; i < kcNumCommands; i++)
+	for(int i = kcFirst; i < kcNumCommands; i++)
 	{
 		if(m_commands[i].ID() == uid)
 			return static_cast<CommandID>(i);

Modified: trunk/OpenMPT/mptrack/CommandSet.h
==============================================================================
--- trunk/OpenMPT/mptrack/CommandSet.h	Tue Sep 17 23:58:22 2024	(r21596)
+++ trunk/OpenMPT/mptrack/CommandSet.h	Tue Sep 17 23:58:54 2024	(r21597)
@@ -67,7 +67,7 @@
 {
 	kcCommandSetNumNotes = 59,  // kcVPEndNotes - kcVPStartNotes
 
-	kcNull = -1,
+	kcNull = 0,  // Must be same as unhandled SendMessage result
 	kcFirst,
 
 	//Global

Modified: trunk/OpenMPT/mptrack/KeyConfigDlg.cpp
==============================================================================
--- trunk/OpenMPT/mptrack/KeyConfigDlg.cpp	Tue Sep 17 23:58:22 2024	(r21596)
+++ trunk/OpenMPT/mptrack/KeyConfigDlg.cpp	Tue Sep 17 23:58:54 2024	(r21597)
@@ -662,7 +662,7 @@
 
 		m_cmbKeyChoice.ResetContent();
 		int numChoices = m_localCmdSet->GetKeyListSize(cmd);
-		if((cmd < kcNumCommands) && (numChoices > 0))
+		if(cmd >= kcFirst && cmd < kcNumCommands && numChoices > 0)
 		{
 			for(int i = 0; i < numChoices; i++)
 			{

[OMPT-svn-commit] OpenMPT r21596 - trunk/OpenMPT/mptrack

From: <sv...@op...> - 2024-09-17 21:58:35

Author: sagamusix
Date: Tue Sep 17 23:58:22 2024
New Revision: 21596
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21596

Log:
[Fix] Song Cleanup: Allow plugins only referenced by to-be-removed channels to be removed as well.

Modified:
   trunk/OpenMPT/mptrack/CleanupSong.cpp

Modified: trunk/OpenMPT/mptrack/CleanupSong.cpp
==============================================================================
--- trunk/OpenMPT/mptrack/CleanupSong.cpp	Sun Sep 15 09:32:14 2024	(r21595)
+++ trunk/OpenMPT/mptrack/CleanupSong.cpp	Tue Sep 17 23:58:22 2024	(r21596)
@@ -168,16 +168,16 @@
 		if(m_CheckBoxes[kRearrangeSamples]) modified |= RearrangeSamples();
 	}
 
-	// Plugins
-	if(m_CheckBoxes[kRemoveAllPlugins]) modified |= RemoveAllPlugins();
-	if(m_CheckBoxes[kCleanupPlugins]) modified |= RemoveUnusedPlugins();
-
 	// Create samplepack
 	if(m_CheckBoxes[kResetVariables]) modified |= ResetVariables();
 
 	// Remove unused channels
 	if(m_CheckBoxes[kCleanupChannels]) modified |= RemoveUnusedChannels();
 
+	// Plugins (done last because they can be referenced by both instruments and channels)
+	if(m_CheckBoxes[kRemoveAllPlugins]) modified |= RemoveAllPlugins();
+	if(m_CheckBoxes[kCleanupPlugins]) modified |= RemoveUnusedPlugins();
+
 	if(modified) modDoc.SetModified();
 	modDoc.UpdateAllViews(nullptr, UpdateHint().ModType());
 	logcapturer.ShowLog(true);

[OMPT-svn-commit] OpenMPT r21595 - in branches/OpenMPT-1.31: . .github/workflows

From: <sv...@op...> - 2024-09-15 07:32:26

Author: manx
Date: Sun Sep 15 09:32:14 2024
New Revision: 21595
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21595

Log:
Merged revision(s) 21594 from trunk/OpenMPT:
[Fix] build: CI: GitHub: macOS: XCode 16.0 is called 16_Release_Candidate now. Whatever.
........

Modified:
   branches/OpenMPT-1.31/   (props changed)
   branches/OpenMPT-1.31/.github/workflows/macOS-Autotools.yml
   branches/OpenMPT-1.31/.github/workflows/macOS-Makefile.yml

Modified: branches/OpenMPT-1.31/.github/workflows/macOS-Autotools.yml
==============================================================================
--- branches/OpenMPT-1.31/.github/workflows/macOS-Autotools.yml	Sun Sep 15 09:31:50 2024	(r21594)
+++ branches/OpenMPT-1.31/.github/workflows/macOS-Autotools.yml	Sun Sep 15 09:32:14 2024	(r21595)
@@ -11,6 +11,7 @@
       matrix:
         include:
           - { host: macos-14, compiler: '16.1' }
+          - { host: macos-14, compiler: '16_Release_Candidate' }
           - { host: macos-14, compiler: '15.4' }
           - { host: macos-14, compiler: '15.3' }
           - { host: macos-13, compiler: '15.2' }

Modified: branches/OpenMPT-1.31/.github/workflows/macOS-Makefile.yml
==============================================================================
--- branches/OpenMPT-1.31/.github/workflows/macOS-Makefile.yml	Sun Sep 15 09:31:50 2024	(r21594)
+++ branches/OpenMPT-1.31/.github/workflows/macOS-Makefile.yml	Sun Sep 15 09:32:14 2024	(r21595)
@@ -27,6 +27,22 @@
           - { host: macos-14, compiler: '16.1', arch: x86_64, target: '10.15', deps: local, check: true , ancient: false }
           - { host: macos-14, compiler: '16.1', arch: x86_64, target: '10.14', deps: local, check: true , ancient: false }
           - { host: macos-14, compiler: '16.1', arch: x86_64, target: '10.13', deps: local, check: true , ancient: false }
+          - { host: macos-14, compiler: '16_Release_Candidate', arch: ''    , target: ''     , deps: sys  , check: true , ancient: false }
+          - { host: macos-14, compiler: '16_Release_Candidate', arch: arm64 , target: ''     , deps: local, check: true , ancient: false }
+          - { host: macos-14, compiler: '16_Release_Candidate', arch: x86_64, target: ''     , deps: local, check: true , ancient: false }
+          - { host: macos-14, compiler: '16_Release_Candidate', arch: arm64 , target: ''     , deps: small, check: true , ancient: false }
+          - { host: macos-14, compiler: '16_Release_Candidate', arch: x86_64, target: ''     , deps: small, check: true , ancient: false }
+          - { host: macos-14, compiler: '16_Release_Candidate', arch: arm64 , target: '14'   , deps: local, check: true , ancient: false }
+          - { host: macos-14, compiler: '16_Release_Candidate', arch: x86_64, target: '14'   , deps: local, check: true , ancient: false }
+          - { host: macos-14, compiler: '16_Release_Candidate', arch: arm64 , target: '13'   , deps: local, check: true , ancient: false }
+          - { host: macos-14, compiler: '16_Release_Candidate', arch: x86_64, target: '13'   , deps: local, check: true , ancient: false }
+          - { host: macos-14, compiler: '16_Release_Candidate', arch: arm64 , target: '12'   , deps: local, check: true , ancient: false }
+          - { host: macos-14, compiler: '16_Release_Candidate', arch: x86_64, target: '12'   , deps: local, check: true , ancient: false }
+          - { host: macos-14, compiler: '16_Release_Candidate', arch: arm64 , target: '11'   , deps: local, check: true , ancient: false }
+          - { host: macos-14, compiler: '16_Release_Candidate', arch: x86_64, target: '11'   , deps: local, check: true , ancient: false }
+          - { host: macos-14, compiler: '16_Release_Candidate', arch: x86_64, target: '10.15', deps: local, check: true , ancient: false }
+          - { host: macos-14, compiler: '16_Release_Candidate', arch: x86_64, target: '10.14', deps: local, check: true , ancient: false }
+          - { host: macos-14, compiler: '16_Release_Candidate', arch: x86_64, target: '10.13', deps: local, check: true , ancient: false }
           - { host: macos-14, compiler: '15.4', arch: ''    , target: ''     , deps: sys  , check: true , ancient: false }
           - { host: macos-14, compiler: '15.4', arch: arm64 , target: ''     , deps: local, check: true , ancient: false }
           - { host: macos-14, compiler: '15.4', arch: x86_64, target: ''     , deps: local, check: true , ancient: false }

[OMPT-svn-commit] OpenMPT r21594 - trunk/OpenMPT/.github/workflows

From: <sv...@op...> - 2024-09-15 07:31:58

Author: manx
Date: Sun Sep 15 09:31:50 2024
New Revision: 21594
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21594

Log:
[Fix] build: CI: GitHub: macOS: XCode 16.0 is called 16_Release_Candidate now. Whatever.

Modified:
   trunk/OpenMPT/.github/workflows/macOS-Autotools.yml
   trunk/OpenMPT/.github/workflows/macOS-Makefile.yml

Modified: trunk/OpenMPT/.github/workflows/macOS-Autotools.yml
==============================================================================
--- trunk/OpenMPT/.github/workflows/macOS-Autotools.yml	Sat Sep 14 07:48:37 2024	(r21593)
+++ trunk/OpenMPT/.github/workflows/macOS-Autotools.yml	Sun Sep 15 09:31:50 2024	(r21594)
@@ -13,6 +13,7 @@
       matrix:
         include:
           - { host: macos-14, compiler: '16.1' }
+          - { host: macos-14, compiler: '16_Release_Candidate' }
           - { host: macos-14, compiler: '15.4' }
           - { host: macos-14, compiler: '15.3' }
           - { host: macos-13, compiler: '15.2' }

Modified: trunk/OpenMPT/.github/workflows/macOS-Makefile.yml
==============================================================================
--- trunk/OpenMPT/.github/workflows/macOS-Makefile.yml	Sat Sep 14 07:48:37 2024	(r21593)
+++ trunk/OpenMPT/.github/workflows/macOS-Makefile.yml	Sun Sep 15 09:31:50 2024	(r21594)
@@ -29,6 +29,22 @@
           - { host: macos-14, compiler: '16.1', arch: x86_64, target: '10.15', deps: local, check: true , ancient: false }
           - { host: macos-14, compiler: '16.1', arch: x86_64, target: '10.14', deps: local, check: true , ancient: false }
           - { host: macos-14, compiler: '16.1', arch: x86_64, target: '10.13', deps: local, check: true , ancient: false }
+          - { host: macos-14, compiler: '16_Release_Candidate', arch: ''    , target: ''     , deps: sys  , check: true , ancient: false }
+          - { host: macos-14, compiler: '16_Release_Candidate', arch: arm64 , target: ''     , deps: local, check: true , ancient: false }
+          - { host: macos-14, compiler: '16_Release_Candidate', arch: x86_64, target: ''     , deps: local, check: true , ancient: false }
+          - { host: macos-14, compiler: '16_Release_Candidate', arch: arm64 , target: ''     , deps: small, check: true , ancient: false }
+          - { host: macos-14, compiler: '16_Release_Candidate', arch: x86_64, target: ''     , deps: small, check: true , ancient: false }
+          - { host: macos-14, compiler: '16_Release_Candidate', arch: arm64 , target: '14'   , deps: local, check: true , ancient: false }
+          - { host: macos-14, compiler: '16_Release_Candidate', arch: x86_64, target: '14'   , deps: local, check: true , ancient: false }
+          - { host: macos-14, compiler: '16_Release_Candidate', arch: arm64 , target: '13'   , deps: local, check: true , ancient: false }
+          - { host: macos-14, compiler: '16_Release_Candidate', arch: x86_64, target: '13'   , deps: local, check: true , ancient: false }
+          - { host: macos-14, compiler: '16_Release_Candidate', arch: arm64 , target: '12'   , deps: local, check: true , ancient: false }
+          - { host: macos-14, compiler: '16_Release_Candidate', arch: x86_64, target: '12'   , deps: local, check: true , ancient: false }
+          - { host: macos-14, compiler: '16_Release_Candidate', arch: arm64 , target: '11'   , deps: local, check: true , ancient: false }
+          - { host: macos-14, compiler: '16_Release_Candidate', arch: x86_64, target: '11'   , deps: local, check: true , ancient: false }
+          - { host: macos-14, compiler: '16_Release_Candidate', arch: x86_64, target: '10.15', deps: local, check: true , ancient: false }
+          - { host: macos-14, compiler: '16_Release_Candidate', arch: x86_64, target: '10.14', deps: local, check: true , ancient: false }
+          - { host: macos-14, compiler: '16_Release_Candidate', arch: x86_64, target: '10.13', deps: local, check: true , ancient: false }
           - { host: macos-14, compiler: '15.4', arch: ''    , target: ''     , deps: sys  , check: true , ancient: false }
           - { host: macos-14, compiler: '15.4', arch: arm64 , target: ''     , deps: local, check: true , ancient: false }
           - { host: macos-14, compiler: '15.4', arch: x86_64, target: ''     , deps: local, check: true , ancient: false }

[OMPT-svn-commit] OpenMPT r21593 - trunk/OpenMPT/src/openmpt/streamencoder

From: <sv...@op...> - 2024-09-14 05:48:50

Author: manx
Date: Sat Sep 14 07:48:37 2024
New Revision: 21593
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21593

Log:
[Var] Apply auto-props.

Modified:
   trunk/OpenMPT/src/openmpt/streamencoder/StreamEncoder.hpp   (props changed)
   trunk/OpenMPT/src/openmpt/streamencoder/StreamEncoderAU.hpp   (props changed)
   trunk/OpenMPT/src/openmpt/streamencoder/StreamEncoderFLAC.hpp   (props changed)
   trunk/OpenMPT/src/openmpt/streamencoder/StreamEncoderMP3.hpp   (props changed)
   trunk/OpenMPT/src/openmpt/streamencoder/StreamEncoderOpus.hpp   (props changed)
   trunk/OpenMPT/src/openmpt/streamencoder/StreamEncoderRAW.hpp   (props changed)
   trunk/OpenMPT/src/openmpt/streamencoder/StreamEncoderVorbis.hpp   (props changed)
   trunk/OpenMPT/src/openmpt/streamencoder/StreamEncoderWAV.hpp   (props changed)

[OMPT-svn-commit] OpenMPT r21592 - trunk/OpenMPT

From: <sv...@op...> - 2024-09-14 05:48:34

Author: manx
Date: Sat Sep 14 07:48:23 2024
New Revision: 21592
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21592

Log:
[Var] Update gitignore.

Modified:
   trunk/OpenMPT/.gitignore

Modified: trunk/OpenMPT/.gitignore
==============================================================================
--- trunk/OpenMPT/.gitignore	Fri Sep 13 17:14:52 2024	(r21591)
+++ trunk/OpenMPT/.gitignore	Sat Sep 14 07:48:23 2024	(r21592)
@@ -44,17 +44,8 @@
 /build/vs2017winxp/Release
 /build/vs2017winxpansi/*.user
 /build/vs2017winxpansi/.vs
-/build/vs2019win10/*.user
-/build/vs2019win10/.vs
-/build/vs2019win10uwp/.vs
-/build/vs2019win10uwp/Generated Files
-/build/vs2019win10uwp/ext/Generated Files
 /build/vs2019win7/*.user
 /build/vs2019win7/.vs
-/build/vs2019win8/*.user
-/build/vs2019win8/.vs
-/build/vs2019win81/*.user
-/build/vs2019win81/.vs
 /build/vs2022win10/*.user
 /build/vs2022win10/.vs
 /build/vs2022win10/ext/*.user

[OMPT-svn-commit] OpenMPT r21591 - in trunk/OpenMPT: . build build/vs2019win10 build/vs2019win10uwp build/vs2019win8 build/vs2019win81

From: <sv...@op...> - 2024-09-13 15:15:05

Author: manx
Date: Fri Sep 13 17:14:52 2024
New Revision: 21591
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21591

Log:
[Reg] build: Remove all VS2019 project files for all targets except for Windows 7.

Deleted:
   trunk/OpenMPT/build/vs2019win10/
   trunk/OpenMPT/build/vs2019win10uwp/
   trunk/OpenMPT/build/vs2019win8/
   trunk/OpenMPT/build/vs2019win81/
Modified:
   trunk/OpenMPT/Makefile
   trunk/OpenMPT/build/regenerate_vs_projects.cmd
   trunk/OpenMPT/build/regenerate_vs_projects.sh

Modified: trunk/OpenMPT/Makefile
==============================================================================
--- trunk/OpenMPT/Makefile	Fri Sep 13 17:13:38 2024	(r21590)
+++ trunk/OpenMPT/Makefile	Fri Sep 13 17:14:52 2024	(r21591)
@@ -1897,10 +1897,6 @@
 	svn export ./build/vs2017winxpansi        bin/$(FLAVOUR_DIR)dist-zip/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/build/vs2017winxpansi        --native-eol CRLF
 	svn export ./build/vs2017winxp            bin/$(FLAVOUR_DIR)dist-zip/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/build/vs2017winxp            --native-eol CRLF
 	svn export ./build/vs2019win7             bin/$(FLAVOUR_DIR)dist-zip/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/build/vs2019win7             --native-eol CRLF
-	svn export ./build/vs2019win8             bin/$(FLAVOUR_DIR)dist-zip/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/build/vs2019win8             --native-eol CRLF
-	svn export ./build/vs2019win81            bin/$(FLAVOUR_DIR)dist-zip/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/build/vs2019win81            --native-eol CRLF
-	svn export ./build/vs2019win10            bin/$(FLAVOUR_DIR)dist-zip/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/build/vs2019win10            --native-eol CRLF
-	svn export ./build/vs2019win10uwp         bin/$(FLAVOUR_DIR)dist-zip/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/build/vs2019win10uwp         --native-eol CRLF
 	svn export ./build/vs2022win7             bin/$(FLAVOUR_DIR)dist-zip/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/build/vs2022win7             --native-eol CRLF
 	svn export ./build/vs2022win8             bin/$(FLAVOUR_DIR)dist-zip/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/build/vs2022win8             --native-eol CRLF
 	svn export ./build/vs2022win81            bin/$(FLAVOUR_DIR)dist-zip/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/build/vs2022win81            --native-eol CRLF

Modified: trunk/OpenMPT/build/regenerate_vs_projects.cmd
==============================================================================
--- trunk/OpenMPT/build/regenerate_vs_projects.cmd	Fri Sep 13 17:13:38 2024	(r21590)
+++ trunk/OpenMPT/build/regenerate_vs_projects.cmd	Fri Sep 13 17:14:52 2024	(r21591)
@@ -53,39 +53,6 @@
 echo Done ^) ^|^| pause
 
 start cmd /c ^( ^
-%PREMAKE% --file=build/premake/premake.lua --group=libopenmpt_test  vs2019 --windows-version=win8 ^&^& ^
-%PREMAKE% --file=build/premake/premake.lua --group=in_openmpt       vs2019 --windows-version=win8 ^&^& ^
-%PREMAKE% --file=build/premake/premake.lua --group=xmp-openmpt      vs2019 --windows-version=win8 ^&^& ^
-%PREMAKE% --file=build/premake/premake.lua --group=libopenmpt-small vs2019 --windows-version=win8 ^&^& ^
-%PREMAKE% --file=build/premake/premake.lua --group=libopenmpt       vs2019 --windows-version=win8 ^&^& ^
-%PREMAKE% --file=build/premake/premake.lua --group=openmpt123       vs2019 --windows-version=win8 ^&^& ^
-%PREMAKE% --file=build/premake/premake.lua --group=PluginBridge     vs2019 --windows-version=win8 ^&^& ^
-%PREMAKE% --file=build/premake/premake.lua --group=OpenMPT          vs2019 --windows-version=win8 ^&^& ^
-echo Done ^) ^|^| pause
-
-start cmd /c ^( ^
-%PREMAKE% --file=build/premake/premake.lua --group=libopenmpt_test  vs2019 --windows-version=win81 ^&^& ^
-%PREMAKE% --file=build/premake/premake.lua --group=in_openmpt       vs2019 --windows-version=win81 ^&^& ^
-%PREMAKE% --file=build/premake/premake.lua --group=xmp-openmpt      vs2019 --windows-version=win81 ^&^& ^
-%PREMAKE% --file=build/premake/premake.lua --group=libopenmpt-small vs2019 --windows-version=win81 ^&^& ^
-%PREMAKE% --file=build/premake/premake.lua --group=libopenmpt       vs2019 --windows-version=win81 ^&^& ^
-%PREMAKE% --file=build/premake/premake.lua --group=openmpt123       vs2019 --windows-version=win81 ^&^& ^
-%PREMAKE% --file=build/premake/premake.lua --group=PluginBridge     vs2019 --windows-version=win81 ^&^& ^
-%PREMAKE% --file=build/premake/premake.lua --group=OpenMPT          vs2019 --windows-version=win81 ^&^& ^
-echo Done ^) ^|^| pause
-
-start cmd /c ^( ^
-%PREMAKE% --file=build/premake/premake.lua --group=libopenmpt_test  vs2019 --windows-version=win10 ^&^& ^
-%PREMAKE% --file=build/premake/premake.lua --group=in_openmpt       vs2019 --windows-version=win10 ^&^& ^
-%PREMAKE% --file=build/premake/premake.lua --group=xmp-openmpt      vs2019 --windows-version=win10 ^&^& ^
-%PREMAKE% --file=build/premake/premake.lua --group=libopenmpt-small vs2019 --windows-version=win10 ^&^& ^
-%PREMAKE% --file=build/premake/premake.lua --group=libopenmpt       vs2019 --windows-version=win10 ^&^& ^
-%PREMAKE% --file=build/premake/premake.lua --group=openmpt123       vs2019 --windows-version=win10 ^&^& ^
-%PREMAKE% --file=build/premake/premake.lua --group=PluginBridge     vs2019 --windows-version=win10 ^&^& ^
-%PREMAKE% --file=build/premake/premake.lua --group=OpenMPT          vs2019 --windows-version=win10 ^&^& ^
-echo Done ^) ^|^| pause
-
-start cmd /c ^( ^
 %PREMAKE% --file=build/premake/premake.lua --group=libopenmpt_test  vs2022 --windows-version=win7 ^&^& ^
 %PREMAKE% --file=build/premake/premake.lua --group=in_openmpt       vs2022 --windows-version=win7 ^&^& ^
 %PREMAKE% --file=build/premake/premake.lua --group=xmp-openmpt      vs2022 --windows-version=win7 ^&^& ^
@@ -141,11 +108,6 @@
 echo Done ^) ^|^| pause
 
 start cmd /c ^( ^
-%PREMAKE% --file=build/premake/premake.lua --group=libopenmpt-small vs2019 --windows-version=win10 --windows-family=uwp ^&^& ^
-%PREMAKE% --file=build/premake/premake.lua --group=libopenmpt       vs2019 --windows-version=win10 --windows-family=uwp ^&^& ^
-echo Done ^) ^|^| pause
-
-start cmd /c ^( ^
 %PREMAKE% --file=build/premake/premake.lua --group=libopenmpt-small vs2022 --windows-version=win10 --windows-family=uwp ^&^& ^
 %PREMAKE% --file=build/premake/premake.lua --group=libopenmpt       vs2022 --windows-version=win10 --windows-family=uwp ^&^& ^
 echo Done ^) ^|^| pause

Modified: trunk/OpenMPT/build/regenerate_vs_projects.sh
==============================================================================
--- trunk/OpenMPT/build/regenerate_vs_projects.sh	Fri Sep 13 17:13:38 2024	(r21590)
+++ trunk/OpenMPT/build/regenerate_vs_projects.sh	Fri Sep 13 17:14:52 2024	(r21591)
@@ -52,36 +52,6 @@
 ${PREMAKE} --file=build/premake/premake.lua --group=OpenMPT          vs2019 --windows-version=win7 && \
 echo ok &
 
-${PREMAKE} --file=build/premake/premake.lua --group=libopenmpt_test  vs2019 --windows-version=win8 && \
-${PREMAKE} --file=build/premake/premake.lua --group=in_openmpt       vs2019 --windows-version=win8 && \
-${PREMAKE} --file=build/premake/premake.lua --group=xmp-openmpt      vs2019 --windows-version=win8 && \
-${PREMAKE} --file=build/premake/premake.lua --group=libopenmpt-small vs2019 --windows-version=win8 && \
-${PREMAKE} --file=build/premake/premake.lua --group=libopenmpt       vs2019 --windows-version=win8 && \
-${PREMAKE} --file=build/premake/premake.lua --group=openmpt123       vs2019 --windows-version=win8 && \
-${PREMAKE} --file=build/premake/premake.lua --group=PluginBridge     vs2019 --windows-version=win8 && \
-${PREMAKE} --file=build/premake/premake.lua --group=OpenMPT          vs2019 --windows-version=win8 && \
-echo ok &
-
-${PREMAKE} --file=build/premake/premake.lua --group=libopenmpt_test  vs2019 --windows-version=win81 && \
-${PREMAKE} --file=build/premake/premake.lua --group=in_openmpt       vs2019 --windows-version=win81 && \
-${PREMAKE} --file=build/premake/premake.lua --group=xmp-openmpt      vs2019 --windows-version=win81 && \
-${PREMAKE} --file=build/premake/premake.lua --group=libopenmpt-small vs2019 --windows-version=win81 && \
-${PREMAKE} --file=build/premake/premake.lua --group=libopenmpt       vs2019 --windows-version=win81 && \
-${PREMAKE} --file=build/premake/premake.lua --group=openmpt123       vs2019 --windows-version=win81 && \
-${PREMAKE} --file=build/premake/premake.lua --group=PluginBridge     vs2019 --windows-version=win81 && \
-${PREMAKE} --file=build/premake/premake.lua --group=OpenMPT          vs2019 --windows-version=win81 && \
-echo ok &
-
-${PREMAKE} --file=build/premake/premake.lua --group=libopenmpt_test  vs2019 --windows-version=win10 && \
-${PREMAKE} --file=build/premake/premake.lua --group=in_openmpt       vs2019 --windows-version=win10 && \
-${PREMAKE} --file=build/premake/premake.lua --group=xmp-openmpt      vs2019 --windows-version=win10 && \
-${PREMAKE} --file=build/premake/premake.lua --group=libopenmpt-small vs2019 --windows-version=win10 && \
-${PREMAKE} --file=build/premake/premake.lua --group=libopenmpt       vs2019 --windows-version=win10 && \
-${PREMAKE} --file=build/premake/premake.lua --group=openmpt123       vs2019 --windows-version=win10 && \
-${PREMAKE} --file=build/premake/premake.lua --group=PluginBridge     vs2019 --windows-version=win10 && \
-${PREMAKE} --file=build/premake/premake.lua --group=OpenMPT          vs2019 --windows-version=win10 && \
-echo ok &
-
 ${PREMAKE} --file=build/premake/premake.lua --group=libopenmpt_test  vs2022 --windows-version=win7 && \
 ${PREMAKE} --file=build/premake/premake.lua --group=in_openmpt       vs2022 --windows-version=win7 && \
 ${PREMAKE} --file=build/premake/premake.lua --group=xmp-openmpt      vs2022 --windows-version=win7 && \
@@ -132,10 +102,6 @@
 ${PREMAKE} --file=build/premake/premake.lua --group=OpenMPT          vs2022 --clang --windows-version=win10 && \
 echo ok &
 
-${PREMAKE} --file=build/premake/premake.lua --group=libopenmpt-small vs2019 --windows-version=win10 --windows-family=uwp && \
-${PREMAKE} --file=build/premake/premake.lua --group=libopenmpt       vs2019 --windows-version=win10 --windows-family=uwp && \
-echo ok &
-
 ${PREMAKE} --file=build/premake/premake.lua --group=libopenmpt-small vs2022 --windows-version=win10 --windows-family=uwp && \
 ${PREMAKE} --file=build/premake/premake.lua --group=libopenmpt       vs2022 --windows-version=win10 --windows-family=uwp && \
 echo ok &

[OMPT-svn-commit] OpenMPT r21590 - branches/OpenMPT-1.31

From: <sv...@op...> - 2024-09-13 15:13:50

Author: manx
Date: Fri Sep 13 17:13:38 2024
New Revision: 21590
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21590

Log:
Merged revision(s) 21589 from trunk/OpenMPT:
[Fix] build: Makefile: Package MSVC project files for Windwos XP ANSI.
........

Modified:
   branches/OpenMPT-1.31/   (props changed)
   branches/OpenMPT-1.31/Makefile

Modified: branches/OpenMPT-1.31/Makefile
==============================================================================
--- branches/OpenMPT-1.31/Makefile	Fri Sep 13 17:11:09 2024	(r21589)
+++ branches/OpenMPT-1.31/Makefile	Fri Sep 13 17:13:38 2024	(r21590)
@@ -1737,6 +1737,7 @@
 	svn export ./build/scriptlib              bin/$(FLAVOUR_DIR)dist-zip/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/build/scriptlib              --native-eol CRLF
 	svn export ./build/svn_version            bin/$(FLAVOUR_DIR)dist-zip/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/build/svn_version            --native-eol CRLF
 	svn export ./build/vs                     bin/$(FLAVOUR_DIR)dist-zip/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/build/vs                     --native-eol CRLF
+	svn export ./build/vs2017winxpansi        bin/$(FLAVOUR_DIR)dist-zip/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/build/vs2017winxpansi        --native-eol CRLF
 	svn export ./build/vs2017winxp            bin/$(FLAVOUR_DIR)dist-zip/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/build/vs2017winxp            --native-eol CRLF
 	svn export ./build/vs2019win7             bin/$(FLAVOUR_DIR)dist-zip/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/build/vs2019win7             --native-eol CRLF
 	svn export ./build/vs2019win81            bin/$(FLAVOUR_DIR)dist-zip/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/build/vs2019win81            --native-eol CRLF

3 messages has been excluded from this view by a project administrator.

Flat | Threaded

<< < 1 .. 95 96 97 98 99 .. 962 > >> (Page 97 of 962)