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

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

Flat | Threaded

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

[OMPT-svn-commit] OpenMPT r21629 - in branches/OpenMPT-1.31: . soundlib

From: <sv...@op...> - 2024-09-19 14:17:39

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

Log:
[Mod]  Revert merge of r21572. The required fixups to make this work are too much work to backport to this branch.

Modified:
   branches/OpenMPT-1.31/   (props changed)
   branches/OpenMPT-1.31/soundlib/Snd_fx.cpp

Modified: branches/OpenMPT-1.31/soundlib/Snd_fx.cpp
==============================================================================
--- branches/OpenMPT-1.31/soundlib/Snd_fx.cpp	Thu Sep 19 16:10:38 2024	(r21628)
+++ branches/OpenMPT-1.31/soundlib/Snd_fx.cpp	Thu Sep 19 16:17:27 2024	(r21629)
@@ -3216,16 +3216,18 @@
 			if(m_playBehaviour[kMODVBlankTiming])
 			{
 				// ProTracker MODs with VBlank timing: All Fxx parameters set the tick count.
-				if(m_SongFlags[SONG_FIRSTTICK] && param != 0)
-					SetSpeed(m_PlayState, param);
-			} else
+				if(m_SongFlags[SONG_FIRSTTICK] && param != 0) SetSpeed(m_PlayState, param);
+				break;
+			}
 			{
 				param = CalculateXParam(m_PlayState.m_nPattern, m_PlayState.m_nRow, nChn);
-				if (GetType() & (MOD_TYPE_S3M | MOD_TYPE_IT | MOD_TYPE_MPT))
+				if (GetType() & (MOD_TYPE_S3M|MOD_TYPE_IT|MOD_TYPE_MPT))
 				{
 					if (param) chn.nOldTempo = static_cast<ModCommand::PARAM>(param); else param = chn.nOldTempo;
 				}
-				SetTempo(TEMPO(param, 0));
+				TEMPO t(param, 0);
+				LimitMax(t, GetModSpecifications().GetTempoMax());
+				SetTempo(t);
 			}
 			break;
 
@@ -5976,24 +5978,17 @@
 
 	// Anything lower than the minimum tempo is considered to be a tempo slide
 	const TEMPO minTempo = GetMinimumTempoParam(GetType());
-	TEMPO maxTempo = specs.GetTempoMax();
-	// MED files may be imported with #xx parameter extension for tempos above 255, but they may be imported as either MOD or XM.
-	// As regular MOD files cannot contain effect #xx, the tempo parameter cannot exceed 255 anyway, so we simply ignore their max tempo in CModSpecifications here.
-	if(!(GetType() & (MOD_TYPE_XM | MOD_TYPE_IT | MOD_TYPE_MPT)))
-		maxTempo = GetModSpecifications(MOD_TYPE_MPT).GetTempoMax();
-	if(m_playBehaviour[kTempoClamp])
-		maxTempo.Set(255);
 
 	if(setFromUI)
 	{
 		// Set tempo from UI - ignore slide commands and such.
-		m_PlayState.m_nMusicTempo = Clamp(param, specs.GetTempoMin(), maxTempo);
+		m_PlayState.m_nMusicTempo = Clamp(param, specs.GetTempoMin(), specs.GetTempoMax());
 	} else if(param >= minTempo && m_SongFlags[SONG_FIRSTTICK] == !m_playBehaviour[kMODTempoOnSecondTick])
 	{
 		// ProTracker sets the tempo after the first tick.
 		// Note: The case of one tick per row is handled in ProcessRow() instead.
 		// Test case: TempoChange.mod
-		m_PlayState.m_nMusicTempo = std::min(param, maxTempo);
+		m_PlayState.m_nMusicTempo = std::min(param, specs.GetTempoMax());
 	} else if(param < minTempo && !m_SongFlags[SONG_FIRSTTICK])
 	{
 		// Tempo Slide
@@ -6003,8 +5998,12 @@
 		else
 			m_PlayState.m_nMusicTempo -= tempDiff;
 
-		TEMPO tempoMin = specs.GetTempoMin();
-		Limit(m_PlayState.m_nMusicTempo, tempoMin, maxTempo);
+		TEMPO tempoMin = specs.GetTempoMin(), tempoMax = specs.GetTempoMax();
+		if(m_playBehaviour[kTempoClamp])	// clamp tempo correctly in compatible mode
+		{
+			tempoMax.Set(255);
+		}
+		Limit(m_PlayState.m_nMusicTempo, tempoMin, tempoMax);
 	}
 }

[OMPT-svn-commit] OpenMPT r21628 - in branches/OpenMPT-1.31: installer soundlib

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

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

Log:
Merged revision(s) 21574 from trunk/OpenMPT:
[Mod] Add FST to list of recognized file extensions. AMP uses this extension for multichannel MODs. Patch partially by cs127, https://github.com/OpenMPT/openmpt/pull/22
........

Modified:
   branches/OpenMPT-1.31/installer/filetypes-multi-arch-per-arch-retro.iss
   branches/OpenMPT-1.31/installer/filetypes-multi-arch-per-arch.iss
   branches/OpenMPT-1.31/installer/filetypes-multi-arch-retro.iss
   branches/OpenMPT-1.31/installer/filetypes-multi-arch.iss
   branches/OpenMPT-1.31/soundlib/Tables.cpp

Modified: branches/OpenMPT-1.31/installer/filetypes-multi-arch-per-arch-retro.iss
==============================================================================
--- branches/OpenMPT-1.31/installer/filetypes-multi-arch-per-arch-retro.iss	Thu Sep 19 16:01:47 2024	(r21627)
+++ branches/OpenMPT-1.31/installer/filetypes-multi-arch-per-arch-retro.iss	Thu Sep 19 16:10:38 2024	(r21628)
@@ -59,6 +59,7 @@
 Root: HKLM; Subkey: "SOFTWARE\Clients\Media\{#OpenMPTarch}\Capabilities\FileAssociations"; ValueType: string; ValueName: ".dtm"; ValueData: {#OpenMPTFile}; Components: {#Component}
 Root: HKLM; Subkey: "SOFTWARE\Clients\Media\{#OpenMPTarch}\Capabilities\FileAssociations"; ValueType: string; ValueName: ".far"; ValueData: {#OpenMPTFile}; Components: {#Component}
 Root: HKLM; Subkey: "SOFTWARE\Clients\Media\{#OpenMPTarch}\Capabilities\FileAssociations"; ValueType: string; ValueName: ".fmt"; ValueData: {#OpenMPTFile}; Components: {#Component}
+Root: HKLM; Subkey: "SOFTWARE\Clients\Media\{#OpenMPTarch}\Capabilities\FileAssociations"; ValueType: string; ValueName: ".fst"; ValueData: {#OpenMPTFile}; Components: {#Component}
 Root: HKLM; Subkey: "SOFTWARE\Clients\Media\{#OpenMPTarch}\Capabilities\FileAssociations"; ValueType: string; ValueName: ".gdm"; ValueData: {#OpenMPTFile}; Components: {#Component}
 Root: HKLM; Subkey: "SOFTWARE\Clients\Media\{#OpenMPTarch}\Capabilities\FileAssociations"; ValueType: string; ValueName: ".gtk"; ValueData: {#OpenMPTFile}; Components: {#Component}
 Root: HKLM; Subkey: "SOFTWARE\Clients\Media\{#OpenMPTarch}\Capabilities\FileAssociations"; ValueType: string; ValueName: ".gt2"; ValueData: {#OpenMPTFile}; Components: {#Component}

Modified: branches/OpenMPT-1.31/installer/filetypes-multi-arch-per-arch.iss
==============================================================================
--- branches/OpenMPT-1.31/installer/filetypes-multi-arch-per-arch.iss	Thu Sep 19 16:01:47 2024	(r21627)
+++ branches/OpenMPT-1.31/installer/filetypes-multi-arch-per-arch.iss	Thu Sep 19 16:10:38 2024	(r21628)
@@ -59,6 +59,7 @@
 Root: HKA; Subkey: "SOFTWARE\Clients\Media\{#OpenMPTarch}\Capabilities\FileAssociations"; ValueType: string; ValueName: ".dtm"; ValueData: {#OpenMPTFile}; Components: {#Component}
 Root: HKA; Subkey: "SOFTWARE\Clients\Media\{#OpenMPTarch}\Capabilities\FileAssociations"; ValueType: string; ValueName: ".far"; ValueData: {#OpenMPTFile}; Components: {#Component}
 Root: HKA; Subkey: "SOFTWARE\Clients\Media\{#OpenMPTarch}\Capabilities\FileAssociations"; ValueType: string; ValueName: ".fmt"; ValueData: {#OpenMPTFile}; Components: {#Component}
+Root: HKA; Subkey: "SOFTWARE\Clients\Media\{#OpenMPTarch}\Capabilities\FileAssociations"; ValueType: string; ValueName: ".fst"; ValueData: {#OpenMPTFile}; Components: {#Component}
 Root: HKA; Subkey: "SOFTWARE\Clients\Media\{#OpenMPTarch}\Capabilities\FileAssociations"; ValueType: string; ValueName: ".gdm"; ValueData: {#OpenMPTFile}; Components: {#Component}
 Root: HKA; Subkey: "SOFTWARE\Clients\Media\{#OpenMPTarch}\Capabilities\FileAssociations"; ValueType: string; ValueName: ".gtk"; ValueData: {#OpenMPTFile}; Components: {#Component}
 Root: HKA; Subkey: "SOFTWARE\Clients\Media\{#OpenMPTarch}\Capabilities\FileAssociations"; ValueType: string; ValueName: ".gt2"; ValueData: {#OpenMPTFile}; Components: {#Component}

Modified: branches/OpenMPT-1.31/installer/filetypes-multi-arch-retro.iss
==============================================================================
--- branches/OpenMPT-1.31/installer/filetypes-multi-arch-retro.iss	Thu Sep 19 16:01:47 2024	(r21627)
+++ branches/OpenMPT-1.31/installer/filetypes-multi-arch-retro.iss	Thu Sep 19 16:10:38 2024	(r21628)
@@ -34,6 +34,7 @@
 Root: HKLM; Subkey: "SOFTWARE\Classes\Applications\OpenMPT.exe\SupportedTypes"; ValueType: string; ValueName: ".dtm"; ValueData: ""
 Root: HKLM; Subkey: "SOFTWARE\Classes\Applications\OpenMPT.exe\SupportedTypes"; ValueType: string; ValueName: ".far"; ValueData: ""
 Root: HKLM; Subkey: "SOFTWARE\Classes\Applications\OpenMPT.exe\SupportedTypes"; ValueType: string; ValueName: ".fmt"; ValueData: ""
+Root: HKLM; Subkey: "SOFTWARE\Classes\Applications\OpenMPT.exe\SupportedTypes"; ValueType: string; ValueName: ".fst"; ValueData: ""
 Root: HKLM; Subkey: "SOFTWARE\Classes\Applications\OpenMPT.exe\SupportedTypes"; ValueType: string; ValueName: ".gdm"; ValueData: ""
 Root: HKLM; Subkey: "SOFTWARE\Classes\Applications\OpenMPT.exe\SupportedTypes"; ValueType: string; ValueName: ".gtk"; ValueData: ""
 Root: HKLM; Subkey: "SOFTWARE\Classes\Applications\OpenMPT.exe\SupportedTypes"; ValueType: string; ValueName: ".gt2"; ValueData: ""

Modified: branches/OpenMPT-1.31/installer/filetypes-multi-arch.iss
==============================================================================
--- branches/OpenMPT-1.31/installer/filetypes-multi-arch.iss	Thu Sep 19 16:01:47 2024	(r21627)
+++ branches/OpenMPT-1.31/installer/filetypes-multi-arch.iss	Thu Sep 19 16:10:38 2024	(r21628)
@@ -34,6 +34,7 @@
 Root: HKA; Subkey: "SOFTWARE\Classes\Applications\OpenMPT.exe\SupportedTypes"; ValueType: string; ValueName: ".dtm"; ValueData: ""
 Root: HKA; Subkey: "SOFTWARE\Classes\Applications\OpenMPT.exe\SupportedTypes"; ValueType: string; ValueName: ".far"; ValueData: ""
 Root: HKA; Subkey: "SOFTWARE\Classes\Applications\OpenMPT.exe\SupportedTypes"; ValueType: string; ValueName: ".fmt"; ValueData: ""
+Root: HKA; Subkey: "SOFTWARE\Classes\Applications\OpenMPT.exe\SupportedTypes"; ValueType: string; ValueName: ".fst"; ValueData: ""
 Root: HKA; Subkey: "SOFTWARE\Classes\Applications\OpenMPT.exe\SupportedTypes"; ValueType: string; ValueName: ".gdm"; ValueData: ""
 Root: HKA; Subkey: "SOFTWARE\Classes\Applications\OpenMPT.exe\SupportedTypes"; ValueType: string; ValueName: ".gtk"; ValueData: ""
 Root: HKA; Subkey: "SOFTWARE\Classes\Applications\OpenMPT.exe\SupportedTypes"; ValueType: string; ValueName: ".gt2"; ValueData: ""

Modified: branches/OpenMPT-1.31/soundlib/Tables.cpp
==============================================================================
--- branches/OpenMPT-1.31/soundlib/Tables.cpp	Thu Sep 19 16:01:47 2024	(r21627)
+++ branches/OpenMPT-1.31/soundlib/Tables.cpp	Thu Sep 19 16:10:38 2024	(r21628)
@@ -72,6 +72,7 @@
 	{ UL_("Digital Tracker"),                    "dtm" },
 	{ UL_("Farandole Composer"),                 "far" },
 	{ UL_("FM Tracker"),                         "fmt" },
+	{ UL_("ProTracker"),                         "fst" },
 	{ UL_("Imago Orpheus"),                      "imf" },
 	{ UL_("Ice Tracker"),                        "ice" },
 #ifdef MPT_EXTERNAL_SAMPLES

[OMPT-svn-commit] OpenMPT r21627 - in branches/OpenMPT-1.31: . soundlib

From: <sv...@op...> - 2024-09-19 14:01:54

Author: sagamusix
Date: Thu Sep 19 16:01:47 2024
New Revision: 21627
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21627

Log:
Merged revision(s) 21414-21415 from trunk/OpenMPT:
[Fix] Result of CMD_VOLUME was never sent to plugins, because it was processed after ProcessMidiOut was called. In particular this means that MOD to MIDI export didn't export volumes.
........
[Fix] Velocity was halved in previous commit.
........

Modified:
   branches/OpenMPT-1.31/   (props changed)
   branches/OpenMPT-1.31/soundlib/Sndmix.cpp

Modified: branches/OpenMPT-1.31/soundlib/Sndmix.cpp
==============================================================================
--- branches/OpenMPT-1.31/soundlib/Sndmix.cpp	Thu Sep 19 15:59:55 2024	(r21626)
+++ branches/OpenMPT-1.31/soundlib/Sndmix.cpp	Thu Sep 19 16:01:47 2024	(r21627)
@@ -2641,11 +2641,11 @@
 	// Check for volume commands
 	uint8 vol = 0xFF;
 	if(chn.rowCommand.volcmd == VOLCMD_VOLUME)
-		vol = std::min(chn.rowCommand.vol, uint8(64));
+		vol = std::min(chn.rowCommand.vol, uint8(64)) * 2u;
 	else if(chn.rowCommand.command == CMD_VOLUME)
-		vol = std::min(chn.rowCommand.param, uint8(64));
+		vol = std::min(chn.rowCommand.param, uint8(64)) * 2u;
 	else if(chn.rowCommand.command == CMD_VOLUME8)
-		vol = static_cast<uint8>((chn.rowCommand.param + 3u) / 4u);
+		vol = static_cast<uint8>((chn.rowCommand.param + 1u) / 2u);
 
 	const bool hasVolCommand = (vol != 0xFF);
 
@@ -2659,7 +2659,7 @@
 			SendMIDINote(nChn, realNote, static_cast<uint16>(chn.nVolume));
 		} else if(hasVolCommand)
 		{
-			pPlugin->MidiCC(MIDIEvents::MIDICC_Volume_Fine, vol, nChn);
+			pPlugin->MidiCC(MIDIEvents::MIDICC_Volume_Fine, vol / 2u, nChn);
 		}
 		return;
 	}
@@ -2673,7 +2673,7 @@
 		switch(pIns->pluginVelocityHandling)
 		{
 			case PLUGIN_VELOCITYHANDLING_CHANNEL:
-				velocity = chn.nVolume;
+				velocity = hasVolCommand ? vol * 2 : chn.nVolume;
 				break;
 			default:
 				break;
@@ -2701,11 +2701,11 @@
 		switch(pIns->pluginVolumeHandling)
 		{
 			case PLUGIN_VOLUMEHANDLING_DRYWET:
-				if(hasVolCommand) pPlugin->SetDryRatio(1.0f - (2 * vol) / 127.0f);
+				if(hasVolCommand) pPlugin->SetDryRatio(1.0f - vol / 127.0f);
 				else pPlugin->SetDryRatio(1.0f - (2 * defaultVolume) / 127.0f);
 				break;
 			case PLUGIN_VOLUMEHANDLING_MIDI:
-				if(hasVolCommand) pPlugin->MidiCC(MIDIEvents::MIDICC_Volume_Coarse, std::min(uint8(127), static_cast<uint8>(2 * vol)), nChn);
+				if(hasVolCommand) pPlugin->MidiCC(MIDIEvents::MIDICC_Volume_Coarse, std::min(uint8(127), vol), nChn);
 				else pPlugin->MidiCC(MIDIEvents::MIDICC_Volume_Coarse, static_cast<uint8>(std::min(uint32(127), static_cast<uint32>(2 * defaultVolume))), nChn);
 				break;
 			default:

[OMPT-svn-commit] OpenMPT r21626 - in branches/OpenMPT-1.31: . mptrack

From: <sv...@op...> - 2024-09-19 14:00:07

Author: sagamusix
Date: Thu Sep 19 15:59:55 2024
New Revision: 21626
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21626

Log:
Merged revision(s) 21403 from trunk/OpenMPT:
[Imp] Pattern tab: Add channel settings entry to channel context menu.
........

Modified:
   branches/OpenMPT-1.31/   (props changed)
   branches/OpenMPT-1.31/mptrack/View_pat.cpp
   branches/OpenMPT-1.31/mptrack/View_pat.h
   branches/OpenMPT-1.31/mptrack/resource.h

Modified: branches/OpenMPT-1.31/mptrack/View_pat.cpp
==============================================================================
--- branches/OpenMPT-1.31/mptrack/View_pat.cpp	Thu Sep 19 15:45:29 2024	(r21625)
+++ branches/OpenMPT-1.31/mptrack/View_pat.cpp	Thu Sep 19 15:59:55 2024	(r21626)
@@ -79,6 +79,7 @@
 	ON_COMMAND(ID_EDIT_SPLITKEYBOARDSETTINGS,	&CViewPattern::SetSplitKeyboardSettings)
 	ON_COMMAND(ID_EDIT_UNDO,		&CViewPattern::OnEditUndo)
 	ON_COMMAND(ID_EDIT_REDO,		&CViewPattern::OnEditRedo)
+	ON_COMMAND(ID_CHANNEL_SETTINGS,	&CViewPattern::OnChannelSettings)
 	ON_COMMAND(ID_PATTERN_CHNRESET,	&CViewPattern::OnChannelReset)
 	ON_COMMAND(ID_PATTERN_MUTE,		&CViewPattern::OnMuteFromClick)
 	ON_COMMAND(ID_PATTERN_SOLO,		&CViewPattern::OnSoloFromClick)
@@ -2731,6 +2732,16 @@
 }
 
 
+void CViewPattern::OnChannelSettings()
+{
+	CPoint pt = GetPointFromPosition(m_MenuCursor);
+	pt.x += GetChannelWidth() / 2;
+	pt.y = m_szHeader.cy / 2;
+	ClientToScreen(&pt);
+	m_quickChannelProperties.Show(GetDocument(), m_MenuCursor.GetChannel(), pt);
+}
+
+
 void CViewPattern::OnTransposeChannel()
 {
 	CInputDlg dlg(this, _T("Enter transpose amount (affects all patterns):"), -(NOTE_MAX - NOTE_MIN), (NOTE_MAX - NOTE_MIN), m_nTransposeAmount);
@@ -6615,6 +6626,8 @@
 	DWORD canRemoveChannels = (numChannels > specs.channelsMin) ? 0 : MF_GRAYED;
 
 	AppendMenu(hMenu, MF_SEPARATOR, 0, _T(""));
+	AppendMenu(hMenu, MF_STRING, ID_CHANNEL_SETTINGS, ih->GetKeyTextFromCommand(kcChannelSettings, _T("C&hannel Settings")));
+	AppendMenu(hMenu, MF_SEPARATOR, 0, _T(""));
 
 	AppendMenu(hMenu, MF_STRING, ID_PATTERN_TRANSPOSECHANNEL, ih->GetKeyTextFromCommand(kcChannelTranspose, _T("&Transpose Channel")));
 	AppendMenu(hMenu, MF_STRING | canAddChannels, ID_PATTERN_DUPLICATECHANNEL, ih->GetKeyTextFromCommand(kcChannelDuplicate, _T("&Duplicate Channel")));

Modified: branches/OpenMPT-1.31/mptrack/View_pat.h
==============================================================================
--- branches/OpenMPT-1.31/mptrack/View_pat.h	Thu Sep 19 15:45:29 2024	(r21625)
+++ branches/OpenMPT-1.31/mptrack/View_pat.h	Thu Sep 19 15:59:55 2024	(r21626)
@@ -474,6 +474,7 @@
 	afx_msg void OnAddChannelAfter() { AddChannel(m_MenuCursor.GetChannel(), true); };
 	afx_msg void OnDuplicateChannel();
 	afx_msg void OnResetChannelColors();
+	afx_msg void OnChannelSettings();
 	afx_msg void OnTransposeChannel();
 	afx_msg void OnRemoveChannel();
 	afx_msg void OnRemoveChannelDialog();

Modified: branches/OpenMPT-1.31/mptrack/resource.h
==============================================================================
--- branches/OpenMPT-1.31/mptrack/resource.h	Thu Sep 19 15:45:29 2024	(r21625)
+++ branches/OpenMPT-1.31/mptrack/resource.h	Thu Sep 19 15:59:55 2024	(r21626)
@@ -1243,6 +1243,7 @@
 #define ID_FILE_SAVE_COPY               43238
 #define ID_MODTREE_RENAME               43239
 #define ID_UPDATE_AVAILABLE             43240
+#define ID_CHANNEL_SETTINGS             43241
 #define ID_CHANGE_PCNOTE_PARAM          43242
 // From here: Command range [ID_CHANGE_PCNOTE_PARAM, ID_CHANGE_PCNOTE_PARAM + ModCommand::maxColumnValue]
 #define ID_MODTREE_CLOSE                44243

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

From: <sv...@op...> - 2024-09-19 13:45:36

Author: sagamusix
Date: Thu Sep 19 15:45:29 2024
New Revision: 21625
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21625

Log:
[Mod] Add Ctrl+Shift+Z as alternative key binding for Redo.

Modified:
   trunk/OpenMPT/mptrack/CommandSet.cpp

Modified: trunk/OpenMPT/mptrack/CommandSet.cpp
==============================================================================
--- trunk/OpenMPT/mptrack/CommandSet.cpp	Thu Sep 19 15:30:32 2024	(r21624)
+++ trunk/OpenMPT/mptrack/CommandSet.cpp	Thu Sep 19 15:45:29 2024	(r21625)
@@ -68,6 +68,7 @@
 	{kcMidiRecord,                             VK_F9,              ModNone,            kKeyEventDown,                   kCtxAllContexts,         MPT_V("1.31")},
 	{kcEditUndo,                               'Z',                ModCtrl,            kKeyEventDown,                   kCtxAllContexts,         MPT_V("1.31")},
 	{kcEditRedo,                               'Y',                ModCtrl,            kKeyEventDown,                   kCtxAllContexts,         MPT_V("1.31")},
+	{kcEditRedo,                               'Z',                ModShift | ModCtrl, kKeyEventDown,                   kCtxAllContexts,         MPT_V("1.32.00.25")},
 	{kcEditCut,                                'X',                ModCtrl,            kKeyEventDown,                   kCtxAllContexts,         MPT_V("1.31")},
 	{kcEditCopy,                               'C',                ModCtrl,            kKeyEventDown,                   kCtxAllContexts,         MPT_V("1.31")},
 	{kcEditPaste,                              'V',                ModCtrl,            kKeyEventDown,                   kCtxAllContexts,         MPT_V("1.31")},

[OMPT-svn-commit] OpenMPT r21624 - svn:log

From: <sv...@op...> - 2024-09-19 13:33:49

Author: sagamusix
Revision: 21624
Property Name: svn:log
Action: modified

Property diff:
--- old property value
+++ new property value
@@ -1,3 +1,4 @@
 [Mod] Implement custom context menu key handling through regular keyboard handling instead of special-casing it everywhere.
 [Mod] In addition to the Application key, custom context menu key handling now adds Shift+F10 as a default shortcut, which is what Windows uses by default as a substitute for keyboards without an Application key (https://bugs.openmpt.org/view.php?id=1815).
+[Mod] Invert logic when to skip new default keyboard shortcuts: If the conflicting existing shortcut is in a more specific context, the new shortcut is added because it will be ignored anyway.
 [Mod] OpenMPT: Version is now 1.32.00.25
\ No newline at end of file

[OMPT-svn-commit] OpenMPT r21624 - in trunk/OpenMPT: common mptrack

From: <sv...@op...> - 2024-09-19 13:30:39

Author: sagamusix
Date: Thu Sep 19 15:30:32 2024
New Revision: 21624
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21624

Log:
[Mod] Implement custom context menu key handling through regular keyboard handling instead of special-casing it everywhere.
[Mod] In addition to the Application key, custom context menu key handling now adds Shift+F10 as a default shortcut, which is what Windows uses by default as a substitute for keyboards without an Application key (https://bugs.openmpt.org/view.php?id=1815).
[Mod] OpenMPT: Version is now 1.32.00.25

Modified:
   trunk/OpenMPT/common/versionNumber.h
   trunk/OpenMPT/mptrack/CommandSet.cpp
   trunk/OpenMPT/mptrack/CommandSet.h
   trunk/OpenMPT/mptrack/Ctrl_ins.cpp
   trunk/OpenMPT/mptrack/Ctrl_seq.cpp
   trunk/OpenMPT/mptrack/Ctrl_smp.cpp
   trunk/OpenMPT/mptrack/MainFrm.cpp
   trunk/OpenMPT/mptrack/Mainbar.cpp
   trunk/OpenMPT/mptrack/Mainbar.h
   trunk/OpenMPT/mptrack/Mainfrm.h
   trunk/OpenMPT/mptrack/View_ins.cpp
   trunk/OpenMPT/mptrack/View_pat.cpp
   trunk/OpenMPT/mptrack/View_smp.cpp
   trunk/OpenMPT/mptrack/View_tre.cpp

Modified: trunk/OpenMPT/common/versionNumber.h
==============================================================================
--- trunk/OpenMPT/common/versionNumber.h	Thu Sep 19 15:05:51 2024	(r21623)
+++ trunk/OpenMPT/common/versionNumber.h	Thu Sep 19 15:30:32 2024	(r21624)
@@ -16,4 +16,4 @@
 #define VER_MAJORMAJOR  1
 #define VER_MAJOR      32
 #define VER_MINOR      00
-#define VER_MINORMINOR 24
+#define VER_MINORMINOR 25

Modified: trunk/OpenMPT/mptrack/CommandSet.cpp
==============================================================================
--- trunk/OpenMPT/mptrack/CommandSet.cpp	Thu Sep 19 15:05:51 2024	(r21623)
+++ trunk/OpenMPT/mptrack/CommandSet.cpp	Thu Sep 19 15:30:32 2024	(r21624)
@@ -89,6 +89,8 @@
 	{kcViewMIDImapping,                        VK_F3,              ModCtrl,            kKeyEventDown,                   kCtxAllContexts,         MPT_V("1.31")},
 	{kcSwitchToInstrLibrary,                   'I',                ModAlt,             kKeyEventDown | kKeyEventRepeat, kCtxAllContexts,         MPT_V("1.31")},
 	{kcHelp,                                   VK_F1,              ModNone,            kKeyEventDown,                   kCtxAllContexts,         MPT_V("1.31")},
+	{kcContextMenu,                            VK_APPS,            ModNone,            kKeyEventDown,                   kCtxAllContexts,         MPT_V("1.32.00.25")},
+	{kcContextMenu,                            VK_F10,             ModShift,           kKeyEventDown,                   kCtxAllContexts,         MPT_V("1.32.00.25")},
 	{kcPrevInstrument,                         VK_DIVIDE,          ModCtrl,            kKeyEventDown | kKeyEventRepeat, kCtxAllContexts,         MPT_V("1.31")},
 	{kcPrevInstrument,                         VK_UP,              ModCtrl,            kKeyEventDown | kKeyEventRepeat, kCtxAllContexts,         MPT_V("1.31")},
 	{kcNextInstrument,                         VK_MULTIPLY,        ModCtrl,            kKeyEventDown | kKeyEventRepeat, kCtxAllContexts,         MPT_V("1.31")},
@@ -1390,6 +1392,7 @@
 	{2098, kcGotoVolumeColumn, _T("Go to volume effect column")},
 	{2099, kcGotoCommandColumn, _T("Go to effect command column")},
 	{2100, kcGotoParamColumn, _T("Go to effect parameter column")},
+	{2101, kcContextMenu, _T("Open Context Menu")},
 };
 // clang-format on
 
@@ -2387,10 +2390,10 @@
 
 		if(auto conflictCmd = IsConflicting(kc, kb.cmd, false); conflictCmd.first != kcNull)
 		{
-			// Allow cross-context conflicts in case the newly added shortcut is in a more specific context
+			// Allow cross-context conflicts in case the newly added shortcut is in a more generic context
 			// - unless the conflicting shortcut is the reserved dummy shortcut (which was used to prevent
 			// default shortcuts from being added back before default key binding versioning was added).
-			if(conflictCmd.first == kcDummyShortcut || !m_isParentContext[conflictCmd.second.Context()][kb.ctx])
+			if(conflictCmd.first == kcDummyShortcut || !m_isParentContext[kb.ctx][conflictCmd.second.Context()])
 				continue;
 		}
 

Modified: trunk/OpenMPT/mptrack/CommandSet.h
==============================================================================
--- trunk/OpenMPT/mptrack/CommandSet.h	Thu Sep 19 15:05:51 2024	(r21623)
+++ trunk/OpenMPT/mptrack/CommandSet.h	Thu Sep 19 15:30:32 2024	(r21624)
@@ -161,7 +161,8 @@
 	kcEndView = kcHelp,
 
 	kcStartMisc,
-	kcPrevInstrument = kcStartMisc,
+	kcContextMenu = kcStartMisc,
+	kcPrevInstrument,
 	kcNextInstrument,
 	kcPrevOctave,
 	kcNextOctave,

Modified: trunk/OpenMPT/mptrack/Ctrl_ins.cpp
==============================================================================
--- trunk/OpenMPT/mptrack/Ctrl_ins.cpp	Thu Sep 19 15:05:51 2024	(r21623)
+++ trunk/OpenMPT/mptrack/Ctrl_ins.cpp	Thu Sep 19 15:30:32 2024	(r21624)
@@ -71,55 +71,42 @@
 
 BOOL CNoteMapWnd::PreTranslateMessage(MSG *pMsg)
 {
-	if(!pMsg)
-		return TRUE;
-	uint32 wParam = static_cast<uint32>(pMsg->wParam);
-
-	{
-		//We handle keypresses before Windows has a chance to handle them (for alt etc..)
-		if ((pMsg->message == WM_SYSKEYUP)   || (pMsg->message == WM_KEYUP) ||
-			(pMsg->message == WM_SYSKEYDOWN) || (pMsg->message == WM_KEYDOWN))
-		{
-			CInputHandler *ih = CMainFrame::GetInputHandler();
-			const auto event = ih->Translate(*pMsg);
-
-			if (ih->KeyEvent(kCtxInsNoteMap, event) != kcNull)
-				return true; // Mapped to a command, no need to pass message on.
-
-			// a bit of a hack...
-			if (ih->KeyEvent(kCtxCtrlInstruments, event) != kcNull)
-				return true; // Mapped to a command, no need to pass message on.
-		}
+	//We handle keypresses before Windows has a chance to handle them (for alt etc..)
+	if ((pMsg->message == WM_SYSKEYUP)   || (pMsg->message == WM_KEYUP) ||
+		(pMsg->message == WM_SYSKEYDOWN) || (pMsg->message == WM_KEYDOWN))
+	{
+		CInputHandler *ih = CMainFrame::GetInputHandler();
+		const auto event = ih->Translate(*pMsg);
+
+		if (ih->KeyEvent(kCtxInsNoteMap, event, this) != kcNull)
+			return TRUE; // Mapped to a command, no need to pass message on.
+
+		// a bit of a hack...
+		if (ih->KeyEvent(kCtxCtrlInstruments, event, this) != kcNull)
+			return TRUE; // Mapped to a command, no need to pass message on.
+
+		// For context menu shortcut
+		if(ih->KeyEvent(kCtxAllContexts, event, this) != kcNull)
+			return TRUE;  // Mapped to a command, no need to pass message on.
 	}
 
 	//The key was not handled by a command, but it might still be useful
-	if (pMsg->message == WM_CHAR) //key is a character
+	uint32 wParam = static_cast<uint32>(pMsg->wParam);
+	if(pMsg->message == WM_CHAR && CInputHandler::GetKeyEventType(*pMsg) == kKeyEventDown)  // Key is a character
 	{
-		if(CInputHandler::GetKeyEventType(*pMsg) == kKeyEventDown)
-			if(HandleChar(wParam))
-				return true;
-	}
-	else if (pMsg->message == WM_KEYDOWN) //key is not a character
+		if(HandleChar(wParam))
+			return TRUE;
+	} else if(pMsg->message == WM_KEYDOWN)  // Key is not a character
 	{
 		if(HandleNav(wParam))
-			return true;
-
-		// Handle Application (menu) key
-		if(wParam == VK_APPS)
-		{
-			CRect clientRect;
-			GetClientRect(clientRect);
-			clientRect.bottom = clientRect.top + mpt::align_up(clientRect.Height(), m_cyFont);
-			OnRButtonDown(0, clientRect.CenterPoint());
-		}
-	}
-	else if (pMsg->message == WM_KEYUP) //stop notes on key release
+			return TRUE;
+	} else if(pMsg->message == WM_KEYUP)  // Stop notes on key release
 	{
-		if (((pMsg->wParam >= '0') && (pMsg->wParam <= '9')) || (pMsg->wParam == ' ') ||
+		if(((pMsg->wParam >= '0') && (pMsg->wParam <= '9')) || (pMsg->wParam == ' ') ||
 			((pMsg->wParam >= VK_NUMPAD0) && (pMsg->wParam <= VK_NUMPAD9)))
 		{
 			StopNote();
-			return true;
+			return TRUE;
 		}
 	}
 
@@ -272,7 +259,6 @@
 {
 	CStatic::OnSetFocus(pOldWnd);
 	Invalidate(FALSE);
-	CMainFrame::GetMainFrame()->m_pNoteMapHasFocus = this;
 	m_undo = true;
 }
 
@@ -281,7 +267,6 @@
 {
 	CStatic::OnKillFocus(pNewWnd);
 	Invalidate(FALSE);
-	CMainFrame::GetMainFrame()->m_pNoteMapHasFocus = nullptr;
 }
 
 
@@ -615,6 +600,14 @@
 
 	switch(wParam)
 	{
+	case kcContextMenu:
+		{
+			CRect clientRect;
+			GetClientRect(clientRect);
+			clientRect.bottom = clientRect.top + mpt::align_up(clientRect.Height(), m_cyFont);
+			OnRButtonDown(0, clientRect.CenterPoint());
+		}
+		return wParam;
 	case kcInsNoteMapTransposeDown:		MapTranspose(-1); return wParam;
 	case kcInsNoteMapTransposeUp:		MapTranspose(1); return wParam;
 	case kcInsNoteMapTransposeOctDown:	MapTranspose(-12); return wParam;

Modified: trunk/OpenMPT/mptrack/Ctrl_seq.cpp
==============================================================================
--- trunk/OpenMPT/mptrack/Ctrl_seq.cpp	Thu Sep 19 15:05:51 2024	(r21623)
+++ trunk/OpenMPT/mptrack/Ctrl_seq.cpp	Thu Sep 19 15:30:32 2024	(r21624)
@@ -446,26 +446,17 @@
 		CInputHandler *ih = CMainFrame::GetInputHandler();
 		const auto event = ih->Translate(*pMsg);
 
-		if(ih->KeyEvent(kCtxCtrlOrderlist, event) != kcNull)
+		if(ih->KeyEvent(kCtxCtrlOrderlist, event, this) != kcNull)
 			return TRUE;  // Mapped to a command, no need to pass message on.
 
 		//HACK: masquerade as kCtxViewPatternsNote context until we implement appropriate
 		//      command propagation to kCtxCtrlOrderlist context.
 
-		if(ih->KeyEvent(kCtxViewPatternsNote, event) != kcNull)
+		if(ih->KeyEvent(kCtxViewPatternsNote, event, this) != kcNull)
 			return TRUE;  // Mapped to a command, no need to pass message on.
 
-		// Handle Application (menu) key
-		if(pMsg->message == WM_KEYDOWN && event.key == VK_APPS)
-		{
-			const auto selection = GetCurSel();
-			auto pt = (GetRectFromOrder(selection.firstOrd) | GetRectFromOrder(selection.lastOrd)).CenterPoint();
-			CRect clientRect;
-			GetClientRect(clientRect);
-			if(!clientRect.PtInRect(pt))
-				pt = clientRect.CenterPoint();
-			OnRButtonDown(0, pt);
-		}
+		if(ih->KeyEvent(kCtxAllContexts, event, this) != kcNull)
+			return TRUE;  // Mapped to a command, no need to pass message on.
 	}
 
 	return CWnd::PreTranslateMessage(pMsg);
@@ -474,9 +465,21 @@
 
 LRESULT COrderList::OnCustomKeyMsg(WPARAM wParam, LPARAM lParam)
 {
-	bool isPlaying = IsPlaying();
+	const bool isPlaying = IsPlaying();
 	switch(wParam)
 	{
+	case kcContextMenu:
+		{
+			const auto selection = GetCurSel();
+			auto pt = (GetRectFromOrder(selection.firstOrd) | GetRectFromOrder(selection.lastOrd)).CenterPoint();
+			CRect clientRect;
+			GetClientRect(clientRect);
+			if(!clientRect.PtInRect(pt))
+				pt = clientRect.CenterPoint();
+			OnRButtonDown(0, pt);
+		}
+		return wParam;
+
 	case kcEditCopy:
 		OnEditCopy(); return wParam;
 	case kcEditCut:
@@ -888,7 +891,6 @@
 	CWnd::OnSetFocus(pWnd);
 	InvalidateSelection();
 	UpdateInfoText();
-	CMainFrame::GetMainFrame()->m_pOrderlistHasFocus = this;
 }
 
 
@@ -896,7 +898,6 @@
 {
 	CWnd::OnKillFocus(pWnd);
 	InvalidateSelection();
-	CMainFrame::GetMainFrame()->m_pOrderlistHasFocus = nullptr;
 }
 
 

Modified: trunk/OpenMPT/mptrack/Ctrl_smp.cpp
==============================================================================
--- trunk/OpenMPT/mptrack/Ctrl_smp.cpp	Thu Sep 19 15:05:51 2024	(r21623)
+++ trunk/OpenMPT/mptrack/Ctrl_smp.cpp	Thu Sep 19 15:30:32 2024	(r21624)
@@ -1900,11 +1900,8 @@
 		: CProgressDialog{&parent}
 		, m_updateInterval{std::max(uint32(15), TrackerSettings::Instance().GUIUpdateInterval.Get())}
 	{
-		const auto updateFunc = std::bind(&DoPitchShiftTimeStretch::UpdateProgress, this, std::placeholders::_1, std::placeholders::_2);
-		const auto prepareUndo = [&parent]()
-		{
-			return parent.PrepareUndo("Pitch Shift / Time Stretch", sundo_replace);
-		};
+		const auto updateFunc = [this](SmpLength current, SmpLength maximum) { return UpdateProgress(current, maximum); };
+		const auto prepareUndo = [&parent]() { return parent.PrepareUndo("Pitch Shift / Time Stretch", sundo_replace); };
 
 		CSoundFile &sndFile = modDoc.GetSoundFile();
 		if(loFi)

Modified: trunk/OpenMPT/mptrack/MainFrm.cpp
==============================================================================
--- trunk/OpenMPT/mptrack/MainFrm.cpp	Thu Sep 19 15:05:51 2024	(r21623)
+++ trunk/OpenMPT/mptrack/MainFrm.cpp	Thu Sep 19 15:30:32 2024	(r21624)
@@ -2520,7 +2520,6 @@
 		case kcPrevDocument:	MDIPrev(); break;
 		case kcFileCloseAll:	theApp.OnFileCloseAll(); break;
 
-
 		//D'oh!! moddoc isn't a CWnd so we have to handle its messages and pass them on.
 
 		case kcFileSaveAs:
@@ -2581,17 +2580,8 @@
 				m_wndTree.SetFocus();
 			break;
 
-		//if handled neither by MainFrame nor by ModDoc...
 		default:
-			//If the treeview has focus, post command to the tree view
-			if (m_bModTreeHasFocus)
-				return m_wndTree.SendMessageToModTree(WM_MOD_KEYCOMMAND, wParam, lParam);
-			if (m_pNoteMapHasFocus)
-				return m_pNoteMapHasFocus->SendMessage(WM_MOD_KEYCOMMAND, wParam, lParam);
-			if (m_pOrderlistHasFocus)
-				return m_pOrderlistHasFocus->SendMessage(WM_MOD_KEYCOMMAND, wParam, lParam);
-
-			//Else send it to the active view
+			// If handled neither by MainFrame nor by ModDoc, send it to the active view
 			CMDIChildWnd *pMDIActive = MDIGetActive();
 			CWnd *wnd = nullptr;
 			if(pMDIActive)

Modified: trunk/OpenMPT/mptrack/Mainbar.cpp
==============================================================================
--- trunk/OpenMPT/mptrack/Mainbar.cpp	Thu Sep 19 15:05:51 2024	(r21623)
+++ trunk/OpenMPT/mptrack/Mainbar.cpp	Thu Sep 19 15:30:32 2024	(r21624)
@@ -1291,22 +1291,6 @@
 }
 
 
-HWND CModTreeBar::GetModTreeHWND()
-{
-	return m_pModTree->m_hWnd;
-}
-
-
-LRESULT CModTreeBar::SendMessageToModTree(UINT cmdID, WPARAM wParam, LPARAM lParam)
-{
-	if(::GetFocus() == m_pModTree->m_hWnd)
-		return m_pModTree->SendMessage(cmdID, wParam, lParam);
-	if(::GetFocus() == m_pModTreeData->m_hWnd)
-		return m_pModTreeData->SendMessage(cmdID, wParam, lParam);
-	return 0;
-}
-
-
 bool CModTreeBar::SetTreeSoundfile(FileReader &file)
 {
 	return m_pModTree->SetSoundFile(file);

Modified: trunk/OpenMPT/mptrack/Mainbar.h
==============================================================================
--- trunk/OpenMPT/mptrack/Mainbar.h	Thu Sep 19 15:05:51 2024	(r21623)
+++ trunk/OpenMPT/mptrack/Mainbar.h	Thu Sep 19 15:30:32 2024	(r21624)
@@ -173,8 +173,6 @@
 	void OnDocumentClosed(CModDoc *pModDoc);
 	void OnUpdate(CModDoc *pModDoc, UpdateHint hint, CObject *pHint = nullptr);
 	void UpdatePlayPos(CModDoc *pModDoc, Notification *pNotify);
-	HWND GetModTreeHWND(); //rewbs.customKeys
-	LRESULT SendMessageToModTree(UINT cmdID, WPARAM wParam, LPARAM lParam);
 	bool SetTreeSoundfile(FileReader &file);
 
 	void StartTreeFilter(CModTree &source);

Modified: trunk/OpenMPT/mptrack/Mainfrm.h
==============================================================================
--- trunk/OpenMPT/mptrack/Mainfrm.h	Thu Sep 19 15:05:51 2024	(r21623)
+++ trunk/OpenMPT/mptrack/Mainfrm.h	Thu Sep 19 15:30:32 2024	(r21624)
@@ -208,8 +208,6 @@
 	CAutoSaver m_AutoSaver;
 
 public:
-	CWnd *m_pNoteMapHasFocus = nullptr;
-	CWnd *m_pOrderlistHasFocus = nullptr;
 	bool m_bModTreeHasFocus = false;
 
 public:

Modified: trunk/OpenMPT/mptrack/View_ins.cpp
==============================================================================
--- trunk/OpenMPT/mptrack/View_ins.cpp	Thu Sep 19 15:05:51 2024	(r21623)
+++ trunk/OpenMPT/mptrack/View_ins.cpp	Thu Sep 19 15:30:32 2024	(r21624)
@@ -2260,18 +2260,6 @@
 			const auto event = ih->Translate(*pMsg);
 			if(ih->KeyEvent(kCtxViewInstruments, event) != kcNull)
 				return TRUE;  // Mapped to a command, no need to pass message on.
-
-			// Handle Application (menu) key
-			if(pMsg->message == WM_KEYDOWN && event.key == VK_APPS)
-			{
-				CPoint pt(0, 0);
-				if(m_nDragItem > 0)
-				{
-					uint32 point = DragItemToEnvPoint();
-					pt.SetPoint(PointToScreen(point), ValueToScreen(EnvGetValue(point)));
-				}
-				OnRButtonDown(0, pt);
-			}
 		}
 	}
 
@@ -2288,6 +2276,17 @@
 
 	switch(wParam)
 	{
+		case kcContextMenu:
+			{
+				CPoint pt(0, 0);
+				if(m_nDragItem > 0)
+				{
+					uint32 point = DragItemToEnvPoint();
+					pt.SetPoint(PointToScreen(point), ValueToScreen(EnvGetValue(point)));
+				}
+				OnRButtonDown(0, pt);
+			}
+			return wParam;
 		case kcPrevInstrument:	OnPrevInstrument(); return wParam;
 		case kcNextInstrument:	OnNextInstrument(); return wParam;
 		case kcEditCopy:		OnEditCopy(); return wParam;

Modified: trunk/OpenMPT/mptrack/View_pat.cpp
==============================================================================
--- trunk/OpenMPT/mptrack/View_pat.cpp	Thu Sep 19 15:05:51 2024	(r21623)
+++ trunk/OpenMPT/mptrack/View_pat.cpp	Thu Sep 19 15:30:32 2024	(r21624)
@@ -710,12 +710,6 @@
 				}
 			}
 			//end HACK.
-
-			// Handle Application (menu) key
-			if(pMsg->message == WM_KEYDOWN && event.key == VK_APPS)
-			{
-				OnRButtonDown(0, GetPointFromPosition(m_Cursor));
-			}
 		} else if(pMsg->message == WM_MBUTTONDOWN)
 		{
 			// Open quick channel properties dialog if we're middle-clicking a channel header.
@@ -4334,6 +4328,8 @@
 
 	switch(wParam)
 	{
+		case kcContextMenu: OnRButtonDown(0, GetPointFromPosition(m_Cursor)); return wParam;
+
 		case kcPrevInstrument:        OnPrevInstrument(); return wParam;
 		case kcNextInstrument:        OnNextInstrument(); return wParam;
 		case kcPrevOrder:             GotoPreviousOrder(); return wParam;

Modified: trunk/OpenMPT/mptrack/View_smp.cpp
==============================================================================
--- trunk/OpenMPT/mptrack/View_smp.cpp	Thu Sep 19 15:05:51 2024	(r21623)
+++ trunk/OpenMPT/mptrack/View_smp.cpp	Thu Sep 19 15:30:32 2024	(r21624)
@@ -3656,13 +3656,6 @@
 			const auto event = ih->Translate(*pMsg);
 			if (ih->KeyEvent(kCtxViewSamples, event) != kcNull)
 				return true; // Mapped to a command, no need to pass message on.
-
-			// Handle Application (menu) key
-			if(pMsg->message == WM_KEYDOWN && event.key == VK_APPS)
-			{
-				int x = Util::ScalePixels(32, m_hWnd);
-				OnRButtonDown(0, CPoint(x, x));
-			}
 		}
 
 	}
@@ -3679,6 +3672,8 @@
 
 	switch(wParam)
 	{
+		case kcContextMenu: OnRButtonDown(0, CPoint(0, TimelineHeight(m_hWnd))); return wParam;
+
 		case kcSampleTrim:			TrimSample(false); return wParam;
 		case kcSampleTrimToLoopEnd:	TrimSample(true); return wParam;
 		case kcSampleZoomUp:		OnZoomUp(); return wParam;

Modified: trunk/OpenMPT/mptrack/View_tre.cpp
==============================================================================
--- trunk/OpenMPT/mptrack/View_tre.cpp	Thu Sep 19 15:05:51 2024	(r21623)
+++ trunk/OpenMPT/mptrack/View_tre.cpp	Thu Sep 19 15:30:32 2024	(r21624)
@@ -276,17 +276,6 @@
 	{
 		switch(pMsg->wParam)
 		{
-		case VK_APPS:
-			// Handle Application (menu) key
-			if(HTREEITEM item = GetSelectedItem())
-			{
-				CRect rect;
-				GetItemRect(item, &rect, FALSE);
-				ClientToScreen(rect);
-				OnItemRightClick(item, rect.TopLeft() + CPoint{rect.Height() / 2, rect.Height() / 2});
-			}
-			return TRUE;
-
 		case VK_ESCAPE:
 			GetParent()->PostMessage(WM_COMMAND, ID_CLOSE_LIBRARY_FILTER);
 			break;
@@ -315,7 +304,12 @@
 		(pMsg->message == WM_SYSKEYDOWN) || (pMsg->message == WM_KEYDOWN))
 	{
 		CInputHandler *ih = CMainFrame::GetInputHandler();
-		if(ih->KeyEvent(kCtxViewTree, ih->Translate(*pMsg)) != kcNull)
+		const auto event = ih->Translate(*pMsg);
+		if(ih->KeyEvent(kCtxViewTree, event, this) != kcNull)
+			return TRUE;  // Mapped to a command, no need to pass message on.
+
+		// For context menu shortcut
+		if(ih->KeyEvent(kCtxAllContexts, event, this) != kcNull)
 			return TRUE;  // Mapped to a command, no need to pass message on.
 	}
 	return CTreeCtrl::PreTranslateMessage(pMsg);
@@ -525,31 +519,31 @@
 	HTREEITEM parent = GetChildItem(m_hMidiLib);
 	for(UINT iMidi = 0; iMidi < 128; iMidi++)
 	{
-		DWORD dwImage = IMAGE_INSTRMUTE;
+		int image = IMAGE_INSTRMUTE;
 		s = mpt::cfmt::val(iMidi) + _T(": ") + mpt::ToCString(mpt::Charset::ASCII, szMidiProgramNames[iMidi]);
 		const LPARAM param = (MODITEM_MIDIINSTRUMENT << MIDILIB_SHIFT) | iMidi;
 		if(!midiLib[iMidi].empty())
 		{
 			s += _T(": ") + midiLib[iMidi].GetFilename().ToCString();
-			dwImage = IMAGE_INSTRUMENTS;
+			image = IMAGE_INSTRUMENTS;
 		}
 		if(!m_tiMidi[iMidi])
 		{
 			m_tiMidi[iMidi] = InsertItem(TVIF_TEXT | TVIF_IMAGE | TVIF_SELECTEDIMAGE | TVIF_PARAM,
-							s, dwImage, dwImage, 0, 0, param, parent, TVI_LAST);
+							s, image, image, 0, 0, param, parent, TVI_LAST);
 		} else
 		{
 			tvi.mask = TVIF_TEXT | TVIF_IMAGE | TVIF_SELECTEDIMAGE | TVIF_PARAM;
 			tvi.hItem = m_tiMidi[iMidi];
 			tvi.pszText = stmp.GetBuffer(s.GetLength() + 1);
 			tvi.cchTextMax = stmp.GetAllocLength();
-			tvi.iImage = tvi.iSelectedImage = dwImage;
+			tvi.iImage = tvi.iSelectedImage = image;
 			GetItem(&tvi);
 			s.ReleaseBuffer();
-			if(s != stmp || tvi.iImage != (int)dwImage)
+			if(s != stmp || tvi.iImage != image)
 			{
 				SetItem(m_tiMidi[iMidi], TVIF_TEXT | TVIF_IMAGE | TVIF_SELECTEDIMAGE | TVIF_PARAM,
-					s, dwImage, dwImage, 0, 0, param);
+					s, image, image, 0, 0, param);
 			}
 		}
 		if((iMidi % 8u) == 7u)
@@ -4191,6 +4185,17 @@
 
 	switch(wParam)
 	{
+	case kcContextMenu:
+		if(HTREEITEM item = GetSelectedItem())
+		{
+			CRect rect;
+			GetItemRect(item, &rect, FALSE);
+			ClientToScreen(rect);
+			OnItemRightClick(item, rect.TopLeft() + CPoint{ rect.Height() / 2, rect.Height() / 2 });
+			return wParam;
+		}
+		break;
+
 	case kcTreeViewStopPreview:
 		note = NOTE_NOTECUT;
 		break;

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

From: <sv...@op...> - 2024-09-19 13:06:01

Author: manx
Date: Thu Sep 19 15:05:51 2024
New Revision: 21623
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21623

Log:
Merged revision(s) 21621 from branches/OpenMPT-1.30:
[Fix] build: CI: GitHub: macOS: Fix GitHub Homebrew screwup on macOS 12. See r21619.
........

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

Modified: branches/OpenMPT-1.28/.github/workflows/macOS-12-Makefile.yml
==============================================================================
--- branches/OpenMPT-1.28/.github/workflows/macOS-12-Makefile.yml	Thu Sep 19 15:05:31 2024	(r21622)
+++ branches/OpenMPT-1.28/.github/workflows/macOS-12-Makefile.yml	Thu Sep 19 15:05:51 2024	(r21623)
@@ -15,18 +15,22 @@
 
     steps:
     - uses: actions/checkout@v4
+    - name: update Homebrew
+      run: brew update
     - name: fixup GitHub Homebrew swiftlint breakage
       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
+      run: brew unlink go@1.21 && brew unlink go && brew link --overwrite go
     - name: fixup GitHub Homebrew node breakage
       run: brew unlink node@18 && brew unlink node && brew link --overwrite node
     - name: fixup GitHub Homebrew python breakage
       run: brew unlink python@3.11 && brew unlink python@3.12 && brew link --overwrite python@3.11 && brew link --overwrite python@3.12
+    - name: upgrade packages
+      run: brew upgrade
     - name: install dependencies
-      run: brew update && brew upgrade && brew install p7zip help2man doxygen autoconf-archive mpg123 libogg libvorbis portaudio flac libsndfile sdl2 
+      run: brew install p7zip help2man doxygen autoconf-archive mpg123 libogg libvorbis portaudio flac libsndfile sdl2
     - name: setup parallel make
       run: echo "MAKEFLAGS=-j$(sysctl -n hw.ncpu)" >> $GITHUB_ENV
     - name: make

Modified: branches/OpenMPT-1.28/.github/workflows/macOS-13-Makefile.yml
==============================================================================
--- branches/OpenMPT-1.28/.github/workflows/macOS-13-Makefile.yml	Thu Sep 19 15:05:31 2024	(r21622)
+++ branches/OpenMPT-1.28/.github/workflows/macOS-13-Makefile.yml	Thu Sep 19 15:05:51 2024	(r21623)
@@ -15,10 +15,14 @@
 
     steps:
     - uses: actions/checkout@v4
+    - name: update Homebrew
+      run: brew update
     - name: fixup GitHub Homebrew python breakage
       run: brew unlink python@3.11 && brew unlink python@3.12 && brew link --overwrite python@3.11 && brew link --overwrite python@3.12
+    - name: upgrade packages
+      run: brew upgrade
     - name: install dependencies
-      run: brew update && brew upgrade && brew install p7zip help2man doxygen autoconf-archive mpg123 libogg libvorbis portaudio flac libsndfile sdl2 
+      run: brew install p7zip help2man doxygen autoconf-archive mpg123 libogg libvorbis portaudio flac libsndfile sdl2
     - name: setup parallel make
       run: echo "MAKEFLAGS=-j$(sysctl -n hw.ncpu)" >> $GITHUB_ENV
     - name: make

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

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

Author: manx
Date: Thu Sep 19 15:05:31 2024
New Revision: 21622
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21622

Log:
Merged revision(s) 21621 from branches/OpenMPT-1.30:
[Fix] build: CI: GitHub: macOS: Fix GitHub Homebrew screwup on macOS 12. See r21619.
........

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

Modified: branches/OpenMPT-1.29/.github/workflows/macOS-12-Makefile.yml
==============================================================================
--- branches/OpenMPT-1.29/.github/workflows/macOS-12-Makefile.yml	Thu Sep 19 15:05:10 2024	(r21621)
+++ branches/OpenMPT-1.29/.github/workflows/macOS-12-Makefile.yml	Thu Sep 19 15:05:31 2024	(r21622)
@@ -15,18 +15,22 @@
 
     steps:
     - uses: actions/checkout@v4
+    - name: update Homebrew
+      run: brew update
     - name: fixup GitHub Homebrew swiftlint breakage
       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
+      run: brew unlink go@1.21 && brew unlink go && brew link --overwrite go
     - name: fixup GitHub Homebrew node breakage
       run: brew unlink node@18 && brew unlink node && brew link --overwrite node
     - name: fixup GitHub Homebrew python breakage
       run: brew unlink python@3.11 && brew unlink python@3.12 && brew link --overwrite python@3.11 && brew link --overwrite python@3.12
+    - name: upgrade packages
+      run: brew upgrade
     - name: install dependencies
-      run: brew update && brew upgrade && brew install p7zip help2man doxygen autoconf-archive mpg123 libogg libvorbis portaudio flac libsndfile sdl2 
+      run: brew install p7zip help2man doxygen autoconf-archive mpg123 libogg libvorbis portaudio flac libsndfile sdl2
     - name: setup parallel make
       run: echo "MAKEFLAGS=-j$(sysctl -n hw.ncpu)" >> $GITHUB_ENV
     - name: make

Modified: branches/OpenMPT-1.29/.github/workflows/macOS-13-Makefile.yml
==============================================================================
--- branches/OpenMPT-1.29/.github/workflows/macOS-13-Makefile.yml	Thu Sep 19 15:05:10 2024	(r21621)
+++ branches/OpenMPT-1.29/.github/workflows/macOS-13-Makefile.yml	Thu Sep 19 15:05:31 2024	(r21622)
@@ -15,10 +15,14 @@
 
     steps:
     - uses: actions/checkout@v4
+    - name: update Homebrew
+      run: brew update
     - name: fixup GitHub Homebrew python breakage
       run: brew unlink python@3.11 && brew unlink python@3.12 && brew link --overwrite python@3.11 && brew link --overwrite python@3.12
+    - name: upgrade packages
+      run: brew upgrade
     - name: install dependencies
-      run: brew update && brew upgrade && brew install p7zip help2man doxygen autoconf-archive mpg123 libogg libvorbis portaudio flac libsndfile sdl2 
+      run: brew install p7zip help2man doxygen autoconf-archive mpg123 libogg libvorbis portaudio flac libsndfile sdl2
     - name: setup parallel make
       run: echo "MAKEFLAGS=-j$(sysctl -n hw.ncpu)" >> $GITHUB_ENV
     - name: make

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

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

Author: manx
Date: Thu Sep 19 15:05:10 2024
New Revision: 21621
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21621

Log:
[Fix] build: CI: GitHub: macOS: Fix GitHub Homebrew screwup on macOS 12. See r21619.

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

Modified: branches/OpenMPT-1.30/.github/workflows/macOS-12-Makefile.yml
==============================================================================
--- branches/OpenMPT-1.30/.github/workflows/macOS-12-Makefile.yml	Thu Sep 19 15:04:08 2024	(r21620)
+++ branches/OpenMPT-1.30/.github/workflows/macOS-12-Makefile.yml	Thu Sep 19 15:05:10 2024	(r21621)
@@ -15,18 +15,22 @@
 
     steps:
     - uses: actions/checkout@v4
+    - name: update Homebrew
+      run: brew update
     - name: fixup GitHub Homebrew swiftlint breakage
       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
+      run: brew unlink go@1.21 && brew unlink go && brew link --overwrite go
     - name: fixup GitHub Homebrew node breakage
       run: brew unlink node@18 && brew unlink node && brew link --overwrite node
     - name: fixup GitHub Homebrew python breakage
       run: brew unlink python@3.11 && brew unlink python@3.12 && brew link --overwrite python@3.11 && brew link --overwrite python@3.12
+    - name: upgrade packages
+      run: brew upgrade
     - name: install dependencies
-      run: brew update && brew upgrade && brew install p7zip help2man doxygen autoconf-archive mpg123 libogg libvorbis portaudio flac libsndfile sdl2 
+      run: brew install p7zip help2man doxygen autoconf-archive mpg123 libogg libvorbis portaudio flac libsndfile sdl2
     - name: setup parallel make
       run: echo "MAKEFLAGS=-j$(sysctl -n hw.ncpu)" >> $GITHUB_ENV
     - name: make

Modified: branches/OpenMPT-1.30/.github/workflows/macOS-13-Makefile.yml
==============================================================================
--- branches/OpenMPT-1.30/.github/workflows/macOS-13-Makefile.yml	Thu Sep 19 15:04:08 2024	(r21620)
+++ branches/OpenMPT-1.30/.github/workflows/macOS-13-Makefile.yml	Thu Sep 19 15:05:10 2024	(r21621)
@@ -15,10 +15,14 @@
 
     steps:
     - uses: actions/checkout@v4
+    - name: update Homebrew
+      run: brew update
     - name: fixup GitHub Homebrew python breakage
       run: brew unlink python@3.11 && brew unlink python@3.12 && brew link --overwrite python@3.11 && brew link --overwrite python@3.12
+    - name: upgrade packages
+      run: brew upgrade
     - name: install dependencies
-      run: brew update && brew upgrade && brew install p7zip help2man doxygen autoconf-archive mpg123 libogg libvorbis portaudio flac libsndfile sdl2 
+      run: brew install p7zip help2man doxygen autoconf-archive mpg123 libogg libvorbis portaudio flac libsndfile sdl2
     - name: setup parallel make
       run: echo "MAKEFLAGS=-j$(sysctl -n hw.ncpu)" >> $GITHUB_ENV
     - name: make

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

From: <sv...@op...> - 2024-09-19 13:04:20

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

Log:
Merged revision(s) 21619 from trunk/OpenMPT:
[Fix] build: CI: GitHub: macOS: Fix GitHub Homebrew screwup 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	Thu Sep 19 15:03:39 2024	(r21619)
+++ branches/OpenMPT-1.31/.github/workflows/macOS-Autotools.yml	Thu Sep 19 15:04:08 2024	(r21620)
@@ -23,6 +23,8 @@
     runs-on: ${{matrix.host}}
     steps:
     - uses: actions/checkout@v4
+    - name: update Homebrew
+      run: brew update
     - name: fixup GitHub Homebrew swiftlint breakage
       if: ${{ matrix.host == 'macos-12' }}
       run: brew pin swiftlint
@@ -31,15 +33,17 @@
       run: brew pin xcbeautify
     - name: fixup GitHub Homebrew go breakage
       if: ${{ matrix.host == 'macos-12' }}
-      run: brew unlink go@1.21
+      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
     - name: fixup GitHub Homebrew python breakage
       if: ${{ matrix.host == 'macos-12' || matrix.host == 'macos-13' }}
       run: brew unlink python@3.11 && brew unlink python@3.12 && brew link --overwrite python@3.11 && brew link --overwrite python@3.12
+    - name: upgrade packages
+      run: brew upgrade
     - name: install dependencies
-      run: brew update && brew upgrade && brew install p7zip help2man doxygen autoconf autoconf-archive automake libtool mpg123 libogg libvorbis portaudio flac libsndfile sdl2
+      run: brew install p7zip help2man doxygen autoconf autoconf-archive automake libtool mpg123 libogg libvorbis portaudio flac libsndfile sdl2
     - name: selecting Xcode version
       run: sudo xcode-select --switch /Applications/Xcode_${{matrix.compiler}}.app
     - name: setup parallel make

Modified: branches/OpenMPT-1.31/.github/workflows/macOS-Makefile.yml
==============================================================================
--- branches/OpenMPT-1.31/.github/workflows/macOS-Makefile.yml	Thu Sep 19 15:03:39 2024	(r21619)
+++ branches/OpenMPT-1.31/.github/workflows/macOS-Makefile.yml	Thu Sep 19 15:04:08 2024	(r21620)
@@ -71,6 +71,8 @@
     runs-on: ${{matrix.host}}
     steps:
     - uses: actions/checkout@v4
+    - name: update Homebrew
+      run: brew update
     - name: fixup GitHub Homebrew swiftlint breakage
       if: ${{ matrix.host == 'macos-12' }}
       run: brew pin swiftlint
@@ -79,15 +81,17 @@
       run: brew pin xcbeautify
     - name: fixup GitHub Homebrew go breakage
       if: ${{ matrix.host == 'macos-12' }}
-      run: brew unlink go@1.21
+      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
     - name: fixup GitHub Homebrew python breakage
       if: ${{ matrix.host == 'macos-12' || matrix.host == 'macos-13' }}
       run: brew unlink python@3.11 && brew unlink python@3.12 && brew link --overwrite python@3.11 && brew link --overwrite python@3.12
+    - name: upgrade packages
+      run: brew upgrade
     - name: install dependencies
-      run: brew update && brew upgrade && brew install p7zip help2man doxygen autoconf autoconf-archive automake libtool mpg123 libogg libvorbis portaudio flac libsndfile sdl2
+      run: brew install p7zip help2man doxygen autoconf autoconf-archive automake libtool mpg123 libogg libvorbis portaudio flac libsndfile sdl2
     - name: selecting Xcode version
       run: sudo xcode-select --switch /Applications/Xcode_${{matrix.compiler}}.app
     - name: setup parallel make

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

From: <sv...@op...> - 2024-09-19 13:03:46

Author: manx
Date: Thu Sep 19 15:03:39 2024
New Revision: 21619
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21619

Log:
[Fix] build: CI: GitHub: macOS: Fix GitHub Homebrew screwup 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	Thu Sep 19 14:42:53 2024	(r21618)
+++ trunk/OpenMPT/.github/workflows/macOS-Autotools.yml	Thu Sep 19 15:03:39 2024	(r21619)
@@ -25,6 +25,8 @@
     runs-on: ${{matrix.host}}
     steps:
     - uses: actions/checkout@v4
+    - name: update Homebrew
+      run: brew update
     - name: fixup GitHub Homebrew swiftlint breakage
       if: ${{ matrix.host == 'macos-12' }}
       run: brew pin swiftlint
@@ -33,15 +35,17 @@
       run: brew pin xcbeautify
     - name: fixup GitHub Homebrew go breakage
       if: ${{ matrix.host == 'macos-12' }}
-      run: brew unlink go@1.21
+      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
     - name: fixup GitHub Homebrew python breakage
       if: ${{ matrix.host == 'macos-12' || matrix.host == 'macos-13' }}
       run: brew unlink python@3.11 && brew unlink python@3.12 && brew link --overwrite python@3.11 && brew link --overwrite python@3.12
+    - name: upgrade packages
+      run: brew upgrade
     - name: install dependencies
-      run: brew update && brew upgrade && brew install p7zip help2man doxygen autoconf autoconf-archive automake libtool mpg123 libogg libvorbis portaudio flac libsndfile sdl2
+      run: brew install p7zip help2man doxygen autoconf autoconf-archive automake libtool mpg123 libogg libvorbis portaudio flac libsndfile sdl2
     - name: selecting Xcode version
       run: sudo xcode-select --switch /Applications/Xcode_${{matrix.compiler}}.app
     - name: setup parallel make

Modified: trunk/OpenMPT/.github/workflows/macOS-Makefile.yml
==============================================================================
--- trunk/OpenMPT/.github/workflows/macOS-Makefile.yml	Thu Sep 19 14:42:53 2024	(r21618)
+++ trunk/OpenMPT/.github/workflows/macOS-Makefile.yml	Thu Sep 19 15:03:39 2024	(r21619)
@@ -73,6 +73,8 @@
     runs-on: ${{matrix.host}}
     steps:
     - uses: actions/checkout@v4
+    - name: update Homebrew
+      run: brew update
     - name: fixup GitHub Homebrew swiftlint breakage
       if: ${{ matrix.host == 'macos-12' }}
       run: brew pin swiftlint
@@ -81,15 +83,17 @@
       run: brew pin xcbeautify
     - name: fixup GitHub Homebrew go breakage
       if: ${{ matrix.host == 'macos-12' }}
-      run: brew unlink go@1.21
+      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
     - name: fixup GitHub Homebrew python breakage
       if: ${{ matrix.host == 'macos-12' || matrix.host == 'macos-13' }}
       run: brew unlink python@3.11 && brew unlink python@3.12 && brew link --overwrite python@3.11 && brew link --overwrite python@3.12
+    - name: upgrade packages
+      run: brew upgrade
     - name: install dependencies
-      run: brew update && brew upgrade && brew install p7zip help2man doxygen autoconf autoconf-archive automake libtool mpg123 libogg libvorbis portaudio flac libsndfile sdl2
+      run: brew install p7zip help2man doxygen autoconf autoconf-archive automake libtool mpg123 libogg libvorbis portaudio flac libsndfile sdl2
     - name: selecting Xcode version
       run: sudo xcode-select --switch /Applications/Xcode_${{matrix.compiler}}.app
     - name: setup parallel make

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

From: <sv...@op...> - 2024-09-19 12:43:04

Author: manx
Date: Thu Sep 19 14:42:53 2024
New Revision: 21618
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21618

Log:
[Fix] Revert r21613.
Merged revision(s) 21613 from trunk/OpenMPT:
[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 14:41:07 2024	(r21617)
+++ trunk/OpenMPT/Makefile	Thu Sep 19 14:42:53 2024	(r21618)
@@ -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  --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
+	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
 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 r21617 - branches/OpenMPT-1.31

From: <sv...@op...> - 2024-09-19 12:41:14

Author: manx
Date: Thu Sep 19 14:41:07 2024
New Revision: 21617
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21617

Log:
[Fix] Revert r21614.
Merged revision(s) 21614 from branches/OpenMPT-1.31:
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 14:30:47 2024	(r21616)
+++ branches/OpenMPT-1.31/Makefile	Thu Sep 19 14:41:07 2024	(r21617)
@@ -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 --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
+	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
 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 r21616 - in trunk/OpenMPT: build/vs2017winxp build/vs2017winxpansi build/vs2019win7 build/vs2022win10 build/vs2022win10clang build/vs2022win7 build/vs2022win8 build/vs2022win81 mptrack mptrack/plugins

From: <sv...@op...> - 2024-09-19 12:31:02

Author: sagamusix
Date: Thu Sep 19 14:30:47 2024
New Revision: 21616
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21616

Log:
[Mod] Global keyboard shortcuts are no longer caught by a global keyboard hook. They are now implemented on the window level instead. This improves compatibility with Wine, and it puts shortcut priorities finally in the right order (a more specific keyboard context can now override a global shortcut). This brings small but hopefully acceptable changes in behaviour too: For example global keyboard shortcuts no longer function while a menu or context menu is open. Note: Modifier changes are still monitored through the global keyboard hook for now (https://bugs.openmpt.org/view.php?id=713).

Added:
   trunk/OpenMPT/mptrack/DialogBase.cpp   (contents, props changed)
   trunk/OpenMPT/mptrack/DialogBase.h   (contents, props changed)
Modified:
   trunk/OpenMPT/build/vs2017winxp/OpenMPT-ANSI.vcxproj
   trunk/OpenMPT/build/vs2017winxp/OpenMPT-ANSI.vcxproj.filters
   trunk/OpenMPT/build/vs2017winxp/OpenMPT-UTF8.vcxproj
   trunk/OpenMPT/build/vs2017winxp/OpenMPT-UTF8.vcxproj.filters
   trunk/OpenMPT/build/vs2017winxp/OpenMPT.vcxproj
   trunk/OpenMPT/build/vs2017winxp/OpenMPT.vcxproj.filters
   trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-ANSI.vcxproj
   trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-ANSI.vcxproj.filters
   trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-UTF8.vcxproj
   trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-UTF8.vcxproj.filters
   trunk/OpenMPT/build/vs2017winxpansi/OpenMPT.vcxproj
   trunk/OpenMPT/build/vs2017winxpansi/OpenMPT.vcxproj.filters
   trunk/OpenMPT/build/vs2019win7/OpenMPT-ANSI.vcxproj
   trunk/OpenMPT/build/vs2019win7/OpenMPT-ANSI.vcxproj.filters
   trunk/OpenMPT/build/vs2019win7/OpenMPT-UTF8.vcxproj
   trunk/OpenMPT/build/vs2019win7/OpenMPT-UTF8.vcxproj.filters
   trunk/OpenMPT/build/vs2019win7/OpenMPT.vcxproj
   trunk/OpenMPT/build/vs2019win7/OpenMPT.vcxproj.filters
   trunk/OpenMPT/build/vs2022win10/OpenMPT-ANSI.vcxproj
   trunk/OpenMPT/build/vs2022win10/OpenMPT-ANSI.vcxproj.filters
   trunk/OpenMPT/build/vs2022win10/OpenMPT-UTF8.vcxproj
   trunk/OpenMPT/build/vs2022win10/OpenMPT-UTF8.vcxproj.filters
   trunk/OpenMPT/build/vs2022win10/OpenMPT.vcxproj
   trunk/OpenMPT/build/vs2022win10/OpenMPT.vcxproj.filters
   trunk/OpenMPT/build/vs2022win10clang/OpenMPT-ANSI.vcxproj
   trunk/OpenMPT/build/vs2022win10clang/OpenMPT-ANSI.vcxproj.filters
   trunk/OpenMPT/build/vs2022win10clang/OpenMPT-UTF8.vcxproj
   trunk/OpenMPT/build/vs2022win10clang/OpenMPT-UTF8.vcxproj.filters
   trunk/OpenMPT/build/vs2022win10clang/OpenMPT.vcxproj
   trunk/OpenMPT/build/vs2022win10clang/OpenMPT.vcxproj.filters
   trunk/OpenMPT/build/vs2022win7/OpenMPT-ANSI.vcxproj
   trunk/OpenMPT/build/vs2022win7/OpenMPT-ANSI.vcxproj.filters
   trunk/OpenMPT/build/vs2022win7/OpenMPT-UTF8.vcxproj
   trunk/OpenMPT/build/vs2022win7/OpenMPT-UTF8.vcxproj.filters
   trunk/OpenMPT/build/vs2022win7/OpenMPT.vcxproj
   trunk/OpenMPT/build/vs2022win7/OpenMPT.vcxproj.filters
   trunk/OpenMPT/build/vs2022win8/OpenMPT-ANSI.vcxproj
   trunk/OpenMPT/build/vs2022win8/OpenMPT-ANSI.vcxproj.filters
   trunk/OpenMPT/build/vs2022win8/OpenMPT-UTF8.vcxproj
   trunk/OpenMPT/build/vs2022win8/OpenMPT-UTF8.vcxproj.filters
   trunk/OpenMPT/build/vs2022win8/OpenMPT.vcxproj
   trunk/OpenMPT/build/vs2022win8/OpenMPT.vcxproj.filters
   trunk/OpenMPT/build/vs2022win81/OpenMPT-ANSI.vcxproj
   trunk/OpenMPT/build/vs2022win81/OpenMPT-ANSI.vcxproj.filters
   trunk/OpenMPT/build/vs2022win81/OpenMPT-UTF8.vcxproj
   trunk/OpenMPT/build/vs2022win81/OpenMPT-UTF8.vcxproj.filters
   trunk/OpenMPT/build/vs2022win81/OpenMPT.vcxproj
   trunk/OpenMPT/build/vs2022win81/OpenMPT.vcxproj.filters
   trunk/OpenMPT/mptrack/AboutDialog.cpp
   trunk/OpenMPT/mptrack/AboutDialog.h
   trunk/OpenMPT/mptrack/AbstractVstEditor.cpp
   trunk/OpenMPT/mptrack/AbstractVstEditor.h
   trunk/OpenMPT/mptrack/AdvancedConfigDlg.cpp
   trunk/OpenMPT/mptrack/Autotune.cpp
   trunk/OpenMPT/mptrack/Autotune.h
   trunk/OpenMPT/mptrack/ChannelManagerDlg.cpp
   trunk/OpenMPT/mptrack/ChannelManagerDlg.h
   trunk/OpenMPT/mptrack/CleanupSong.cpp
   trunk/OpenMPT/mptrack/CleanupSong.h
   trunk/OpenMPT/mptrack/ColorConfigDlg.cpp
   trunk/OpenMPT/mptrack/Ctrl_gen.cpp
   trunk/OpenMPT/mptrack/Ctrl_pat.cpp
   trunk/OpenMPT/mptrack/Ctrl_pat.h
   trunk/OpenMPT/mptrack/Ctrl_seq.cpp
   trunk/OpenMPT/mptrack/DefaultVstEditor.cpp
   trunk/OpenMPT/mptrack/EffectVis.cpp
   trunk/OpenMPT/mptrack/EffectVis.h
   trunk/OpenMPT/mptrack/GeneralConfigDlg.cpp
   trunk/OpenMPT/mptrack/Globals.cpp
   trunk/OpenMPT/mptrack/Globals.h
   trunk/OpenMPT/mptrack/InputHandler.cpp
   trunk/OpenMPT/mptrack/InputHandler.h
   trunk/OpenMPT/mptrack/MIDIMacroDialog.cpp
   trunk/OpenMPT/mptrack/MIDIMacroDialog.h
   trunk/OpenMPT/mptrack/MIDIMappingDialog.cpp
   trunk/OpenMPT/mptrack/MIDIMappingDialog.h
   trunk/OpenMPT/mptrack/MPTrackUtilWine.cpp
   trunk/OpenMPT/mptrack/MainFrm.cpp
   trunk/OpenMPT/mptrack/Mod2wave.cpp
   trunk/OpenMPT/mptrack/MoveFXSlotDialog.cpp
   trunk/OpenMPT/mptrack/MoveFXSlotDialog.h
   trunk/OpenMPT/mptrack/Mpdlgs.cpp
   trunk/OpenMPT/mptrack/Mpdlgs.h
   trunk/OpenMPT/mptrack/Mptrack.cpp
   trunk/OpenMPT/mptrack/OPLExport.cpp
   trunk/OpenMPT/mptrack/OPLInstrDlg.cpp
   trunk/OpenMPT/mptrack/OPLInstrDlg.h
   trunk/OpenMPT/mptrack/PSRatioCalc.cpp
   trunk/OpenMPT/mptrack/PSRatioCalc.h
   trunk/OpenMPT/mptrack/PatternEditorDialogs.cpp
   trunk/OpenMPT/mptrack/PatternEditorDialogs.h
   trunk/OpenMPT/mptrack/PatternFindReplaceDlg.cpp
   trunk/OpenMPT/mptrack/PatternGotoDialog.cpp
   trunk/OpenMPT/mptrack/PatternGotoDialog.h
   trunk/OpenMPT/mptrack/ProgressDialog.cpp
   trunk/OpenMPT/mptrack/ProgressDialog.h
   trunk/OpenMPT/mptrack/Reporting.cpp
   trunk/OpenMPT/mptrack/ResizableDialog.cpp
   trunk/OpenMPT/mptrack/ResizableDialog.h
   trunk/OpenMPT/mptrack/SampleEditorDialogs.cpp
   trunk/OpenMPT/mptrack/SampleEditorDialogs.h
   trunk/OpenMPT/mptrack/SampleGenerator.cpp
   trunk/OpenMPT/mptrack/SampleGenerator.h
   trunk/OpenMPT/mptrack/ScaleEnvPointsDlg.cpp
   trunk/OpenMPT/mptrack/ScaleEnvPointsDlg.h
   trunk/OpenMPT/mptrack/SelectPluginDialog.cpp
   trunk/OpenMPT/mptrack/TempoSwingDialog.cpp
   trunk/OpenMPT/mptrack/TempoSwingDialog.h
   trunk/OpenMPT/mptrack/TuningDialog.cpp
   trunk/OpenMPT/mptrack/TuningDialog.h
   trunk/OpenMPT/mptrack/UpdateCheck.cpp
   trunk/OpenMPT/mptrack/UpdateCheck.h
   trunk/OpenMPT/mptrack/View_ins.cpp
   trunk/OpenMPT/mptrack/View_pat.cpp
   trunk/OpenMPT/mptrack/View_tre.cpp
   trunk/OpenMPT/mptrack/WelcomeDialog.cpp
   trunk/OpenMPT/mptrack/WelcomeDialog.h
   trunk/OpenMPT/mptrack/dlg_misc.cpp
   trunk/OpenMPT/mptrack/dlg_misc.h
   trunk/OpenMPT/mptrack/mod2midi.cpp
   trunk/OpenMPT/mptrack/mod2midi.h
   trunk/OpenMPT/mptrack/mod2wave.h
   trunk/OpenMPT/mptrack/plugins/LFOPluginEditor.cpp
   trunk/OpenMPT/mptrack/plugins/MidiInOutEditor.cpp

Modified: trunk/OpenMPT/build/vs2017winxp/OpenMPT-ANSI.vcxproj
==============================================================================
--- trunk/OpenMPT/build/vs2017winxp/OpenMPT-ANSI.vcxproj	Thu Sep 19 13:27:30 2024	(r21615)
+++ trunk/OpenMPT/build/vs2017winxp/OpenMPT-ANSI.vcxproj	Thu Sep 19 14:30:47 2024	(r21616)
@@ -816,6 +816,7 @@
     <ClInclude Include="..\..\mptrack\Ctrl_pat.h" />
     <ClInclude Include="..\..\mptrack\Ctrl_smp.h" />
     <ClInclude Include="..\..\mptrack\DefaultVstEditor.h" />
+    <ClInclude Include="..\..\mptrack\DialogBase.h" />
     <ClInclude Include="..\..\mptrack\EffectInfo.h" />
     <ClInclude Include="..\..\mptrack\EffectVis.h" />
     <ClInclude Include="..\..\mptrack\ExceptionHandler.h" />
@@ -1256,6 +1257,7 @@
     <ClCompile Include="..\..\mptrack\Ctrl_seq.cpp" />
     <ClCompile Include="..\..\mptrack\Ctrl_smp.cpp" />
     <ClCompile Include="..\..\mptrack\DefaultVstEditor.cpp" />
+    <ClCompile Include="..\..\mptrack\DialogBase.cpp" />
     <ClCompile Include="..\..\mptrack\Draw_pat.cpp" />
     <ClCompile Include="..\..\mptrack\EffectInfo.cpp" />
     <ClCompile Include="..\..\mptrack\EffectVis.cpp" />

Modified: trunk/OpenMPT/build/vs2017winxp/OpenMPT-ANSI.vcxproj.filters
==============================================================================
--- trunk/OpenMPT/build/vs2017winxp/OpenMPT-ANSI.vcxproj.filters	Thu Sep 19 13:27:30 2024	(r21615)
+++ trunk/OpenMPT/build/vs2017winxp/OpenMPT-ANSI.vcxproj.filters	Thu Sep 19 14:30:47 2024	(r21616)
@@ -411,6 +411,9 @@
     <ClInclude Include="..\..\mptrack\DefaultVstEditor.h">
       <Filter>mptrack</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\mptrack\DialogBase.h">
+      <Filter>mptrack</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\mptrack\EffectInfo.h">
       <Filter>mptrack</Filter>
     </ClInclude>
@@ -1727,6 +1730,9 @@
     <ClCompile Include="..\..\mptrack\DefaultVstEditor.cpp">
       <Filter>mptrack</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\mptrack\DialogBase.cpp">
+      <Filter>mptrack</Filter>
+    </ClCompile>
     <ClCompile Include="..\..\mptrack\Draw_pat.cpp">
       <Filter>mptrack</Filter>
     </ClCompile>

Modified: trunk/OpenMPT/build/vs2017winxp/OpenMPT-UTF8.vcxproj
==============================================================================
--- trunk/OpenMPT/build/vs2017winxp/OpenMPT-UTF8.vcxproj	Thu Sep 19 13:27:30 2024	(r21615)
+++ trunk/OpenMPT/build/vs2017winxp/OpenMPT-UTF8.vcxproj	Thu Sep 19 14:30:47 2024	(r21616)
@@ -816,6 +816,7 @@
     <ClInclude Include="..\..\mptrack\Ctrl_pat.h" />
     <ClInclude Include="..\..\mptrack\Ctrl_smp.h" />
     <ClInclude Include="..\..\mptrack\DefaultVstEditor.h" />
+    <ClInclude Include="..\..\mptrack\DialogBase.h" />
     <ClInclude Include="..\..\mptrack\EffectInfo.h" />
     <ClInclude Include="..\..\mptrack\EffectVis.h" />
     <ClInclude Include="..\..\mptrack\ExceptionHandler.h" />
@@ -1256,6 +1257,7 @@
     <ClCompile Include="..\..\mptrack\Ctrl_seq.cpp" />
     <ClCompile Include="..\..\mptrack\Ctrl_smp.cpp" />
     <ClCompile Include="..\..\mptrack\DefaultVstEditor.cpp" />
+    <ClCompile Include="..\..\mptrack\DialogBase.cpp" />
     <ClCompile Include="..\..\mptrack\Draw_pat.cpp" />
     <ClCompile Include="..\..\mptrack\EffectInfo.cpp" />
     <ClCompile Include="..\..\mptrack\EffectVis.cpp" />

Modified: trunk/OpenMPT/build/vs2017winxp/OpenMPT-UTF8.vcxproj.filters
==============================================================================
--- trunk/OpenMPT/build/vs2017winxp/OpenMPT-UTF8.vcxproj.filters	Thu Sep 19 13:27:30 2024	(r21615)
+++ trunk/OpenMPT/build/vs2017winxp/OpenMPT-UTF8.vcxproj.filters	Thu Sep 19 14:30:47 2024	(r21616)
@@ -411,6 +411,9 @@
     <ClInclude Include="..\..\mptrack\DefaultVstEditor.h">
       <Filter>mptrack</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\mptrack\DialogBase.h">
+      <Filter>mptrack</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\mptrack\EffectInfo.h">
       <Filter>mptrack</Filter>
     </ClInclude>
@@ -1727,6 +1730,9 @@
     <ClCompile Include="..\..\mptrack\DefaultVstEditor.cpp">
       <Filter>mptrack</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\mptrack\DialogBase.cpp">
+      <Filter>mptrack</Filter>
+    </ClCompile>
     <ClCompile Include="..\..\mptrack\Draw_pat.cpp">
       <Filter>mptrack</Filter>
     </ClCompile>

Modified: trunk/OpenMPT/build/vs2017winxp/OpenMPT.vcxproj
==============================================================================
--- trunk/OpenMPT/build/vs2017winxp/OpenMPT.vcxproj	Thu Sep 19 13:27:30 2024	(r21615)
+++ trunk/OpenMPT/build/vs2017winxp/OpenMPT.vcxproj	Thu Sep 19 14:30:47 2024	(r21616)
@@ -816,6 +816,7 @@
     <ClInclude Include="..\..\mptrack\Ctrl_pat.h" />
     <ClInclude Include="..\..\mptrack\Ctrl_smp.h" />
     <ClInclude Include="..\..\mptrack\DefaultVstEditor.h" />
+    <ClInclude Include="..\..\mptrack\DialogBase.h" />
     <ClInclude Include="..\..\mptrack\EffectInfo.h" />
     <ClInclude Include="..\..\mptrack\EffectVis.h" />
     <ClInclude Include="..\..\mptrack\ExceptionHandler.h" />
@@ -1256,6 +1257,7 @@
     <ClCompile Include="..\..\mptrack\Ctrl_seq.cpp" />
     <ClCompile Include="..\..\mptrack\Ctrl_smp.cpp" />
     <ClCompile Include="..\..\mptrack\DefaultVstEditor.cpp" />
+    <ClCompile Include="..\..\mptrack\DialogBase.cpp" />
     <ClCompile Include="..\..\mptrack\Draw_pat.cpp" />
     <ClCompile Include="..\..\mptrack\EffectInfo.cpp" />
     <ClCompile Include="..\..\mptrack\EffectVis.cpp" />

Modified: trunk/OpenMPT/build/vs2017winxp/OpenMPT.vcxproj.filters
==============================================================================
--- trunk/OpenMPT/build/vs2017winxp/OpenMPT.vcxproj.filters	Thu Sep 19 13:27:30 2024	(r21615)
+++ trunk/OpenMPT/build/vs2017winxp/OpenMPT.vcxproj.filters	Thu Sep 19 14:30:47 2024	(r21616)
@@ -411,6 +411,9 @@
     <ClInclude Include="..\..\mptrack\DefaultVstEditor.h">
       <Filter>mptrack</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\mptrack\DialogBase.h">
+      <Filter>mptrack</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\mptrack\EffectInfo.h">
       <Filter>mptrack</Filter>
     </ClInclude>
@@ -1727,6 +1730,9 @@
     <ClCompile Include="..\..\mptrack\DefaultVstEditor.cpp">
       <Filter>mptrack</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\mptrack\DialogBase.cpp">
+      <Filter>mptrack</Filter>
+    </ClCompile>
     <ClCompile Include="..\..\mptrack\Draw_pat.cpp">
       <Filter>mptrack</Filter>
     </ClCompile>

Modified: trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-ANSI.vcxproj
==============================================================================
--- trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-ANSI.vcxproj	Thu Sep 19 13:27:30 2024	(r21615)
+++ trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-ANSI.vcxproj	Thu Sep 19 14:30:47 2024	(r21616)
@@ -816,6 +816,7 @@
     <ClInclude Include="..\..\mptrack\Ctrl_pat.h" />
     <ClInclude Include="..\..\mptrack\Ctrl_smp.h" />
     <ClInclude Include="..\..\mptrack\DefaultVstEditor.h" />
+    <ClInclude Include="..\..\mptrack\DialogBase.h" />
     <ClInclude Include="..\..\mptrack\EffectInfo.h" />
     <ClInclude Include="..\..\mptrack\EffectVis.h" />
     <ClInclude Include="..\..\mptrack\ExceptionHandler.h" />
@@ -1256,6 +1257,7 @@
     <ClCompile Include="..\..\mptrack\Ctrl_seq.cpp" />
     <ClCompile Include="..\..\mptrack\Ctrl_smp.cpp" />
     <ClCompile Include="..\..\mptrack\DefaultVstEditor.cpp" />
+    <ClCompile Include="..\..\mptrack\DialogBase.cpp" />
     <ClCompile Include="..\..\mptrack\Draw_pat.cpp" />
     <ClCompile Include="..\..\mptrack\EffectInfo.cpp" />
     <ClCompile Include="..\..\mptrack\EffectVis.cpp" />

Modified: trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-ANSI.vcxproj.filters
==============================================================================
--- trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-ANSI.vcxproj.filters	Thu Sep 19 13:27:30 2024	(r21615)
+++ trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-ANSI.vcxproj.filters	Thu Sep 19 14:30:47 2024	(r21616)
@@ -411,6 +411,9 @@
     <ClInclude Include="..\..\mptrack\DefaultVstEditor.h">
       <Filter>mptrack</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\mptrack\DialogBase.h">
+      <Filter>mptrack</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\mptrack\EffectInfo.h">
       <Filter>mptrack</Filter>
     </ClInclude>
@@ -1727,6 +1730,9 @@
     <ClCompile Include="..\..\mptrack\DefaultVstEditor.cpp">
       <Filter>mptrack</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\mptrack\DialogBase.cpp">
+      <Filter>mptrack</Filter>
+    </ClCompile>
     <ClCompile Include="..\..\mptrack\Draw_pat.cpp">
       <Filter>mptrack</Filter>
     </ClCompile>

Modified: trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-UTF8.vcxproj
==============================================================================
--- trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-UTF8.vcxproj	Thu Sep 19 13:27:30 2024	(r21615)
+++ trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-UTF8.vcxproj	Thu Sep 19 14:30:47 2024	(r21616)
@@ -816,6 +816,7 @@
     <ClInclude Include="..\..\mptrack\Ctrl_pat.h" />
     <ClInclude Include="..\..\mptrack\Ctrl_smp.h" />
     <ClInclude Include="..\..\mptrack\DefaultVstEditor.h" />
+    <ClInclude Include="..\..\mptrack\DialogBase.h" />
     <ClInclude Include="..\..\mptrack\EffectInfo.h" />
     <ClInclude Include="..\..\mptrack\EffectVis.h" />
     <ClInclude Include="..\..\mptrack\ExceptionHandler.h" />
@@ -1256,6 +1257,7 @@
     <ClCompile Include="..\..\mptrack\Ctrl_seq.cpp" />
     <ClCompile Include="..\..\mptrack\Ctrl_smp.cpp" />
     <ClCompile Include="..\..\mptrack\DefaultVstEditor.cpp" />
+    <ClCompile Include="..\..\mptrack\DialogBase.cpp" />
     <ClCompile Include="..\..\mptrack\Draw_pat.cpp" />
     <ClCompile Include="..\..\mptrack\EffectInfo.cpp" />
     <ClCompile Include="..\..\mptrack\EffectVis.cpp" />

Modified: trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-UTF8.vcxproj.filters
==============================================================================
--- trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-UTF8.vcxproj.filters	Thu Sep 19 13:27:30 2024	(r21615)
+++ trunk/OpenMPT/build/vs2017winxpansi/OpenMPT-UTF8.vcxproj.filters	Thu Sep 19 14:30:47 2024	(r21616)
@@ -411,6 +411,9 @@
     <ClInclude Include="..\..\mptrack\DefaultVstEditor.h">
       <Filter>mptrack</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\mptrack\DialogBase.h">
+      <Filter>mptrack</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\mptrack\EffectInfo.h">
       <Filter>mptrack</Filter>
     </ClInclude>
@@ -1727,6 +1730,9 @@
     <ClCompile Include="..\..\mptrack\DefaultVstEditor.cpp">
       <Filter>mptrack</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\mptrack\DialogBase.cpp">
+      <Filter>mptrack</Filter>
+    </ClCompile>
     <ClCompile Include="..\..\mptrack\Draw_pat.cpp">
       <Filter>mptrack</Filter>
     </ClCompile>

Modified: trunk/OpenMPT/build/vs2017winxpansi/OpenMPT.vcxproj
==============================================================================
--- trunk/OpenMPT/build/vs2017winxpansi/OpenMPT.vcxproj	Thu Sep 19 13:27:30 2024	(r21615)
+++ trunk/OpenMPT/build/vs2017winxpansi/OpenMPT.vcxproj	Thu Sep 19 14:30:47 2024	(r21616)
@@ -816,6 +816,7 @@
     <ClInclude Include="..\..\mptrack\Ctrl_pat.h" />
     <ClInclude Include="..\..\mptrack\Ctrl_smp.h" />
     <ClInclude Include="..\..\mptrack\DefaultVstEditor.h" />
+    <ClInclude Include="..\..\mptrack\DialogBase.h" />
     <ClInclude Include="..\..\mptrack\EffectInfo.h" />
     <ClInclude Include="..\..\mptrack\EffectVis.h" />
     <ClInclude Include="..\..\mptrack\ExceptionHandler.h" />
@@ -1256,6 +1257,7 @@
     <ClCompile Include="..\..\mptrack\Ctrl_seq.cpp" />
     <ClCompile Include="..\..\mptrack\Ctrl_smp.cpp" />
     <ClCompile Include="..\..\mptrack\DefaultVstEditor.cpp" />
+    <ClCompile Include="..\..\mptrack\DialogBase.cpp" />
     <ClCompile Include="..\..\mptrack\Draw_pat.cpp" />
     <ClCompile Include="..\..\mptrack\EffectInfo.cpp" />
     <ClCompile Include="..\..\mptrack\EffectVis.cpp" />

Modified: trunk/OpenMPT/build/vs2017winxpansi/OpenMPT.vcxproj.filters
==============================================================================
--- trunk/OpenMPT/build/vs2017winxpansi/OpenMPT.vcxproj.filters	Thu Sep 19 13:27:30 2024	(r21615)
+++ trunk/OpenMPT/build/vs2017winxpansi/OpenMPT.vcxproj.filters	Thu Sep 19 14:30:47 2024	(r21616)
@@ -411,6 +411,9 @@
     <ClInclude Include="..\..\mptrack\DefaultVstEditor.h">
       <Filter>mptrack</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\mptrack\DialogBase.h">
+      <Filter>mptrack</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\mptrack\EffectInfo.h">
       <Filter>mptrack</Filter>
     </ClInclude>
@@ -1727,6 +1730,9 @@
     <ClCompile Include="..\..\mptrack\DefaultVstEditor.cpp">
       <Filter>mptrack</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\mptrack\DialogBase.cpp">
+      <Filter>mptrack</Filter>
+    </ClCompile>
     <ClCompile Include="..\..\mptrack\Draw_pat.cpp">
       <Filter>mptrack</Filter>
     </ClCompile>

Modified: trunk/OpenMPT/build/vs2019win7/OpenMPT-ANSI.vcxproj
==============================================================================
--- trunk/OpenMPT/build/vs2019win7/OpenMPT-ANSI.vcxproj	Thu Sep 19 13:27:30 2024	(r21615)
+++ trunk/OpenMPT/build/vs2019win7/OpenMPT-ANSI.vcxproj	Thu Sep 19 14:30:47 2024	(r21616)
@@ -835,6 +835,7 @@
     <ClInclude Include="..\..\mptrack\Ctrl_pat.h" />
     <ClInclude Include="..\..\mptrack\Ctrl_smp.h" />
     <ClInclude Include="..\..\mptrack\DefaultVstEditor.h" />
+    <ClInclude Include="..\..\mptrack\DialogBase.h" />
     <ClInclude Include="..\..\mptrack\EffectInfo.h" />
     <ClInclude Include="..\..\mptrack\EffectVis.h" />
     <ClInclude Include="..\..\mptrack\ExceptionHandler.h" />
@@ -1275,6 +1276,7 @@
     <ClCompile Include="..\..\mptrack\Ctrl_seq.cpp" />
     <ClCompile Include="..\..\mptrack\Ctrl_smp.cpp" />
     <ClCompile Include="..\..\mptrack\DefaultVstEditor.cpp" />
+    <ClCompile Include="..\..\mptrack\DialogBase.cpp" />
     <ClCompile Include="..\..\mptrack\Draw_pat.cpp" />
     <ClCompile Include="..\..\mptrack\EffectInfo.cpp" />
     <ClCompile Include="..\..\mptrack\EffectVis.cpp" />

Modified: trunk/OpenMPT/build/vs2019win7/OpenMPT-ANSI.vcxproj.filters
==============================================================================
--- trunk/OpenMPT/build/vs2019win7/OpenMPT-ANSI.vcxproj.filters	Thu Sep 19 13:27:30 2024	(r21615)
+++ trunk/OpenMPT/build/vs2019win7/OpenMPT-ANSI.vcxproj.filters	Thu Sep 19 14:30:47 2024	(r21616)
@@ -453,6 +453,9 @@
     <ClInclude Include="..\..\mptrack\DefaultVstEditor.h">
       <Filter>mptrack</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\mptrack\DialogBase.h">
+      <Filter>mptrack</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\mptrack\EffectInfo.h">
       <Filter>mptrack</Filter>
     </ClInclude>
@@ -1769,6 +1772,9 @@
     <ClCompile Include="..\..\mptrack\DefaultVstEditor.cpp">
       <Filter>mptrack</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\mptrack\DialogBase.cpp">
+      <Filter>mptrack</Filter>
+    </ClCompile>
     <ClCompile Include="..\..\mptrack\Draw_pat.cpp">
       <Filter>mptrack</Filter>
     </ClCompile>

Modified: trunk/OpenMPT/build/vs2019win7/OpenMPT-UTF8.vcxproj
==============================================================================
--- trunk/OpenMPT/build/vs2019win7/OpenMPT-UTF8.vcxproj	Thu Sep 19 13:27:30 2024	(r21615)
+++ trunk/OpenMPT/build/vs2019win7/OpenMPT-UTF8.vcxproj	Thu Sep 19 14:30:47 2024	(r21616)
@@ -835,6 +835,7 @@
     <ClInclude Include="..\..\mptrack\Ctrl_pat.h" />
     <ClInclude Include="..\..\mptrack\Ctrl_smp.h" />
     <ClInclude Include="..\..\mptrack\DefaultVstEditor.h" />
+    <ClInclude Include="..\..\mptrack\DialogBase.h" />
     <ClInclude Include="..\..\mptrack\EffectInfo.h" />
     <ClInclude Include="..\..\mptrack\EffectVis.h" />
     <ClInclude Include="..\..\mptrack\ExceptionHandler.h" />
@@ -1275,6 +1276,7 @@
     <ClCompile Include="..\..\mptrack\Ctrl_seq.cpp" />
     <ClCompile Include="..\..\mptrack\Ctrl_smp.cpp" />
     <ClCompile Include="..\..\mptrack\DefaultVstEditor.cpp" />
+    <ClCompile Include="..\..\mptrack\DialogBase.cpp" />
     <ClCompile Include="..\..\mptrack\Draw_pat.cpp" />
     <ClCompile Include="..\..\mptrack\EffectInfo.cpp" />
     <ClCompile Include="..\..\mptrack\EffectVis.cpp" />

Modified: trunk/OpenMPT/build/vs2019win7/OpenMPT-UTF8.vcxproj.filters
==============================================================================
--- trunk/OpenMPT/build/vs2019win7/OpenMPT-UTF8.vcxproj.filters	Thu Sep 19 13:27:30 2024	(r21615)
+++ trunk/OpenMPT/build/vs2019win7/OpenMPT-UTF8.vcxproj.filters	Thu Sep 19 14:30:47 2024	(r21616)
@@ -453,6 +453,9 @@
     <ClInclude Include="..\..\mptrack\DefaultVstEditor.h">
       <Filter>mptrack</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\mptrack\DialogBase.h">
+      <Filter>mptrack</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\mptrack\EffectInfo.h">
       <Filter>mptrack</Filter>
     </ClInclude>
@@ -1769,6 +1772,9 @@
     <ClCompile Include="..\..\mptrack\DefaultVstEditor.cpp">
       <Filter>mptrack</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\mptrack\DialogBase.cpp">
+      <Filter>mptrack</Filter>
+    </ClCompile>
     <ClCompile Include="..\..\mptrack\Draw_pat.cpp">
       <Filter>mptrack</Filter>
     </ClCompile>

Modified: trunk/OpenMPT/build/vs2019win7/OpenMPT.vcxproj
==============================================================================
--- trunk/OpenMPT/build/vs2019win7/OpenMPT.vcxproj	Thu Sep 19 13:27:30 2024	(r21615)
+++ trunk/OpenMPT/build/vs2019win7/OpenMPT.vcxproj	Thu Sep 19 14:30:47 2024	(r21616)
@@ -835,6 +835,7 @@
     <ClInclude Include="..\..\mptrack\Ctrl_pat.h" />
     <ClInclude Include="..\..\mptrack\Ctrl_smp.h" />
     <ClInclude Include="..\..\mptrack\DefaultVstEditor.h" />
+    <ClInclude Include="..\..\mptrack\DialogBase.h" />
     <ClInclude Include="..\..\mptrack\EffectInfo.h" />
     <ClInclude Include="..\..\mptrack\EffectVis.h" />
     <ClInclude Include="..\..\mptrack\ExceptionHandler.h" />
@@ -1275,6 +1276,7 @@
     <ClCompile Include="..\..\mptrack\Ctrl_seq.cpp" />
     <ClCompile Include="..\..\mptrack\Ctrl_smp.cpp" />
     <ClCompile Include="..\..\mptrack\DefaultVstEditor.cpp" />
+    <ClCompile Include="..\..\mptrack\DialogBase.cpp" />
     <ClCompile Include="..\..\mptrack\Draw_pat.cpp" />
     <ClCompile Include="..\..\mptrack\EffectInfo.cpp" />
     <ClCompile Include="..\..\mptrack\EffectVis.cpp" />

Modified: trunk/OpenMPT/build/vs2019win7/OpenMPT.vcxproj.filters
==============================================================================
--- trunk/OpenMPT/build/vs2019win7/OpenMPT.vcxproj.filters	Thu Sep 19 13:27:30 2024	(r21615)
+++ trunk/OpenMPT/build/vs2019win7/OpenMPT.vcxproj.filters	Thu Sep 19 14:30:47 2024	(r21616)
@@ -453,6 +453,9 @@
     <ClInclude Include="..\..\mptrack\DefaultVstEditor.h">
       <Filter>mptrack</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\mptrack\DialogBase.h">
+      <Filter>mptrack</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\mptrack\EffectInfo.h">
       <Filter>mptrack</Filter>
     </ClInclude>
@@ -1769,6 +1772,9 @@
     <ClCompile Include="..\..\mptrack\DefaultVstEditor.cpp">
       <Filter>mptrack</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\mptrack\DialogBase.cpp">
+      <Filter>mptrack</Filter>
+    </ClCompile>
     <ClCompile Include="..\..\mptrack\Draw_pat.cpp">
       <Filter>mptrack</Filter>
     </ClCompile>

Modified: trunk/OpenMPT/build/vs2022win10/OpenMPT-ANSI.vcxproj
==============================================================================
--- trunk/OpenMPT/build/vs2022win10/OpenMPT-ANSI.vcxproj	Thu Sep 19 13:27:30 2024	(r21615)
+++ trunk/OpenMPT/build/vs2022win10/OpenMPT-ANSI.vcxproj	Thu Sep 19 14:30:47 2024	(r21616)
@@ -1649,6 +1649,7 @@
     <ClInclude Include="..\..\mptrack\Ctrl_pat.h" />
     <ClInclude Include="..\..\mptrack\Ctrl_smp.h" />
     <ClInclude Include="..\..\mptrack\DefaultVstEditor.h" />
+    <ClInclude Include="..\..\mptrack\DialogBase.h" />
     <ClInclude Include="..\..\mptrack\EffectInfo.h" />
     <ClInclude Include="..\..\mptrack\EffectVis.h" />
     <ClInclude Include="..\..\mptrack\ExceptionHandler.h" />
@@ -2089,6 +2090,7 @@
     <ClCompile Include="..\..\mptrack\Ctrl_seq.cpp" />
     <ClCompile Include="..\..\mptrack\Ctrl_smp.cpp" />
     <ClCompile Include="..\..\mptrack\DefaultVstEditor.cpp" />
+    <ClCompile Include="..\..\mptrack\DialogBase.cpp" />
     <ClCompile Include="..\..\mptrack\Draw_pat.cpp" />
     <ClCompile Include="..\..\mptrack\EffectInfo.cpp" />
     <ClCompile Include="..\..\mptrack\EffectVis.cpp" />

Modified: trunk/OpenMPT/build/vs2022win10/OpenMPT-ANSI.vcxproj.filters
==============================================================================
--- trunk/OpenMPT/build/vs2022win10/OpenMPT-ANSI.vcxproj.filters	Thu Sep 19 13:27:30 2024	(r21615)
+++ trunk/OpenMPT/build/vs2022win10/OpenMPT-ANSI.vcxproj.filters	Thu Sep 19 14:30:47 2024	(r21616)
@@ -453,6 +453,9 @@
     <ClInclude Include="..\..\mptrack\DefaultVstEditor.h">
       <Filter>mptrack</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\mptrack\DialogBase.h">
+      <Filter>mptrack</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\mptrack\EffectInfo.h">
       <Filter>mptrack</Filter>
     </ClInclude>
@@ -1769,6 +1772,9 @@
     <ClCompile Include="..\..\mptrack\DefaultVstEditor.cpp">
       <Filter>mptrack</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\mptrack\DialogBase.cpp">
+      <Filter>mptrack</Filter>
+    </ClCompile>
     <ClCompile Include="..\..\mptrack\Draw_pat.cpp">
       <Filter>mptrack</Filter>
     </ClCompile>

Modified: trunk/OpenMPT/build/vs2022win10/OpenMPT-UTF8.vcxproj
==============================================================================
--- trunk/OpenMPT/build/vs2022win10/OpenMPT-UTF8.vcxproj	Thu Sep 19 13:27:30 2024	(r21615)
+++ trunk/OpenMPT/build/vs2022win10/OpenMPT-UTF8.vcxproj	Thu Sep 19 14:30:47 2024	(r21616)
@@ -1649,6 +1649,7 @@
     <ClInclude Include="..\..\mptrack\Ctrl_pat.h" />
     <ClInclude Include="..\..\mptrack\Ctrl_smp.h" />
     <ClInclude Include="..\..\mptrack\DefaultVstEditor.h" />
+    <ClInclude Include="..\..\mptrack\DialogBase.h" />
     <ClInclude Include="..\..\mptrack\EffectInfo.h" />
     <ClInclude Include="..\..\mptrack\EffectVis.h" />
     <ClInclude Include="..\..\mptrack\ExceptionHandler.h" />
@@ -2089,6 +2090,7 @@
     <ClCompile Include="..\..\mptrack\Ctrl_seq.cpp" />
     <ClCompile Include="..\..\mptrack\Ctrl_smp.cpp" />
     <ClCompile Include="..\..\mptrack\DefaultVstEditor.cpp" />
+    <ClCompile Include="..\..\mptrack\DialogBase.cpp" />
     <ClCompile Include="..\..\mptrack\Draw_pat.cpp" />
     <ClCompile Include="..\..\mptrack\EffectInfo.cpp" />
     <ClCompile Include="..\..\mptrack\EffectVis.cpp" />

Modified: trunk/OpenMPT/build/vs2022win10/OpenMPT-UTF8.vcxproj.filters
==============================================================================
--- trunk/OpenMPT/build/vs2022win10/OpenMPT-UTF8.vcxproj.filters	Thu Sep 19 13:27:30 2024	(r21615)
+++ trunk/OpenMPT/build/vs2022win10/OpenMPT-UTF8.vcxproj.filters	Thu Sep 19 14:30:47 2024	(r21616)
@@ -453,6 +453,9 @@
     <ClInclude Include="..\..\mptrack\DefaultVstEditor.h">
       <Filter>mptrack</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\mptrack\DialogBase.h">
+      <Filter>mptrack</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\mptrack\EffectInfo.h">
       <Filter>mptrack</Filter>
     </ClInclude>
@@ -1769,6 +1772,9 @@
     <ClCompile Include="..\..\mptrack\DefaultVstEditor.cpp">
       <Filter>mptrack</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\mptrack\DialogBase.cpp">
+      <Filter>mptrack</Filter>
+    </ClCompile>
     <ClCompile Include="..\..\mptrack\Draw_pat.cpp">
       <Filter>mptrack</Filter>
     </ClCompile>

Modified: trunk/OpenMPT/build/vs2022win10/OpenMPT.vcxproj
==============================================================================
--- trunk/OpenMPT/build/vs2022win10/OpenMPT.vcxproj	Thu Sep 19 13:27:30 2024	(r21615)
+++ trunk/OpenMPT/build/vs2022win10/OpenMPT.vcxproj	Thu Sep 19 14:30:47 2024	(r21616)
@@ -1649,6 +1649,7 @@
     <ClInclude Include="..\..\mptrack\Ctrl_pat.h" />
     <ClInclude Include="..\..\mptrack\Ctrl_smp.h" />
     <ClInclude Include="..\..\mptrack\DefaultVstEditor.h" />
+    <ClInclude Include="..\..\mptrack\DialogBase.h" />
     <ClInclude Include="..\..\mptrack\EffectInfo.h" />
     <ClInclude Include="..\..\mptrack\EffectVis.h" />
     <ClInclude Include="..\..\mptrack\ExceptionHandler.h" />
@@ -2089,6 +2090,7 @@
     <ClCompile Include="..\..\mptrack\Ctrl_seq.cpp" />
     <ClCompile Include="..\..\mptrack\Ctrl_smp.cpp" />
     <ClCompile Include="..\..\mptrack\DefaultVstEditor.cpp" />
+    <ClCompile Include="..\..\mptrack\DialogBase.cpp" />
     <ClCompile Include="..\..\mptrack\Draw_pat.cpp" />
     <ClCompile Include="..\..\mptrack\EffectInfo.cpp" />
     <ClCompile Include="..\..\mptrack\EffectVis.cpp" />

Modified: trunk/OpenMPT/build/vs2022win10/OpenMPT.vcxproj.filters
==============================================================================
--- trunk/OpenMPT/build/vs2022win10/OpenMPT.vcxproj.filters	Thu Sep 19 13:27:30 2024	(r21615)
+++ trunk/OpenMPT/build/vs2022win10/OpenMPT.vcxproj.filters	Thu Sep 19 14:30:47 2024	(r21616)
@@ -453,6 +453,9 @@
     <ClInclude Include="..\..\mptrack\DefaultVstEditor.h">
       <Filter>mptrack</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\mptrack\DialogBase.h">
+      <Filter>mptrack</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\mptrack\EffectInfo.h">
       <Filter>mptrack</Filter>
     </ClInclude>
@@ -1769,6 +1772,9 @@
     <ClCompile Include="..\..\mptrack\DefaultVstEditor.cpp">
       <Filter>mptrack</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\mptrack\DialogBase.cpp">
+      <Filter>mptrack</Filter>
+    </ClCompile>
     <ClCompile Include="..\..\mptrack\Draw_pat.cpp">
       <Filter>mptrack</Filter>
     </ClCompile>

Modified: trunk/OpenMPT/build/vs2022win10clang/OpenMPT-ANSI.vcxproj
==============================================================================
--- trunk/OpenMPT/build/vs2022win10clang/OpenMPT-ANSI.vcxproj	Thu Sep 19 13:27:30 2024	(r21615)
+++ trunk/OpenMPT/build/vs2022win10clang/OpenMPT-ANSI.vcxproj	Thu Sep 19 14:30:47 2024	(r21616)
@@ -1605,6 +1605,7 @@
     <ClInclude Include="..\..\mptrack\Ctrl_pat.h" />
     <ClInclude Include="..\..\mptrack\Ctrl_smp.h" />
     <ClInclude Include="..\..\mptrack\DefaultVstEditor.h" />
+    <ClInclude Include="..\..\mptrack\DialogBase.h" />
     <ClInclude Include="..\..\mptrack\EffectInfo.h" />
     <ClInclude Include="..\..\mptrack\EffectVis.h" />
     <ClInclude Include="..\..\mptrack\ExceptionHandler.h" />
@@ -2045,6 +2046,7 @@
     <ClCompile Include="..\..\mptrack\Ctrl_seq.cpp" />
     <ClCompile Include="..\..\mptrack\Ctrl_smp.cpp" />
     <ClCompile Include="..\..\mptrack\DefaultVstEditor.cpp" />
+    <ClCompile Include="..\..\mptrack\DialogBase.cpp" />
     <ClCompile Include="..\..\mptrack\Draw_pat.cpp" />
     <ClCompile Include="..\..\mptrack\EffectInfo.cpp" />
     <ClCompile Include="..\..\mptrack\EffectVis.cpp" />

Modified: trunk/OpenMPT/build/vs2022win10clang/OpenMPT-ANSI.vcxproj.filters
==============================================================================
--- trunk/OpenMPT/build/vs2022win10clang/OpenMPT-ANSI.vcxproj.filters	Thu Sep 19 13:27:30 2024	(r21615)
+++ trunk/OpenMPT/build/vs2022win10clang/OpenMPT-ANSI.vcxproj.filters	Thu Sep 19 14:30:47 2024	(r21616)
@@ -411,6 +411,9 @@
     <ClInclude Include="..\..\mptrack\DefaultVstEditor.h">
       <Filter>mptrack</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\mptrack\DialogBase.h">
+      <Filter>mptrack</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\mptrack\EffectInfo.h">
       <Filter>mptrack</Filter>
     </ClInclude>
@@ -1727,6 +1730,9 @@
     <ClCompile Include="..\..\mptrack\DefaultVstEditor.cpp">
       <Filter>mptrack</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\mptrack\DialogBase.cpp">
+      <Filter>mptrack</Filter>
+    </ClCompile>
     <ClCompile Include="..\..\mptrack\Draw_pat.cpp">
       <Filter>mptrack</Filter>
     </ClCompile>

Modified: trunk/OpenMPT/build/vs2022win10clang/OpenMPT-UTF8.vcxproj
==============================================================================
--- trunk/OpenMPT/build/vs2022win10clang/OpenMPT-UTF8.vcxproj	Thu Sep 19 13:27:30 2024	(r21615)
+++ trunk/OpenMPT/build/vs2022win10clang/OpenMPT-UTF8.vcxproj	Thu Sep 19 14:30:47 2024	(r21616)
@@ -1605,6 +1605,7 @@
     <ClInclude Include="..\..\mptrack\Ctrl_pat.h" />
     <ClInclude Include="..\..\mptrack\Ctrl_smp.h" />
     <ClInclude Include="..\..\mptrack\DefaultVstEditor.h" />
+    <ClInclude Include="..\..\mptrack\DialogBase.h" />
     <ClInclude Include="..\..\mptrack\EffectInfo.h" />
     <ClInclude Include="..\..\mptrack\EffectVis.h" />
     <ClInclude Include="..\..\mptrack\ExceptionHandler.h" />
@@ -2045,6 +2046,7 @@
     <ClCompile Include="..\..\mptrack\Ctrl_seq.cpp" />
     <ClCompile Include="..\..\mptrack\Ctrl_smp.cpp" />
     <ClCompile Include="..\..\mptrack\DefaultVstEditor.cpp" />
+    <ClCompile Include="..\..\mptrack\DialogBase.cpp" />
     <ClCompile Include="..\..\mptrack\Draw_pat.cpp" />
     <ClCompile Include="..\..\mptrack\EffectInfo.cpp" />
     <ClCompile Include="..\..\mptrack\EffectVis.cpp" />

Modified: trunk/OpenMPT/build/vs2022win10clang/OpenMPT-UTF8.vcxproj.filters
==============================================================================
--- trunk/OpenMPT/build/vs2022win10clang/OpenMPT-UTF8.vcxproj.filters	Thu Sep 19 13:27:30 2024	(r21615)
+++ trunk/OpenMPT/build/vs2022win10clang/OpenMPT-UTF8.vcxproj.filters	Thu Sep 19 14:30:47 2024	(r21616)
@@ -411,6 +411,9 @@
     <ClInclude Include="..\..\mptrack\DefaultVstEditor.h">
       <Filter>mptrack</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\mptrack\DialogBase.h">
+      <Filter>mptrack</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\mptrack\EffectInfo.h">
       <Filter>mptrack</Filter>
     </ClInclude>
@@ -1727,6 +1730,9 @@
     <ClCompile Include="..\..\mptrack\DefaultVstEditor.cpp">
       <Filter>mptrack</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\mptrack\DialogBase.cpp">
+      <Filter>mptrack</Filter>
+    </ClCompile>
     <ClCompile Include="..\..\mptrack\Draw_pat.cpp">
       <Filter>mptrack</Filter>
     </ClCompile>

Modified: trunk/OpenMPT/build/vs2022win10clang/OpenMPT.vcxproj
==============================================================================
--- trunk/OpenMPT/build/vs2022win10clang/OpenMPT.vcxproj	Thu Sep 19 13:27:30 2024	(r21615)
+++ trunk/OpenMPT/build/vs2022win10clang/OpenMPT.vcxproj	Thu Sep 19 14:30:47 2024	(r21616)
@@ -1605,6 +1605,7 @@
     <ClInclude Include="..\..\mptrack\Ctrl_pat.h" />
     <ClInclude Include="..\..\mptrack\Ctrl_smp.h" />
     <ClInclude Include="..\..\mptrack\DefaultVstEditor.h" />
+    <ClInclude Include="..\..\mptrack\DialogBase.h" />
     <ClInclude Include="..\..\mptrack\EffectInfo.h" />
     <ClInclude Include="..\..\mptrack\EffectVis.h" />
     <ClInclude Include="..\..\mptrack\ExceptionHandler.h" />
@@ -2045,6 +2046,7 @@
     <ClCompile Include="..\..\mptrack\Ctrl_seq.cpp" />
     <ClCompile Include="..\..\mptrack\Ctrl_smp.cpp" />
     <ClCompile Include="..\..\mptrack\DefaultVstEditor.cpp" />
+    <ClCompile Include="..\..\mptrack\DialogBase.cpp" />
     <ClCompile Include="..\..\mptrack\Draw_pat.cpp" />
     <ClCompile Include="..\..\mptrack\EffectInfo.cpp" />
     <ClCompile Include="..\..\mptrack\EffectVis.cpp" />

Modified: trunk/OpenMPT/build/vs2022win10clang/OpenMPT.vcxproj.filters
==============================================================================
--- trunk/OpenMPT/build/vs2022win10clang/OpenMPT.vcxproj.filters	Thu Sep 19 13:27:30 2024	(r21615)
+++ trunk/OpenMPT/build/vs2022win10clang/OpenMPT.vcxproj.filters	Thu Sep 19 14:30:47 2024	(r21616)
@@ -411,6 +411,9 @@
     <ClInclude Include="..\..\mptrack\DefaultVstEditor.h">
       <Filter>mptrack</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\mptrack\DialogBase.h">
+      <Filter>mptrack</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\mptrack\EffectInfo.h">
       <Filter>mptrack</Filter>
     </ClInclude>
@@ -1727,6 +1730,9 @@
     <ClCompile Include="..\..\mptrack\DefaultVstEditor.cpp">
       <Filter>mptrack</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\mptrack\DialogBase.cpp">
+      <Filter>mptrack</Filter>
+    </ClCompile>
     <ClCompile Include="..\..\mptrack\Draw_pat.cpp">
       <Filter>mptrack</Filter>
     </ClCompile>

Modified: trunk/OpenMPT/build/vs2022win7/OpenMPT-ANSI.vcxproj
==============================================================================
--- trunk/OpenMPT/build/vs2022win7/OpenMPT-ANSI.vcxproj	Thu Sep 19 13:27:30 2024	(r21615)
+++ trunk/OpenMPT/build/vs2022win7/OpenMPT-ANSI.vcxproj	Thu Sep 19 14:30:47 2024	(r21616)
@@ -855,6 +855,7 @@
     <ClInclude Include="..\..\mptrack\Ctrl_pat.h" />
     <ClInclude Include="..\..\mptrack\Ctrl_smp.h" />
     <ClInclude Include="..\..\mptrack\DefaultVstEditor.h" />
+    <ClInclude Include="..\..\mptrack\DialogBase.h" />
     <ClInclude Include="..\..\mptrack\EffectInfo.h" />
     <ClInclude Include="..\..\mptrack\EffectVis.h" />
     <ClInclude Include="..\..\mptrack\ExceptionHandler.h" />
@@ -1295,6 +1296,7 @@
     <ClCompile Include="..\..\mptrack\Ctrl_seq.cpp" />
     <ClCompile Include="..\..\mptrack\Ctrl_smp.cpp" />
     <ClCompile Include="..\..\mptrack\DefaultVstEditor.cpp" />
+    <ClCompile Include="..\..\mptrack\DialogBase.cpp" />
     <ClCompile Include="..\..\mptrack\Draw_pat.cpp" />
     <ClCompile Include="..\..\mptrack\EffectInfo.cpp" />
     <ClCompile Include="..\..\mptrack\EffectVis.cpp" />

Modified: trunk/OpenMPT/build/vs2022win7/OpenMPT-ANSI.vcxproj.filters
==============================================================================
--- trunk/OpenMPT/build/vs2022win7/OpenMPT-ANSI.vcxproj.filters	Thu Sep 19 13:27:30 2024	(r21615)
+++ trunk/OpenMPT/build/vs2022win7/OpenMPT-ANSI.vcxproj.filters	Thu Sep 19 14:30:47 2024	(r21616)
@@ -453,6 +453,9 @@
     <ClInclude Include="..\..\mptrack\DefaultVstEditor.h">
       <Filter>mptrack</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\mptrack\DialogBase.h">
+      <Filter>mptrack</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\mptrack\EffectInfo.h">
       <Filter>mptrack</Filter>
     </ClInclude>
@@ -1769,6 +1772,9 @@
     <ClCompile Include="..\..\mptrack\DefaultVstEditor.cpp">
       <Filter>mptrack</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\mptrack\DialogBase.cpp">
+      <Filter>mptrack</Filter>
+    </ClCompile>
     <ClCompile Include="..\..\mptrack\Draw_pat.cpp">
       <Filter>mptrack</Filter>
     </ClCompile>

Modified: trunk/OpenMPT/build/vs2022win7/OpenMPT-UTF8.vcxproj
==============================================================================
--- trunk/OpenMPT/build/vs2022win7/OpenMPT-UTF8.vcxproj	Thu Sep 19 13:27:30 2024	(r21615)
+++ trunk/OpenMPT/build/vs2022win7/OpenMPT-UTF8.vcxproj	Thu Sep 19 14:30:47 2024	(r21616)
@@ -855,6 +855,7 @@
     <ClInclude Include="..\..\mptrack\Ctrl_pat.h" />
     <ClInclude Include="..\..\mptrack\Ctrl_smp.h" />
     <ClInclude Include="..\..\mptrack\DefaultVstEditor.h" />
+    <ClInclude Include="..\..\mptrack\DialogBase.h" />
     <ClInclude Include="..\..\mptrack\EffectInfo.h" />
     <ClInclude Include="..\..\mptrack\EffectVis.h" />
     <ClInclude Include="..\..\mptrack\ExceptionHandler.h" />
@@ -1295,6 +1296,7 @@
     <ClCompile Include="..\..\mptrack\Ctrl_seq.cpp" />
     <ClCompile Include="..\..\mptrack\Ctrl_smp.cpp" />
     <ClCompile Include="..\..\mptrack\DefaultVstEditor.cpp" />
+    <ClCompile Include="..\..\mptrack\DialogBase.cpp" />
     <ClCompile Include="..\..\mptrack\Draw_pat.cpp" />
     <ClCompile Include="..\..\mptrack\EffectInfo.cpp" />
     <ClCompile Include="..\..\mptrack\EffectVis.cpp" />

Modified: trunk/OpenMPT/build/vs2022win7/OpenMPT-UTF8.vcxproj.filters
==============================================================================
--- trunk/OpenMPT/build/vs2022win7/OpenMPT-UTF8.vcxproj.filters	Thu Sep 19 13:27:30 2024	(r21615)
+++ trunk/OpenMPT/build/vs2022win7/OpenMPT-UTF8.vcxproj.filters	Thu Sep 19 14:30:47 2024	(r21616)
@@ -453,6 +453,9 @@
     <ClInclude Include="..\..\mptrack\DefaultVstEditor.h">
       <Filter>mptrack</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\mptrack\DialogBase.h">
+      <Filter>mptrack</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\mptrack\EffectInfo.h">
       <Filter>mptrack</Filter>
     </ClInclude>
@@ -1769,6 +1772,9 @@
     <ClCompile Include="..\..\mptrack\DefaultVstEditor.cpp">
       <Filter>mptrack</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\mptrack\DialogBase.cpp">
+      <Filter>mptrack</Filter>
+    </ClCompile>
     <ClCompile Include="..\..\mptrack\Draw_pat.cpp">
       <Filter>mptrack</Filter>
     </ClCompile>

Modified: trunk/OpenMPT/build/vs2022win7/OpenMPT.vcxproj
==============================================================================
--- trunk/OpenMPT/build/vs2022win7/OpenMPT.vcxproj	Thu Sep 19 13:27:30 2024	(r21615)
+++ trunk/OpenMPT/build/vs2022win7/OpenMPT.vcxproj	Thu Sep 19 14:30:47 2024	(r21616)
@@ -855,6 +855,7 @@
     <ClInclude Include="..\..\mptrack\Ctrl_pat.h" />
     <ClInclude Include="..\..\mptrack\Ctrl_smp.h" />
     <ClInclude Include="..\..\mptrack\DefaultVstEditor.h" />
+    <ClInclude Include="..\..\mptrack\DialogBase.h" />
     <ClInclude Include="..\..\mptrack\EffectInfo.h" />
     <ClInclude Include="..\..\mptrack\EffectVis.h" />
     <ClInclude Include="..\..\mptrack\ExceptionHandler.h" />
@@ -1295,6 +1296,7 @@
     <ClCompile Include="..\..\mptrack\Ctrl_seq.cpp" />
     <ClCompile Include="..\..\mptrack\Ctrl_smp.cpp" />
     <ClCompile Include="..\..\mptrack\DefaultVstEditor.cpp" />
+    <ClCompile Include="..\..\mptrack\DialogBase.cpp" />
     <ClCompile Include="..\..\mptrack\Draw_pat.cpp" />
     <ClCompile Include="..\..\mptrack\EffectInfo.cpp" />
     <ClCompile Include="..\..\mptrack\EffectVis.cpp" />

Modified: trunk/OpenMPT/build/vs2022win7/OpenMPT.vcxproj.filters
==============================================================================
--- trunk/OpenMPT/build/vs2022win7/OpenMPT.vcxproj.filters	Thu Sep 19 13:27:30 2024	(r21615)
+++ trunk/OpenMPT/build/vs2022win7/OpenMPT.vcxproj.filters	Thu Sep 19 14:30:47 2024	(r21616)
@@ -453,6 +453,9 @@
     <ClInclude Include="..\..\mptrack\DefaultVstEditor.h">
       <Filter>mptrack</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\mptrack\DialogBase.h">
+      <Filter>mptrack</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\mptrack\EffectInfo.h">
       <Filter>mptrack</Filter>
     </ClInclude>
@@ -1769,6 +1772,9 @@
     <ClCompile Include="..\..\mptrack\DefaultVstEditor.cpp">
       <Filter>mptrack</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\mptrack\DialogBase.cpp">
+      <Filter>mptrack</Filter>
+    </ClCompile>
     <ClCompile Include="..\..\mptrack\Draw_pat.cpp">
       <Filter>mptrack</Filter>
     </ClCompile>

Modified: trunk/OpenMPT/build/vs2022win8/OpenMPT-ANSI.vcxproj
==============================================================================
--- trunk/OpenMPT/build/vs2022win8/OpenMPT-ANSI.vcxproj	Thu Sep 19 13:27:30 2024	(r21615)
+++ trunk/OpenMPT/build/vs2022win8/OpenMPT-ANSI.vcxproj	Thu Sep 19 14:30:47 2024	(r21616)
@@ -1243,6 +1243,7 @@
     <ClInclude Include="..\..\mptrack\Ctrl_pat.h" />
     <ClInclude Include="..\..\mptrack\Ctrl_smp.h" />
     <ClInclude Include="..\..\mptrack\DefaultVstEditor.h" />
+    <ClInclude Include="..\..\mptrack\DialogBase.h" />
     <ClInclude Include="..\..\mptrack\EffectInfo.h" />
     <ClInclude Include="..\..\mptrack\EffectVis.h" />
     <ClInclude Include="..\..\mptrack\ExceptionHandler.h" />
@@ -1683,6 +1684,7 @@
     <ClCompile Include="..\..\mptrack\Ctrl_seq.cpp" />
     <ClCompile Include="..\..\mptrack\Ctrl_smp.cpp" />
     <ClCompile Include="..\..\mptrack\DefaultVstEditor.cpp" />
+    <ClCompile Include="..\..\mptrack\DialogBase.cpp" />
     <ClCompile Include="..\..\mptrack\Draw_pat.cpp" />
     <ClCompile Include="..\..\mptrack\EffectInfo.cpp" />
     <ClCompile Include="..\..\mptrack\EffectVis.cpp" />

Modified: trunk/OpenMPT/build/vs2022win8/OpenMPT-ANSI.vcxproj.filters
==============================================================================
--- trunk/OpenMPT/build/vs2022win8/OpenMPT-ANSI.vcxproj.filters	Thu Sep 19 13:27:30 2024	(r21615)
+++ trunk/OpenMPT/build/vs2022win8/OpenMPT-ANSI.vcxproj.filters	Thu Sep 19 14:30:47 2024	(r21616)
@@ -453,6 +453,9 @@
     <ClInclude Include="..\..\mptrack\DefaultVstEditor.h">
       <Filter>mptrack</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\mptrack\DialogBase.h">
+      <Filter>mptrack</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\mptrack\EffectInfo.h">
       <Filter>mptrack</Filter>
     </ClInclude>
@@ -1769,6 +1772,9 @@
     <ClCompile Include="..\..\mptrack\DefaultVstEditor.cpp">
       <Filter>mptrack</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\mptrack\DialogBase.cpp">
+      <Filter>mptrack</Filter>
+    </ClCompile>
     <ClCompile Include="..\..\mptrack\Draw_pat.cpp">
       <Filter>mptrack</Filter>
     </ClCompile>

Modified: trunk/OpenMPT/build/vs2022win8/OpenMPT-UTF8.vcxproj
==============================================================================
--- trunk/OpenMPT/build/vs2022win8/OpenMPT-UTF8.vcxproj	Thu Sep 19 13:27:30 2024	(r21615)
+++ trunk/OpenMPT/build/vs2022win8/OpenMPT-UTF8.vcxproj	Thu Sep 19 14:30:47 2024	(r21616)
@@ -1243,6 +1243,7 @@
     <ClInclude Include="..\..\mptrack\Ctrl_pat.h" />
     <ClInclude Include="..\..\mptrack\Ctrl_smp.h" />
     <ClInclude Include="..\..\mptrack\DefaultVstEditor.h" />
+    <ClInclude Include="..\..\mptrack\DialogBase.h" />
     <ClInclude Include="..\..\mptrack\EffectInfo.h" />
     <ClInclude Include="..\..\mptrack\EffectVis.h" />
     <ClInclude Include="..\..\mptrack\ExceptionHandler.h" />
@@ -1683,6 +1684,7 @@
     <ClCompile Include="..\..\mptrack\Ctrl_seq.cpp" />
     <ClCompile Include="..\..\mptrack\Ctrl_smp.cpp" />
     <ClCompile Include="..\..\mptrack\DefaultVstEditor.cpp" />
+    <ClCompile Include="..\..\mptrack\DialogBase.cpp" />
     <ClCompile Include="..\..\mptrack\Draw_pat.cpp" />
     <ClCompile Include="..\..\mptrack\EffectInfo.cpp" />
     <ClCompile Include="..\..\mptrack\EffectVis.cpp" />

Modified: trunk/OpenMPT/build/vs2022win8/OpenMPT-UTF8.vcxproj.filters
==============================================================================
--- trunk/OpenMPT/build/vs2022win8/OpenMPT-UTF8.vcxproj.filters	Thu Sep 19 13:27:30 2024	(r21615)
+++ trunk/OpenMPT/build/vs2022win8/OpenMPT-UTF8.vcxproj.filters	Thu Sep 19 14:30:47 2024	(r21616)
@@ -453,6 +453,9 @@
     <ClInclude Include="..\..\mptrack\DefaultVstEditor.h">
       <Filter>mptrack</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\mptrack\DialogBase.h">
+      <Filter>mptrack</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\mptrack\EffectInfo.h">
       <Filter>mptrack</Filter>
     </ClInclude>
@@ -1769,6 +1772,9 @@
     <ClCompile Include="..\..\mptrack\DefaultVstEditor.cpp">
       <Filter>mptrack</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\mptrack\DialogBase.cpp">
+      <Filter>mptrack</Filter>
+    </ClCompile>
     <ClCompile Include="..\..\mptrack\Draw_pat.cpp">
       <Filter>mptrack</Filter>
     </ClCompile>

Modified: trunk/OpenMPT/build/vs2022win8/OpenMPT.vcxproj
==============================================================================
--- trunk/OpenMPT/build/vs2022win8/OpenMPT.vcxproj	Thu Sep 19 13:27:30 2024	(r21615)
+++ trunk/OpenMPT/build/vs2022win8/OpenMPT.vcxproj	Thu Sep 19 14:30:47 2024	(r21616)
@@ -1243,6 +1243,7 @@
     <ClInclude Include="..\..\mptrack\Ctrl_pat.h" />
     <ClInclude Include="..\..\mptrack\Ctrl_smp.h" />
     <ClInclude Include="..\..\mptrack\DefaultVstEditor.h" />
+    <ClInclude Include="..\..\mptrack\DialogBase.h" />
     <ClInclude Include="..\..\mptrack\EffectInfo.h" />
     <ClInclude Include="..\..\mptrack\EffectVis.h" />
     <ClInclude Include="..\..\mptrack\ExceptionHandler.h" />
@@ -1683,6 +1684,7 @@
     <ClCompile Include="..\..\mptrack\Ctrl_seq.cpp" />
     <ClCompile Include="..\..\mptrack\Ctrl_smp.cpp" />
     <ClCompile Include="..\..\mptrack\DefaultVstEditor.cpp" />
+    <ClCompile Include="..\..\mptrack\DialogBase.cpp" />
     <ClCompile Include="..\..\mptrack\Draw_pat.cpp" />
     <ClCompile Include="..\..\mptrack\EffectInfo.cpp" />
     <ClCompile Include="..\..\mptrack\EffectVis.cpp" />

Modified: trunk/OpenMPT/build/vs2022win8/OpenMPT.vcxproj.filters
==============================================================================
--- trunk/OpenMPT/build/vs2022win8/OpenMPT.vcxproj.filters	Thu Sep 19 13:27:30 2024	(r21615)
+++ trunk/OpenMPT/build/vs2022win8/OpenMPT.vcxproj.filters	Thu Sep 19 14:30:47 2024	(r21616)
@@ -453,6 +453,9 @@
     <ClInclude Include="..\..\mptrack\DefaultVstEditor.h">
       <Filter>mptrack</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\mptrack\DialogBase.h">
+      <Filter>mptrack</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\mptrack\EffectInfo.h">
       <Filter>mptrack</Filter>
     </ClInclude>
@@ -1769,6 +1772,9 @@
     <ClCompile Include="..\..\mptrack\DefaultVstEditor.cpp">
       <Filter>mptrack</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\mptrack\DialogBase.cpp">
+      <Filter>mptrack</Filter>
+    </ClCompile>
     <ClCompile Include="..\..\mptrack\Draw_pat.cpp">
       <Filter>mptrack</Filter>
     </ClCompile>

Modified: trunk/OpenMPT/build/vs2022win81/OpenMPT-ANSI.vcxproj
==============================================================================
--- trunk/OpenMPT/build/vs2022win81/OpenMPT-ANSI.vcxproj	Thu Sep 19 13:27:30 2024	(r21615)
+++ trunk/OpenMPT/build/vs2022win81/OpenMPT-ANSI.vcxproj	Thu Sep 19 14:30:47 2024	(r21616)
@@ -1243,6 +1243,7 @@
     <ClInclude Include="..\..\mptrack\Ctrl_pat.h" />
     <ClInclude Include="..\..\mptrack\Ctrl_smp.h" />
     <ClInclude Include="..\..\mptrack\DefaultVstEditor.h" />
+    <ClInclude Include="..\..\mptrack\DialogBase.h" />
     <ClInclude Include="..\..\mptrack\EffectInfo.h" />
     <ClInclude Include="..\..\mptrack\EffectVis.h" />
     <ClInclude Include="..\..\mptrack\ExceptionHandler.h" />
@@ -1683,6 +1684,7 @@
     <ClCompile Include="..\..\mptrack\Ctrl_seq.cpp" />
     <ClCompile Include="..\..\mptrack\Ctrl_smp.cpp" />
     <ClCompile Include="..\..\mptrack\DefaultVstEditor.cpp" />
+    <ClCompile Include="..\..\mptrack\DialogBase.cpp" />
     <ClCompile Include="..\..\mptrack\Draw_pat.cpp" />
     <ClCompile Include="..\..\mptrack\EffectInfo.cpp" />
     <ClCompile Include="..\..\mptrack\EffectVis.cpp" />

Modified: trunk/OpenMPT/build/vs2022win81/OpenMPT-ANSI.vcxproj.filters
==============================================================================
--- trunk/OpenMPT/build/vs2022win81/OpenMPT-ANSI.vcxproj.filters	Thu Sep 19 13:27:30 2024	(r21615)
+++ trunk/OpenMPT/build/vs2022win81/OpenMPT-ANSI.vcxproj.filters	Thu Sep 19 14:30:47 2024	(r21616)
@@ -453,6 +453,9 @@
     <ClInclude Include="..\..\mptrack\DefaultVstEditor.h">
       <Filter>mptrack</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\mptrack\DialogBase.h">
+      <Filter>mptrack</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\mptrack\EffectInfo.h">
       <Filter>mptrack</Filter>
     </ClInclude>
@@ -1769,6 +1772,9 @@
     <ClCompile Include="..\..\mptrack\DefaultVstEditor.cpp">
       <Filter>mptrack</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\mptrack\DialogBase.cpp">
+      <Filter>mptrack</Filter>
+    </ClCompile>
     <ClCompile Include="..\..\mptrack\Draw_pat.cpp">
       <Filter>mptrack</Filter>
     </ClCompile>

Modified: trunk/OpenMPT/build/vs2022win81/OpenMPT-UTF8.vcxproj
==============================================================================
--- trunk/OpenMPT/build/vs2022win81/OpenMPT-UTF8.vcxproj	Thu Sep 19 13:27:30 2024	(r21615)
+++ trunk/OpenMPT/build/vs2022win81/OpenMPT-UTF8.vcxproj	Thu Sep 19 14:30:47 2024	(r21616)
@@ -1243,6 +1243,7 @@
     <ClInclude Include="..\..\mptrack\Ctrl_pat.h" />
     <ClInclude Include="..\..\mptrack\Ctrl_smp.h" />
     <ClInclude Include="..\..\mptrack\DefaultVstEditor.h" />
+    <ClInclude Include="..\..\mptrack\DialogBase.h" />
     <ClInclude Include="..\..\mptrack\EffectInfo.h" />
     <ClInclude Include="..\..\mptrack\EffectVis.h" />
     <ClInclude Include="..\..\mptrack\ExceptionHandler.h" />
@@ -1683,6 +1684,7 @@
     <ClCompile Include="..\..\mptrack\Ctrl_seq.cpp" />
     <ClCompile Include="..\..\mptrack\Ctrl_smp.cpp" />
     <ClCompile Include="..\..\mptrack\DefaultVstEditor.cpp" />
+    <ClCompile Include="..\..\mptrack\DialogBase.cpp" />
     <ClCompile Include="..\..\mptrack\Draw_pat.cpp" />
     <ClCompile Include="..\..\mptrack\EffectInfo.cpp" />
     <ClCompile Include="..\..\mptrack\EffectVis.cpp" />

Modified: trunk/OpenMPT/build/vs2022win81/OpenMPT-UTF8.vcxproj.filters
==============================================================================
--- trunk/OpenMPT/build/vs2022win81/OpenMPT-UTF8.vcxproj.filters	Thu Sep 19 13:27:30 2024	(r21615)
+++ trunk/OpenMPT/build/vs2022win81/OpenMPT-UTF8.vcxproj.filters	Thu Sep 19 14:30:47 2024	(r21616)
@@ -453,6 +453,9 @@
     <ClInclude Include="..\..\mptrack\DefaultVstEditor.h">
       <Filter>mptrack</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\mptrack\DialogBase.h">
+      <Filter>mptrack</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\mptrack\EffectInfo.h">
       <Filter>mptrack</Filter>
     </ClInclude>
@@ -1769,6 +1772,9 @@
     <ClCompile Include="..\..\mptrack\DefaultVstEditor.cpp">
       <Filter>mptrack</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\mptrack\DialogBase.cpp">
+      <Filter>mptrack</Filter>
+    </ClCompile>
     <ClCompile Include="..\..\mptrack\Draw_pat.cpp">
       <Filter>mptrack</Filter>
     </ClCompile>

Modified: trunk/OpenMPT/build/vs2022win81/OpenMPT.vcxproj
==============================================================================
--- trunk/OpenMPT/build/vs2022win81/OpenMPT.vcxproj	Thu Sep 19 13:27:30 2024	(r21615)
+++ trunk/OpenMPT/build/vs2022win81/OpenMPT.vcxproj	Thu Sep 19 14:30:47 2024	(r21616)
@@ -1243,6 +1243,7 @@
     <ClInclude Include="..\..\mptrack\Ctrl_pat.h" />
     <ClInclude Include="..\..\mptrack\Ctrl_smp.h" />
     <ClInclude Include="..\..\mptrack\DefaultVstEditor.h" />
+    <ClInclude Include="..\..\mptrack\DialogBase.h" />
     <ClInclude Include="..\..\mptrack\EffectInfo.h" />
     <ClInclude Include="..\..\mptrack\EffectVis.h" />
     <ClInclude Include="..\..\mptrack\ExceptionHandler.h" />
@@ -1683,6 +1684,7 @@
     <ClCompile Include="..\..\mptrack\Ctrl_seq.cpp" />
     <ClCompile Include="..\..\mptrack\Ctrl_smp.cpp" />
     <ClCompile Include="..\..\mptrack\DefaultVstEditor.cpp" />
+    <ClCompile Include="..\..\mptrack\DialogBase.cpp" />
     <ClCompile Include="..\..\mptrack\Draw_pat.cpp" />
     <ClCompile Include="..\..\mptrack\EffectInfo.cpp" />
     <ClCompile Include="..\..\mptrack\EffectVis.cpp" />

Modified: trunk/OpenMPT/build/vs2022win81/OpenMPT.vcxproj.filters
==============================================================================
--- trunk/OpenMPT/build/vs2022win81/OpenMPT.vcxproj.filters	Thu Sep 19 13:27:30 2024	(r21615)
+++ trunk/OpenMPT/build/vs2022win81/OpenMPT.vcxproj.filters	Thu Sep 19 14:30:47 2024	(r21616)
@@ -453,6 +453,9 @@
     <ClInclude Include="..\..\mptrack\DefaultVstEditor.h">
       <Filter>mptrack</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\mptrack\DialogBase.h">
+      <Filter>mptrack</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\mptrack\EffectInfo.h">
       <Filter>mptrack</Filter>
     </ClInclude>
@@ -1769,6 +1772,9 @@
     <ClCompile Include="..\..\mptrack\DefaultVstEditor.cpp">
       <Filter>mptrack</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\mptrack\DialogBase.cpp">
+      <Filter>mptrack</Filter>
+    </ClCompile>
     <ClCompile Include="..\..\mptrack\Draw_pat.cpp">
       <Filter>mptrack</Filter>
     </ClCompile>

Modified: trunk/OpenMPT/mptrack/AboutDialog.cpp
==============================================================================
--- trunk/OpenMPT/mptrack/AboutDialog.cpp	Thu Sep 19 13:27:30 2024	(r21615)
+++ trunk/OpenMPT/mptrack/AboutDialog.cpp	Thu Sep 19 14:30:47 2024	(r21616)
@@ -247,7 +247,7 @@
 
 BOOL CAboutDlg::OnInitDialog()
 {
-	CDialog::OnInitDialog();
+	DialogBase::OnInitDialog();
 
 	mpt::ustring app;
 	app += MPT_UFORMAT("OpenMPT{} ({} ({} bit))")(
@@ -573,13 +573,13 @@
 
 void CAboutDlg::DoDataExchange(CDataExchange* pDX)
 {
-	CDialog::DoDataExchange(pDX);
+	DialogBase::DoDataExchange(pDX);
 	DDX_Control(pDX, IDC_TABABOUT, m_Tab);
 	DDX_Control(pDX, IDC_EDITABOUT, m_TabEdit);
 }
 
 
-BEGIN_MESSAGE_MAP(CAboutDlg, CDialog)
+BEGIN_MESSAGE_MAP(CAboutDlg, DialogBase)
 	ON_WM_TIMER()
 	ON_NOTIFY(TCN_SELCHANGE, IDC_TABABOUT, &CAboutDlg::OnTabChange)
 END_MESSAGE_MAP()

Modified: trunk/OpenMPT/mptrack/AboutDialog.h
==============================================================================
--- trunk/OpenMPT/mptrack/AboutDialog.h	Thu ...
 
[truncated message content]

[OMPT-svn-commit] OpenMPT r21615 - in trunk/OpenMPT: . build/auto build/autotools

From: <sv...@op...> - 2024-09-19 11:27:39

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

Log:
[Ref] Align various text columns in packaging scripts for better readability.

Modified:
   trunk/OpenMPT/Makefile
   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/autotools/autoconfiscate.sh

Modified: trunk/OpenMPT/Makefile
==============================================================================
--- trunk/OpenMPT/Makefile	Thu Sep 19 13:26:08 2024	(r21614)
+++ trunk/OpenMPT/Makefile	Thu Sep 19 13:27:30 2024	(r21615)
@@ -1783,199 +1783,199 @@
 
 .PHONY: bin/$(FLAVOUR_DIR)dist-tar/libopenmpt-$(DIST_LIBOPENMPT_VERSION).makefile.tar
 bin/$(FLAVOUR_DIR)dist-tar/libopenmpt-$(DIST_LIBOPENMPT_VERSION).makefile.tar: bin/$(FLAVOUR_DIR)dist.mk bin/$(FLAVOUR_DIR)svn_version_dist.h
-	mkdir -p bin/$(FLAVOUR_DIR)dist-tar
-	rm -rf bin/$(FLAVOUR_DIR)dist-tar/libopenmpt-$(DIST_LIBOPENMPT_VERSION)
-	mkdir -p bin/$(FLAVOUR_DIR)dist-tar/libopenmpt-$(DIST_LIBOPENMPT_VERSION)
-	mkdir -p bin/$(FLAVOUR_DIR)dist-tar/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/build
-	mkdir -p bin/$(FLAVOUR_DIR)dist-tar/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/doc
-	mkdir -p bin/$(FLAVOUR_DIR)dist-tar/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/include
-	mkdir -p bin/$(FLAVOUR_DIR)dist-tar/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/src
-	mkdir -p bin/$(FLAVOUR_DIR)dist-tar/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/src/mpt
-	mkdir -p bin/$(FLAVOUR_DIR)dist-tar/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/src/openmpt
-	svn export ./LICENSE            bin/$(FLAVOUR_DIR)dist-tar/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/LICENSE
-	svn export ./README.md          bin/$(FLAVOUR_DIR)dist-tar/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/README.md
-	svn export ./Makefile           bin/$(FLAVOUR_DIR)dist-tar/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/Makefile
-	svn export ./.clang-format      bin/$(FLAVOUR_DIR)dist-tar/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/.clang-format
-	svn export ./bin                bin/$(FLAVOUR_DIR)dist-tar/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/bin
-	svn export ./build/download_externals.sh bin/$(FLAVOUR_DIR)dist-tar/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/build/download_externals.sh
-	svn export ./build/android_ndk  bin/$(FLAVOUR_DIR)dist-tar/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/build/android_ndk
-	svn export ./build/djgpp        bin/$(FLAVOUR_DIR)dist-tar/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/build/djgpp
-	svn export ./build/make         bin/$(FLAVOUR_DIR)dist-tar/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/build/make
-	svn export ./build/svn_version  bin/$(FLAVOUR_DIR)dist-tar/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/build/svn_version
-	svn export ./build/xcode-ios    bin/$(FLAVOUR_DIR)dist-tar/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/build/xcode-ios
-	svn export ./build/xcode-macosx bin/$(FLAVOUR_DIR)dist-tar/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/build/xcode-macosx
-	svn export ./common             bin/$(FLAVOUR_DIR)dist-tar/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/common
-	svn export ./doc/contributing.md          bin/$(FLAVOUR_DIR)dist-tar/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/doc/contributing.md
-	svn export ./doc/libopenmpt_styleguide.md bin/$(FLAVOUR_DIR)dist-tar/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/doc/libopenmpt_styleguide.md
-	svn export ./doc/module_formats.md        bin/$(FLAVOUR_DIR)dist-tar/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/doc/module_formats.md
-	svn export ./soundlib           bin/$(FLAVOUR_DIR)dist-tar/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/soundlib
-	svn export ./sounddsp           bin/$(FLAVOUR_DIR)dist-tar/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/sounddsp
-	svn export ./src/mpt/.clang-format bin/$(FLAVOUR_DIR)dist-tar/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/src/mpt/.clang-format
+	mkdir -p                                      bin/$(FLAVOUR_DIR)dist-tar
+	rm -rf                                        bin/$(FLAVOUR_DIR)dist-tar/libopenmpt-$(DIST_LIBOPENMPT_VERSION)
+	mkdir -p                                      bin/$(FLAVOUR_DIR)dist-tar/libopenmpt-$(DIST_LIBOPENMPT_VERSION)
+	mkdir -p                                      bin/$(FLAVOUR_DIR)dist-tar/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/build
+	mkdir -p                                      bin/$(FLAVOUR_DIR)dist-tar/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/doc
+	mkdir -p                                      bin/$(FLAVOUR_DIR)dist-tar/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/include
+	mkdir -p                                      bin/$(FLAVOUR_DIR)dist-tar/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/src
+	mkdir -p                                      bin/$(FLAVOUR_DIR)dist-tar/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/src/mpt
+	mkdir -p                                      bin/$(FLAVOUR_DIR)dist-tar/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/src/openmpt
+	svn export ./LICENSE                          bin/$(FLAVOUR_DIR)dist-tar/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/LICENSE
+	svn export ./README.md                        bin/$(FLAVOUR_DIR)dist-tar/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/README.md
+	svn export ./Makefile                         bin/$(FLAVOUR_DIR)dist-tar/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/Makefile
+	svn export ./.clang-format                    bin/$(FLAVOUR_DIR)dist-tar/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/.clang-format
+	svn export ./bin                              bin/$(FLAVOUR_DIR)dist-tar/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/bin
+	svn export ./build/download_externals.sh      bin/$(FLAVOUR_DIR)dist-tar/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/build/download_externals.sh
+	svn export ./build/android_ndk                bin/$(FLAVOUR_DIR)dist-tar/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/build/android_ndk
+	svn export ./build/djgpp                      bin/$(FLAVOUR_DIR)dist-tar/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/build/djgpp
+	svn export ./build/make                       bin/$(FLAVOUR_DIR)dist-tar/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/build/make
+	svn export ./build/svn_version                bin/$(FLAVOUR_DIR)dist-tar/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/build/svn_version
+	svn export ./build/xcode-ios                  bin/$(FLAVOUR_DIR)dist-tar/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/build/xcode-ios
+	svn export ./build/xcode-macosx               bin/$(FLAVOUR_DIR)dist-tar/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/build/xcode-macosx
+	svn export ./common                           bin/$(FLAVOUR_DIR)dist-tar/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/common
+	svn export ./doc/contributing.md              bin/$(FLAVOUR_DIR)dist-tar/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/doc/contributing.md
+	svn export ./doc/libopenmpt_styleguide.md     bin/$(FLAVOUR_DIR)dist-tar/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/doc/libopenmpt_styleguide.md
+	svn export ./doc/module_formats.md            bin/$(FLAVOUR_DIR)dist-tar/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/doc/module_formats.md
+	svn export ./soundlib                         bin/$(FLAVOUR_DIR)dist-tar/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/soundlib
+	svn export ./sounddsp                         bin/$(FLAVOUR_DIR)dist-tar/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/sounddsp
+	svn export ./src/mpt/.clang-format            bin/$(FLAVOUR_DIR)dist-tar/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/src/mpt/.clang-format
 	svn export ./src/mpt/LICENSE.BSD-3-Clause.txt bin/$(FLAVOUR_DIR)dist-tar/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/src/mpt/LICENSE.BSD-3-Clause.txt
-	svn export ./src/mpt/LICENSE.BSL-1.0.txt bin/$(FLAVOUR_DIR)dist-tar/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/src/mpt/LICENSE.BSL-1.0.txt
-	svn export ./src/mpt/arch           bin/$(FLAVOUR_DIR)dist-tar/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/src/mpt/arch
-	svn export ./src/mpt/audio          bin/$(FLAVOUR_DIR)dist-tar/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/src/mpt/audio
-	svn export ./src/mpt/base           bin/$(FLAVOUR_DIR)dist-tar/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/src/mpt/base
-	svn export ./src/mpt/binary         bin/$(FLAVOUR_DIR)dist-tar/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/src/mpt/binary
-	svn export ./src/mpt/check          bin/$(FLAVOUR_DIR)dist-tar/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/src/mpt/check
-	svn export ./src/mpt/crc            bin/$(FLAVOUR_DIR)dist-tar/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/src/mpt/crc
-	#svn export ./src/mpt/crypto         bin/$(FLAVOUR_DIR)dist-tar/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/src/mpt/crypto
-	svn export ./src/mpt/detect         bin/$(FLAVOUR_DIR)dist-tar/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/src/mpt/detect
-	svn export ./src/mpt/endian         bin/$(FLAVOUR_DIR)dist-tar/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/src/mpt/endian
-	svn export ./src/mpt/environment    bin/$(FLAVOUR_DIR)dist-tar/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/src/mpt/environment
-	svn export ./src/mpt/exception      bin/$(FLAVOUR_DIR)dist-tar/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/src/mpt/exception
-	svn export ./src/mpt/format         bin/$(FLAVOUR_DIR)dist-tar/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/src/mpt/format
-	#svn export ./src/mpt/fs             bin/$(FLAVOUR_DIR)dist-tar/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/src/mpt/fs
-	svn export ./src/mpt/io             bin/$(FLAVOUR_DIR)dist-tar/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/src/mpt/io
-	svn export ./src/mpt/io_file        bin/$(FLAVOUR_DIR)dist-tar/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/src/mpt/io_file
-	svn export ./src/mpt/io_file_adapter bin/$(FLAVOUR_DIR)dist-tar/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/src/mpt/io_file_adapter
-	svn export ./src/mpt/io_file_read   bin/$(FLAVOUR_DIR)dist-tar/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/src/mpt/io_file_read
-	svn export ./src/mpt/io_file_unique bin/$(FLAVOUR_DIR)dist-tar/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/src/mpt/io_file_unique
-	svn export ./src/mpt/io_read        bin/$(FLAVOUR_DIR)dist-tar/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/src/mpt/io_read
-	svn export ./src/mpt/io_write       bin/$(FLAVOUR_DIR)dist-tar/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/src/mpt/io_write
-	#svn export ./src/mpt/json           bin/$(FLAVOUR_DIR)dist-tar/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/src/mpt/json
-	#svn export ./src/mpt/library        bin/$(FLAVOUR_DIR)dist-tar/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/src/mpt/library
-	svn export ./src/mpt/mutex          bin/$(FLAVOUR_DIR)dist-tar/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/src/mpt/mutex
-	svn export ./src/mpt/out_of_memory  bin/$(FLAVOUR_DIR)dist-tar/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/src/mpt/out_of_memory
-	svn export ./src/mpt/osinfo         bin/$(FLAVOUR_DIR)dist-tar/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/src/mpt/osinfo
-	svn export ./src/mpt/parse          bin/$(FLAVOUR_DIR)dist-tar/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/src/mpt/parse
-	svn export ./src/mpt/path           bin/$(FLAVOUR_DIR)dist-tar/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/src/mpt/path
-	svn export ./src/mpt/random         bin/$(FLAVOUR_DIR)dist-tar/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/src/mpt/random
-	svn export ./src/mpt/string         bin/$(FLAVOUR_DIR)dist-tar/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/src/mpt/string
-	svn export ./src/mpt/string_transcode bin/$(FLAVOUR_DIR)dist-tar/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/src/mpt/string_transcode
-	svn export ./src/mpt/system_error   bin/$(FLAVOUR_DIR)dist-tar/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/src/mpt/system_error
-	svn export ./src/mpt/test           bin/$(FLAVOUR_DIR)dist-tar/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/src/mpt/test
-	svn export ./src/mpt/uuid           bin/$(FLAVOUR_DIR)dist-tar/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/src/mpt/uuid
-	#svn export ./src/mpt/uuid_namespace bin/$(FLAVOUR_DIR)dist-tar/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/src/mpt/uuid_namespace
-	svn export ./src/openmpt/all        bin/$(FLAVOUR_DIR)dist-tar/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/src/openmpt/all
-	svn export ./src/openmpt/base       bin/$(FLAVOUR_DIR)dist-tar/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/src/openmpt/base
-	svn export ./src/openmpt/fileformat_base bin/$(FLAVOUR_DIR)dist-tar/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/src/openmpt/fileformat_base
-	svn export ./src/openmpt/logging    bin/$(FLAVOUR_DIR)dist-tar/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/src/openmpt/logging
-	svn export ./src/openmpt/random     bin/$(FLAVOUR_DIR)dist-tar/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/src/openmpt/random
-	svn export ./src/openmpt/soundbase  bin/$(FLAVOUR_DIR)dist-tar/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/src/openmpt/soundbase
-	svn export ./src/openmpt/soundfile_data  bin/$(FLAVOUR_DIR)dist-tar/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/src/openmpt/soundfile_data
-	svn export ./src/openmpt/soundfile_write bin/$(FLAVOUR_DIR)dist-tar/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/src/openmpt/soundfile_write
-	svn export ./test               bin/$(FLAVOUR_DIR)dist-tar/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/test
-	rm bin/$(FLAVOUR_DIR)dist-tar/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/test/mpt_tests_crypto.cpp
-	rm bin/$(FLAVOUR_DIR)dist-tar/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/test/mpt_tests_uuid_namespace.cpp
-	svn export ./libopenmpt         bin/$(FLAVOUR_DIR)dist-tar/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/libopenmpt
-	svn export ./examples           bin/$(FLAVOUR_DIR)dist-tar/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/examples
-	svn export ./openmpt123         bin/$(FLAVOUR_DIR)dist-tar/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/openmpt123
-	svn export ./contrib            bin/$(FLAVOUR_DIR)dist-tar/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/contrib
-	svn export ./include/allegro42  bin/$(FLAVOUR_DIR)dist-tar/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/include/allegro42
-	svn export ./include/cwsdpmi    bin/$(FLAVOUR_DIR)dist-tar/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/include/cwsdpmi
-	svn export ./include/minimp3    bin/$(FLAVOUR_DIR)dist-tar/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/include/minimp3
-	svn export ./include/miniz      bin/$(FLAVOUR_DIR)dist-tar/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/include/miniz
-	svn export ./include/stb_vorbis bin/$(FLAVOUR_DIR)dist-tar/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/include/stb_vorbis
-	cp bin/$(FLAVOUR_DIR)dist.mk bin/$(FLAVOUR_DIR)dist-tar/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/build/dist.mk
-	cp bin/$(FLAVOUR_DIR)svn_version_dist.h bin/$(FLAVOUR_DIR)dist-tar/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/build/svn_version/svn_version.h
+	svn export ./src/mpt/LICENSE.BSL-1.0.txt      bin/$(FLAVOUR_DIR)dist-tar/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/src/mpt/LICENSE.BSL-1.0.txt
+	svn export ./src/mpt/arch                     bin/$(FLAVOUR_DIR)dist-tar/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/src/mpt/arch
+	svn export ./src/mpt/audio                    bin/$(FLAVOUR_DIR)dist-tar/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/src/mpt/audio
+	svn export ./src/mpt/base                     bin/$(FLAVOUR_DIR)dist-tar/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/src/mpt/base
+	svn export ./src/mpt/binary                   bin/$(FLAVOUR_DIR)dist-tar/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/src/mpt/binary
+	svn export ./src/mpt/check                    bin/$(FLAVOUR_DIR)dist-tar/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/src/mpt/check
+	svn export ./src/mpt/crc                      bin/$(FLAVOUR_DIR)dist-tar/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/src/mpt/crc
+	#svn export ./src/mpt/crypto                   bin/$(FLAVOUR_DIR)dist-tar/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/src/mpt/crypto
+	svn export ./src/mpt/detect                   bin/$(FLAVOUR_DIR)dist-tar/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/src/mpt/detect
+	svn export ./src/mpt/endian                   bin/$(FLAVOUR_DIR)dist-tar/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/src/mpt/endian
+	svn export ./src/mpt/environment              bin/$(FLAVOUR_DIR)dist-tar/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/src/mpt/environment
+	svn export ./src/mpt/exception                bin/$(FLAVOUR_DIR)dist-tar/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/src/mpt/exception
+	svn export ./src/mpt/format                   bin/$(FLAVOUR_DIR)dist-tar/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/src/mpt/format
+	#svn export ./src/mpt/fs                       bin/$(FLAVOUR_DIR)dist-tar/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/src/mpt/fs
+	svn export ./src/mpt/io                       bin/$(FLAVOUR_DIR)dist-tar/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/src/mpt/io
+	svn export ./src/mpt/io_file                  bin/$(FLAVOUR_DIR)dist-tar/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/src/mpt/io_file
+	svn export ./src/mpt/io_file_adapter          bin/$(FLAVOUR_DIR)dist-tar/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/src/mpt/io_file_adapter
+	svn export ./src/mpt/io_file_read             bin/$(FLAVOUR_DIR)dist-tar/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/src/mpt/io_file_read
+	svn export ./src/mpt/io_file_unique           bin/$(FLAVOUR_DIR)dist-tar/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/src/mpt/io_file_unique
+	svn export ./src/mpt/io_read                  bin/$(FLAVOUR_DIR)dist-tar/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/src/mpt/io_read
+	svn export ./src/mpt/io_write                 bin/$(FLAVOUR_DIR)dist-tar/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/src/mpt/io_write
+	#svn export ./src/mpt/json                     bin/$(FLAVOUR_DIR)dist-tar/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/src/mpt/json
+	#svn export ./src/mpt/library                  bin/$(FLAVOUR_DIR)dist-tar/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/src/mpt/library
+	svn export ./src/mpt/mutex                    bin/$(FLAVOUR_DIR)dist-tar/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/src/mpt/mutex
+	svn export ./src/mpt/out_of_memory            bin/$(FLAVOUR_DIR)dist-tar/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/src/mpt/out_of_memory
+	svn export ./src/mpt/osinfo                   bin/$(FLAVOUR_DIR)dist-tar/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/src/mpt/osinfo
+	svn export ./src/mpt/parse                    bin/$(FLAVOUR_DIR)dist-tar/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/src/mpt/parse
+	svn export ./src/mpt/path                     bin/$(FLAVOUR_DIR)dist-tar/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/src/mpt/path
+	svn export ./src/mpt/random                   bin/$(FLAVOUR_DIR)dist-tar/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/src/mpt/random
+	svn export ./src/mpt/string                   bin/$(FLAVOUR_DIR)dist-tar/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/src/mpt/string
+	svn export ./src/mpt/string_transcode         bin/$(FLAVOUR_DIR)dist-tar/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/src/mpt/string_transcode
+	svn export ./src/mpt/system_error             bin/$(FLAVOUR_DIR)dist-tar/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/src/mpt/system_error
+	svn export ./src/mpt/test                     bin/$(FLAVOUR_DIR)dist-tar/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/src/mpt/test
+	svn export ./src/mpt/uuid                     bin/$(FLAVOUR_DIR)dist-tar/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/src/mpt/uuid
+	#svn export ./src/mpt/uuid_namespace           bin/$(FLAVOUR_DIR)dist-tar/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/src/mpt/uuid_namespace
+	svn export ./src/openmpt/all                  bin/$(FLAVOUR_DIR)dist-tar/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/src/openmpt/all
+	svn export ./src/openmpt/base                 bin/$(FLAVOUR_DIR)dist-tar/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/src/openmpt/base
+	svn export ./src/openmpt/fileformat_base      bin/$(FLAVOUR_DIR)dist-tar/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/src/openmpt/fileformat_base
+	svn export ./src/openmpt/logging              bin/$(FLAVOUR_DIR)dist-tar/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/src/openmpt/logging
+	svn export ./src/openmpt/random               bin/$(FLAVOUR_DIR)dist-tar/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/src/openmpt/random
+	svn export ./src/openmpt/soundbase            bin/$(FLAVOUR_DIR)dist-tar/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/src/openmpt/soundbase
+	svn export ./src/openmpt/soundfile_data       bin/$(FLAVOUR_DIR)dist-tar/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/src/openmpt/soundfile_data
+	svn export ./src/openmpt/soundfile_write      bin/$(FLAVOUR_DIR)dist-tar/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/src/openmpt/soundfile_write
+	svn export ./test                             bin/$(FLAVOUR_DIR)dist-tar/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/test
+	rm                                            bin/$(FLAVOUR_DIR)dist-tar/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/test/mpt_tests_crypto.cpp
+	rm                                            bin/$(FLAVOUR_DIR)dist-tar/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/test/mpt_tests_uuid_namespace.cpp
+	svn export ./libopenmpt                       bin/$(FLAVOUR_DIR)dist-tar/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/libopenmpt
+	svn export ./examples                         bin/$(FLAVOUR_DIR)dist-tar/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/examples
+	svn export ./openmpt123                       bin/$(FLAVOUR_DIR)dist-tar/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/openmpt123
+	svn export ./contrib                          bin/$(FLAVOUR_DIR)dist-tar/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/contrib
+	svn export ./include/allegro42                bin/$(FLAVOUR_DIR)dist-tar/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/include/allegro42
+	svn export ./include/cwsdpmi                  bin/$(FLAVOUR_DIR)dist-tar/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/include/cwsdpmi
+	svn export ./include/minimp3                  bin/$(FLAVOUR_DIR)dist-tar/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/include/minimp3
+	svn export ./include/miniz                    bin/$(FLAVOUR_DIR)dist-tar/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/include/miniz
+	svn export ./include/stb_vorbis               bin/$(FLAVOUR_DIR)dist-tar/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/include/stb_vorbis
+	cp bin/$(FLAVOUR_DIR)dist.mk                  bin/$(FLAVOUR_DIR)dist-tar/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/build/dist.mk
+	cp bin/$(FLAVOUR_DIR)svn_version_dist.h       bin/$(FLAVOUR_DIR)dist-tar/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/build/svn_version/svn_version.h
 	cd bin/$(FLAVOUR_DIR)dist-tar/ && tar cv --numeric-owner --owner=0 --group=0 libopenmpt-$(DIST_LIBOPENMPT_VERSION) > libopenmpt-$(DIST_LIBOPENMPT_VERSION).makefile.tar
 
 .PHONY: bin/$(FLAVOUR_DIR)dist-zip/libopenmpt-$(DIST_LIBOPENMPT_VERSION).msvc.zip
 bin/$(FLAVOUR_DIR)dist-zip/libopenmpt-$(DIST_LIBOPENMPT_VERSION).msvc.zip: bin/$(FLAVOUR_DIR)dist.mk bin/$(FLAVOUR_DIR)svn_version_dist.h
-	mkdir -p bin/$(FLAVOUR_DIR)dist-zip
-	rm -rf bin/$(FLAVOUR_DIR)dist-zip/libopenmpt-$(DIST_LIBOPENMPT_VERSION)
-	mkdir -p bin/$(FLAVOUR_DIR)dist-zip/libopenmpt-$(DIST_LIBOPENMPT_VERSION)
-	mkdir -p bin/$(FLAVOUR_DIR)dist-zip/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/build
-	mkdir -p bin/$(FLAVOUR_DIR)dist-zip/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/build/premake
-	mkdir -p bin/$(FLAVOUR_DIR)dist-zip/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/doc
-	mkdir -p bin/$(FLAVOUR_DIR)dist-zip/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/include
-	mkdir -p bin/$(FLAVOUR_DIR)dist-zip/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/src
-	mkdir -p bin/$(FLAVOUR_DIR)dist-zip/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/src/mpt
-	mkdir -p bin/$(FLAVOUR_DIR)dist-zip/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/src/openmpt
-	svn export ./LICENSE               bin/$(FLAVOUR_DIR)dist-zip/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/LICENSE               --native-eol CRLF
-	svn export ./README.md             bin/$(FLAVOUR_DIR)dist-zip/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/README.md             --native-eol CRLF
-	svn export ./Makefile              bin/$(FLAVOUR_DIR)dist-zip/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/Makefile              --native-eol CRLF
-	svn export ./.clang-format         bin/$(FLAVOUR_DIR)dist-zip/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/.clang-format         --native-eol CRLF
-	svn export ./bin                   bin/$(FLAVOUR_DIR)dist-zip/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/bin                   --native-eol CRLF
-	svn export ./build/premake/def            bin/$(FLAVOUR_DIR)dist-zip/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/build/premake/def            --native-eol CRLF
-	svn export ./build/premake/inc            bin/$(FLAVOUR_DIR)dist-zip/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/build/premake/inc            --native-eol CRLF
-	svn export ./build/premake/lnk            bin/$(FLAVOUR_DIR)dist-zip/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/build/premake/lnk            --native-eol CRLF
-	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/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
-	svn export ./build/vs2022win10            bin/$(FLAVOUR_DIR)dist-zip/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/build/vs2022win10            --native-eol CRLF
-	svn export ./build/vs2022win10uwp         bin/$(FLAVOUR_DIR)dist-zip/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/build/vs2022win10uwp         --native-eol CRLF
-	svn export ./build/vs2022win10clang       bin/$(FLAVOUR_DIR)dist-zip/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/build/vs2022win10clang       --native-eol CRLF
-	svn export ./build/download_externals.cmd bin/$(FLAVOUR_DIR)dist-zip/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/build/download_externals.cmd --native-eol CRLF
-	svn export ./common                bin/$(FLAVOUR_DIR)dist-zip/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/common                --native-eol CRLF
-	svn export ./doc/contributing.md          bin/$(FLAVOUR_DIR)dist-zip/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/doc/contributing.md          --native-eol CRLF
-	svn export ./doc/libopenmpt_styleguide.md bin/$(FLAVOUR_DIR)dist-zip/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/doc/libopenmpt_styleguide.md --native-eol CRLF
-	svn export ./doc/module_formats.md        bin/$(FLAVOUR_DIR)dist-zip/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/doc/module_formats.md        --native-eol CRLF
-	svn export ./soundlib              bin/$(FLAVOUR_DIR)dist-zip/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/soundlib              --native-eol CRLF
-	svn export ./sounddsp              bin/$(FLAVOUR_DIR)dist-zip/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/sounddsp              --native-eol CRLF
-	svn export ./src/mpt/.clang-format bin/$(FLAVOUR_DIR)dist-zip/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/src/mpt/.clang-format --native-eol CRLF
+	mkdir -p                                      bin/$(FLAVOUR_DIR)dist-zip
+	rm -rf                                        bin/$(FLAVOUR_DIR)dist-zip/libopenmpt-$(DIST_LIBOPENMPT_VERSION)
+	mkdir -p                                      bin/$(FLAVOUR_DIR)dist-zip/libopenmpt-$(DIST_LIBOPENMPT_VERSION)
+	mkdir -p                                      bin/$(FLAVOUR_DIR)dist-zip/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/build
+	mkdir -p                                      bin/$(FLAVOUR_DIR)dist-zip/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/build/premake
+	mkdir -p                                      bin/$(FLAVOUR_DIR)dist-zip/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/doc
+	mkdir -p                                      bin/$(FLAVOUR_DIR)dist-zip/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/include
+	mkdir -p                                      bin/$(FLAVOUR_DIR)dist-zip/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/src
+	mkdir -p                                      bin/$(FLAVOUR_DIR)dist-zip/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/src/mpt
+	mkdir -p                                      bin/$(FLAVOUR_DIR)dist-zip/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/src/openmpt
+	svn export ./LICENSE                          bin/$(FLAVOUR_DIR)dist-zip/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/LICENSE                          --native-eol CRLF
+	svn export ./README.md                        bin/$(FLAVOUR_DIR)dist-zip/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/README.md                        --native-eol CRLF
+	svn export ./Makefile                         bin/$(FLAVOUR_DIR)dist-zip/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/Makefile                         --native-eol CRLF
+	svn export ./.clang-format                    bin/$(FLAVOUR_DIR)dist-zip/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/.clang-format                    --native-eol CRLF
+	svn export ./bin                              bin/$(FLAVOUR_DIR)dist-zip/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/bin                              --native-eol CRLF
+	svn export ./build/premake/def                bin/$(FLAVOUR_DIR)dist-zip/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/build/premake/def                --native-eol CRLF
+	svn export ./build/premake/inc                bin/$(FLAVOUR_DIR)dist-zip/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/build/premake/inc                --native-eol CRLF
+	svn export ./build/premake/lnk                bin/$(FLAVOUR_DIR)dist-zip/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/build/premake/lnk                --native-eol CRLF
+	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/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
+	svn export ./build/vs2022win10                bin/$(FLAVOUR_DIR)dist-zip/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/build/vs2022win10                --native-eol CRLF
+	svn export ./build/vs2022win10uwp             bin/$(FLAVOUR_DIR)dist-zip/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/build/vs2022win10uwp             --native-eol CRLF
+	svn export ./build/vs2022win10clang           bin/$(FLAVOUR_DIR)dist-zip/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/build/vs2022win10clang           --native-eol CRLF
+	svn export ./build/download_externals.cmd     bin/$(FLAVOUR_DIR)dist-zip/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/build/download_externals.cmd     --native-eol CRLF
+	svn export ./common                           bin/$(FLAVOUR_DIR)dist-zip/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/common                           --native-eol CRLF
+	svn export ./doc/contributing.md              bin/$(FLAVOUR_DIR)dist-zip/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/doc/contributing.md              --native-eol CRLF
+	svn export ./doc/libopenmpt_styleguide.md     bin/$(FLAVOUR_DIR)dist-zip/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/doc/libopenmpt_styleguide.md     --native-eol CRLF
+	svn export ./doc/module_formats.md            bin/$(FLAVOUR_DIR)dist-zip/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/doc/module_formats.md            --native-eol CRLF
+	svn export ./soundlib                         bin/$(FLAVOUR_DIR)dist-zip/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/soundlib                         --native-eol CRLF
+	svn export ./sounddsp                         bin/$(FLAVOUR_DIR)dist-zip/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/sounddsp                         --native-eol CRLF
+	svn export ./src/mpt/.clang-format            bin/$(FLAVOUR_DIR)dist-zip/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/src/mpt/.clang-format            --native-eol CRLF
 	svn export ./src/mpt/LICENSE.BSD-3-Clause.txt bin/$(FLAVOUR_DIR)dist-zip/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/src/mpt/LICENSE.BSD-3-Clause.txt --native-eol CRLF
-	svn export ./src/mpt/LICENSE.BSL-1.0.txt bin/$(FLAVOUR_DIR)dist-zip/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/src/mpt/LICENSE.BSL-1.0.txt --native-eol CRLF
-	svn export ./src/mpt/arch           bin/$(FLAVOUR_DIR)dist-zip/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/src/mpt/arch           --native-eol CRLF
-	svn export ./src/mpt/audio          bin/$(FLAVOUR_DIR)dist-zip/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/src/mpt/audio          --native-eol CRLF
-	svn export ./src/mpt/base           bin/$(FLAVOUR_DIR)dist-zip/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/src/mpt/base           --native-eol CRLF
-	svn export ./src/mpt/binary         bin/$(FLAVOUR_DIR)dist-zip/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/src/mpt/binary         --native-eol CRLF
-	svn export ./src/mpt/check          bin/$(FLAVOUR_DIR)dist-zip/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/src/mpt/check          --native-eol CRLF
-	svn export ./src/mpt/crc            bin/$(FLAVOUR_DIR)dist-zip/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/src/mpt/crc            --native-eol CRLF
-	#svn export ./src/mpt/crypto         bin/$(FLAVOUR_DIR)dist-zip/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/src/mpt/crypto         --native-eol CRLF
-	svn export ./src/mpt/detect         bin/$(FLAVOUR_DIR)dist-zip/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/src/mpt/detect         --native-eol CRLF
-	svn export ./src/mpt/endian         bin/$(FLAVOUR_DIR)dist-zip/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/src/mpt/endian         --native-eol CRLF
-	svn export ./src/mpt/environment    bin/$(FLAVOUR_DIR)dist-zip/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/src/mpt/environment    --native-eol CRLF
-	svn export ./src/mpt/exception      bin/$(FLAVOUR_DIR)dist-zip/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/src/mpt/exception      --native-eol CRLF
-	svn export ./src/mpt/format         bin/$(FLAVOUR_DIR)dist-zip/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/src/mpt/format         --native-eol CRLF
-	#svn export ./src/mpt/fs             bin/$(FLAVOUR_DIR)dist-zip/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/src/mpt/fs             --native-eol CRLF
-	svn export ./src/mpt/io             bin/$(FLAVOUR_DIR)dist-zip/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/src/mpt/io             --native-eol CRLF
-	svn export ./src/mpt/io_file        bin/$(FLAVOUR_DIR)dist-zip/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/src/mpt/io_file        --native-eol CRLF
-	svn export ./src/mpt/io_file_adapter bin/$(FLAVOUR_DIR)dist-zip/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/src/mpt/io_file_adapter --native-eol CRLF
-	svn export ./src/mpt/io_file_read   bin/$(FLAVOUR_DIR)dist-zip/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/src/mpt/io_file_read   --native-eol CRLF
-	svn export ./src/mpt/io_file_unique bin/$(FLAVOUR_DIR)dist-zip/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/src/mpt/io_file_unique --native-eol CRLF
-	svn export ./src/mpt/io_read        bin/$(FLAVOUR_DIR)dist-zip/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/src/mpt/io_read        --native-eol CRLF
-	svn export ./src/mpt/io_write       bin/$(FLAVOUR_DIR)dist-zip/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/src/mpt/io_write       --native-eol CRLF
-	#svn export ./src/mpt/json           bin/$(FLAVOUR_DIR)dist-zip/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/src/mpt/json           --native-eol CRLF
-	#svn export ./src/mpt/library        bin/$(FLAVOUR_DIR)dist-zip/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/src/mpt/library        --native-eol CRLF
-	svn export ./src/mpt/mutex          bin/$(FLAVOUR_DIR)dist-zip/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/src/mpt/mutex          --native-eol CRLF
-	svn export ./src/mpt/out_of_memory  bin/$(FLAVOUR_DIR)dist-zip/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/src/mpt/out_of_memory  --native-eol CRLF
-	svn export ./src/mpt/osinfo         bin/$(FLAVOUR_DIR)dist-zip/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/src/mpt/osinfo         --native-eol CRLF
-	svn export ./src/mpt/parse          bin/$(FLAVOUR_DIR)dist-zip/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/src/mpt/parse          --native-eol CRLF
-	svn export ./src/mpt/path           bin/$(FLAVOUR_DIR)dist-zip/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/src/mpt/path           --native-eol CRLF
-	svn export ./src/mpt/random         bin/$(FLAVOUR_DIR)dist-zip/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/src/mpt/random         --native-eol CRLF
-	svn export ./src/mpt/string         bin/$(FLAVOUR_DIR)dist-zip/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/src/mpt/string         --native-eol CRLF
-	svn export ./src/mpt/string_transcode bin/$(FLAVOUR_DIR)dist-zip/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/src/mpt/string_transcode --native-eol CRLF
-	svn export ./src/mpt/system_error   bin/$(FLAVOUR_DIR)dist-zip/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/src/mpt/system_error   --native-eol CRLF
-	svn export ./src/mpt/test           bin/$(FLAVOUR_DIR)dist-zip/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/src/mpt/test           --native-eol CRLF
-	svn export ./src/mpt/uuid           bin/$(FLAVOUR_DIR)dist-zip/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/src/mpt/uuid           --native-eol CRLF
-	#svn export ./src/mpt/uuid_namespace bin/$(FLAVOUR_DIR)dist-zip/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/src/mpt/uuid_namespace --native-eol CRLF
-	svn export ./src/openmpt/all        bin/$(FLAVOUR_DIR)dist-zip/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/src/openmpt/all       --native-eol CRLF
-	svn export ./src/openmpt/base       bin/$(FLAVOUR_DIR)dist-zip/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/src/openmpt/base      --native-eol CRLF
-	svn export ./src/openmpt/fileformat_base bin/$(FLAVOUR_DIR)dist-zip/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/src/openmpt/fileformat_base --native-eol CRLF
-	svn export ./src/openmpt/logging    bin/$(FLAVOUR_DIR)dist-zip/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/src/openmpt/logging   --native-eol CRLF
-	svn export ./src/openmpt/random     bin/$(FLAVOUR_DIR)dist-zip/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/src/openmpt/random    --native-eol CRLF
-	svn export ./src/openmpt/soundbase  bin/$(FLAVOUR_DIR)dist-zip/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/src/openmpt/soundbase --native-eol CRLF
-	svn export ./src/openmpt/soundfile_data  bin/$(FLAVOUR_DIR)dist-zip/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/src/openmpt/soundfile_data  --native-eol CRLF
-	svn export ./src/openmpt/soundfile_write bin/$(FLAVOUR_DIR)dist-zip/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/src/openmpt/soundfile_write --native-eol CRLF
-	svn export ./test                  bin/$(FLAVOUR_DIR)dist-zip/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/test                  --native-eol CRLF
-	rm bin/$(FLAVOUR_DIR)dist-zip/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/test/mpt_tests_crypto.cpp
-	rm bin/$(FLAVOUR_DIR)dist-zip/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/test/mpt_tests_uuid_namespace.cpp
-	svn export ./libopenmpt            bin/$(FLAVOUR_DIR)dist-zip/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/libopenmpt            --native-eol CRLF
-	svn export ./examples              bin/$(FLAVOUR_DIR)dist-zip/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/examples              --native-eol CRLF
-	svn export ./openmpt123            bin/$(FLAVOUR_DIR)dist-zip/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/openmpt123            --native-eol CRLF
-	svn export ./contrib               bin/$(FLAVOUR_DIR)dist-zip/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/contrib               --native-eol CRLF
-	svn export ./include/minimp3       bin/$(FLAVOUR_DIR)dist-zip/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/include/minimp3       --native-eol CRLF
-	svn export ./include/miniz         bin/$(FLAVOUR_DIR)dist-zip/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/include/miniz         --native-eol CRLF
-	svn export ./include/mpg123        bin/$(FLAVOUR_DIR)dist-zip/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/include/mpg123        --native-eol CRLF
-	svn export ./include/flac          bin/$(FLAVOUR_DIR)dist-zip/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/include/flac          --native-eol CRLF
-	svn export ./include/portaudio     bin/$(FLAVOUR_DIR)dist-zip/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/include/portaudio     --native-eol CRLF
-	svn export ./include/ogg           bin/$(FLAVOUR_DIR)dist-zip/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/include/ogg           --native-eol CRLF
-	svn export ./include/pugixml       bin/$(FLAVOUR_DIR)dist-zip/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/include/pugixml       --native-eol CRLF
-	svn export ./include/stb_vorbis    bin/$(FLAVOUR_DIR)dist-zip/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/include/stb_vorbis    --native-eol CRLF
-	svn export ./include/vorbis        bin/$(FLAVOUR_DIR)dist-zip/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/include/vorbis        --native-eol CRLF
-	svn export ./include/winamp        bin/$(FLAVOUR_DIR)dist-zip/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/include/winamp        --native-eol CRLF
-	svn export ./include/xmplay        bin/$(FLAVOUR_DIR)dist-zip/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/include/xmplay        --native-eol CRLF
-	svn export ./include/zlib          bin/$(FLAVOUR_DIR)dist-zip/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/include/zlib          --native-eol CRLF
-	cp bin/$(FLAVOUR_DIR)dist.mk bin/$(FLAVOUR_DIR)dist-zip/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/build/dist.mk
-	cp bin/$(FLAVOUR_DIR)svn_version_dist.h bin/$(FLAVOUR_DIR)dist-zip/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/build/svn_version/svn_version.h
+	svn export ./src/mpt/LICENSE.BSL-1.0.txt      bin/$(FLAVOUR_DIR)dist-zip/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/src/mpt/LICENSE.BSL-1.0.txt      --native-eol CRLF
+	svn export ./src/mpt/arch                     bin/$(FLAVOUR_DIR)dist-zip/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/src/mpt/arch                     --native-eol CRLF
+	svn export ./src/mpt/audio                    bin/$(FLAVOUR_DIR)dist-zip/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/src/mpt/audio                    --native-eol CRLF
+	svn export ./src/mpt/base                     bin/$(FLAVOUR_DIR)dist-zip/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/src/mpt/base                     --native-eol CRLF
+	svn export ./src/mpt/binary                   bin/$(FLAVOUR_DIR)dist-zip/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/src/mpt/binary                   --native-eol CRLF
+	svn export ./src/mpt/check                    bin/$(FLAVOUR_DIR)dist-zip/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/src/mpt/check                    --native-eol CRLF
+	svn export ./src/mpt/crc                      bin/$(FLAVOUR_DIR)dist-zip/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/src/mpt/crc                      --native-eol CRLF
+	#svn export ./src/mpt/crypto                   bin/$(FLAVOUR_DIR)dist-zip/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/src/mpt/crypto                   --native-eol CRLF
+	svn export ./src/mpt/detect                   bin/$(FLAVOUR_DIR)dist-zip/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/src/mpt/detect                   --native-eol CRLF
+	svn export ./src/mpt/endian                   bin/$(FLAVOUR_DIR)dist-zip/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/src/mpt/endian                   --native-eol CRLF
+	svn export ./src/mpt/environment              bin/$(FLAVOUR_DIR)dist-zip/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/src/mpt/environment              --native-eol CRLF
+	svn export ./src/mpt/exception                bin/$(FLAVOUR_DIR)dist-zip/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/src/mpt/exception                --native-eol CRLF
+	svn export ./src/mpt/format                   bin/$(FLAVOUR_DIR)dist-zip/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/src/mpt/format                   --native-eol CRLF
+	#svn export ./src/mpt/fs                       bin/$(FLAVOUR_DIR)dist-zip/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/src/mpt/fs                       --native-eol CRLF
+	svn export ./src/mpt/io                       bin/$(FLAVOUR_DIR)dist-zip/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/src/mpt/io                       --native-eol CRLF
+	svn export ./src/mpt/io_file                  bin/$(FLAVOUR_DIR)dist-zip/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/src/mpt/io_file                  --native-eol CRLF
+	svn export ./src/mpt/io_file_adapter           bin/$(FLAVOUR_DIR)dist-zip/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/src/mpt/io_file_adapter         --native-eol CRLF
+	svn export ./src/mpt/io_file_read             bin/$(FLAVOUR_DIR)dist-zip/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/src/mpt/io_file_read             --native-eol CRLF
+	svn export ./src/mpt/io_file_unique           bin/$(FLAVOUR_DIR)dist-zip/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/src/mpt/io_file_unique           --native-eol CRLF
+	svn export ./src/mpt/io_read                  bin/$(FLAVOUR_DIR)dist-zip/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/src/mpt/io_read                  --native-eol CRLF
+	svn export ./src/mpt/io_write                 bin/$(FLAVOUR_DIR)dist-zip/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/src/mpt/io_write                 --native-eol CRLF
+	#svn export ./src/mpt/json                     bin/$(FLAVOUR_DIR)dist-zip/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/src/mpt/json                     --native-eol CRLF
+	#svn export ./src/mpt/library                  bin/$(FLAVOUR_DIR)dist-zip/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/src/mpt/library                  --native-eol CRLF
+	svn export ./src/mpt/mutex                    bin/$(FLAVOUR_DIR)dist-zip/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/src/mpt/mutex                    --native-eol CRLF
+	svn export ./src/mpt/out_of_memory            bin/$(FLAVOUR_DIR)dist-zip/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/src/mpt/out_of_memory            --native-eol CRLF
+	svn export ./src/mpt/osinfo                   bin/$(FLAVOUR_DIR)dist-zip/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/src/mpt/osinfo                   --native-eol CRLF
+	svn export ./src/mpt/parse                    bin/$(FLAVOUR_DIR)dist-zip/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/src/mpt/parse                    --native-eol CRLF
+	svn export ./src/mpt/path                     bin/$(FLAVOUR_DIR)dist-zip/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/src/mpt/path                     --native-eol CRLF
+	svn export ./src/mpt/random                   bin/$(FLAVOUR_DIR)dist-zip/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/src/mpt/random                   --native-eol CRLF
+	svn export ./src/mpt/string                   bin/$(FLAVOUR_DIR)dist-zip/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/src/mpt/string                   --native-eol CRLF
+	svn export ./src/mpt/string_transcode         bin/$(FLAVOUR_DIR)dist-zip/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/src/mpt/string_transcode         --native-eol CRLF
+	svn export ./src/mpt/system_error             bin/$(FLAVOUR_DIR)dist-zip/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/src/mpt/system_error             --native-eol CRLF
+	svn export ./src/mpt/test                     bin/$(FLAVOUR_DIR)dist-zip/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/src/mpt/test                     --native-eol CRLF
+	svn export ./src/mpt/uuid                     bin/$(FLAVOUR_DIR)dist-zip/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/src/mpt/uuid                     --native-eol CRLF
+	#svn export ./src/mpt/uuid_namespace           bin/$(FLAVOUR_DIR)dist-zip/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/src/mpt/uuid_namespace           --native-eol CRLF
+	svn export ./src/openmpt/all                  bin/$(FLAVOUR_DIR)dist-zip/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/src/openmpt/all                  --native-eol CRLF
+	svn export ./src/openmpt/base                 bin/$(FLAVOUR_DIR)dist-zip/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/src/openmpt/base                 --native-eol CRLF
+	svn export ./src/openmpt/fileformat_          base bin/$(FLAVOUR_DIR)dist-zip/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/src/openmpt/fileformat_base --native-eol CRLF
+	svn export ./src/openmpt/logging              bin/$(FLAVOUR_DIR)dist-zip/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/src/openmpt/logging              --native-eol CRLF
+	svn export ./src/openmpt/random               bin/$(FLAVOUR_DIR)dist-zip/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/src/openmpt/random               --native-eol CRLF
+	svn export ./src/openmpt/soundbase            bin/$(FLAVOUR_DIR)dist-zip/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/src/openmpt/soundbase            --native-eol CRLF
+	svn export ./src/openmpt/soundfile_data       bin/$(FLAVOUR_DIR)dist-zip/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/src/openmpt/soundfile_data       --native-eol CRLF
+	svn export ./src/openmpt/soundfile_write      bin/$(FLAVOUR_DIR)dist-zip/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/src/openmpt/soundfile_write      --native-eol CRLF
+	svn export ./test                             bin/$(FLAVOUR_DIR)dist-zip/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/test                             --native-eol CRLF
+	rm                                            bin/$(FLAVOUR_DIR)dist-zip/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/test/mpt_tests_crypto.cpp
+	rm                                            bin/$(FLAVOUR_DIR)dist-zip/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/test/mpt_tests_uuid_namespace.cpp
+	svn export ./libopenmpt                       bin/$(FLAVOUR_DIR)dist-zip/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/libopenmpt                       --native-eol CRLF
+	svn export ./examples                         bin/$(FLAVOUR_DIR)dist-zip/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/examples                         --native-eol CRLF
+	svn export ./openmpt123                       bin/$(FLAVOUR_DIR)dist-zip/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/openmpt123                       --native-eol CRLF
+	svn export ./contrib                          bin/$(FLAVOUR_DIR)dist-zip/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/contrib                          --native-eol CRLF
+	svn export ./include/minimp3                  bin/$(FLAVOUR_DIR)dist-zip/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/include/minimp3                  --native-eol CRLF
+	svn export ./include/miniz                    bin/$(FLAVOUR_DIR)dist-zip/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/include/miniz                    --native-eol CRLF
+	svn export ./include/mpg123                   bin/$(FLAVOUR_DIR)dist-zip/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/include/mpg123                   --native-eol CRLF
+	svn export ./include/flac                     bin/$(FLAVOUR_DIR)dist-zip/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/include/flac                     --native-eol CRLF
+	svn export ./include/portaudio                bin/$(FLAVOUR_DIR)dist-zip/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/include/portaudio                --native-eol CRLF
+	svn export ./include/ogg                      bin/$(FLAVOUR_DIR)dist-zip/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/include/ogg                      --native-eol CRLF
+	svn export ./include/pugixml                  bin/$(FLAVOUR_DIR)dist-zip/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/include/pugixml                  --native-eol CRLF
+	svn export ./include/stb_vorbis               bin/$(FLAVOUR_DIR)dist-zip/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/include/stb_vorbis               --native-eol CRLF
+	svn export ./include/vorbis                   bin/$(FLAVOUR_DIR)dist-zip/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/include/vorbis                   --native-eol CRLF
+	svn export ./include/winamp                   bin/$(FLAVOUR_DIR)dist-zip/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/include/winamp                   --native-eol CRLF
+	svn export ./include/xmplay                   bin/$(FLAVOUR_DIR)dist-zip/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/include/xmplay                   --native-eol CRLF
+	svn export ./include/zlib                     bin/$(FLAVOUR_DIR)dist-zip/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/include/zlib                     --native-eol CRLF
+	cp bin/$(FLAVOUR_DIR)dist.mk                  bin/$(FLAVOUR_DIR)dist-zip/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/build/dist.mk
+	cp bin/$(FLAVOUR_DIR)svn_version_dist.h       bin/$(FLAVOUR_DIR)dist-zip/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/build/svn_version/svn_version.h
 	cd bin/$(FLAVOUR_DIR)dist-zip/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/ && zip -r ../libopenmpt-$(DIST_LIBOPENMPT_VERSION).msvc.zip --compression-method deflate -9 *
 
 .PHONY: bin/$(FLAVOUR_DIR)dist-zip/OpenMPT-src-$(DIST_OPENMPT_VERSION).zip
@@ -1988,125 +1988,125 @@
 
 .PHONY: bin/$(FLAVOUR_DIR)dist-js/libopenmpt-$(DIST_LIBOPENMPT_VERSION).dev.js.tar
 bin/$(FLAVOUR_DIR)dist-js/libopenmpt-$(DIST_LIBOPENMPT_VERSION).dev.js.tar:
-	mkdir -p bin/$(FLAVOUR_DIR)dist-js
-	rm -rf                                       bin/$(FLAVOUR_DIR)dist-js/libopenmpt-$(DIST_LIBOPENMPT_VERSION)
-	mkdir -p                                     bin/$(FLAVOUR_DIR)dist-js/libopenmpt-$(DIST_LIBOPENMPT_VERSION)
-	mkdir -p                                     bin/$(FLAVOUR_DIR)dist-js/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/licenses
-	svn export ./LICENSE                         bin/$(FLAVOUR_DIR)dist-js/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/license.txt
-	svn export ./src/mpt/LICENSE.BSD-3-Clause.txt bin/$(FLAVOUR_DIR)dist-js/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/licenses/license.mpt.BSD-3-Clause.txt
-	svn export ./src/mpt/LICENSE.BSL-1.0.txt     bin/$(FLAVOUR_DIR)dist-js/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/licenses/license.mpt.BSL-1.0.txt
-	svn export ./include/minimp3/LICENSE         bin/$(FLAVOUR_DIR)dist-js/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/licenses/license.minimp3.txt
-	svn export ./include/miniz/miniz.c           bin/$(FLAVOUR_DIR)dist-js/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/licenses/license.miniz.txt
-	svn export ./include/stb_vorbis/stb_vorbis.c bin/$(FLAVOUR_DIR)dist-js/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/licenses/license.stb_vorbis.txt
-	mkdir -p                                     bin/$(FLAVOUR_DIR)dist-js/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/bin
-	mkdir -p                                     bin/$(FLAVOUR_DIR)dist-js/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/bin/$(FLAVOUR_DIR)all
-	cp bin/$(FLAVOUR_DIR)stage/all/libopenmpt.js               bin/$(FLAVOUR_DIR)dist-js/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/bin/$(FLAVOUR_DIR)all/libopenmpt.js
-	cp bin/$(FLAVOUR_DIR)stage/all/libopenmpt.wasm             bin/$(FLAVOUR_DIR)dist-js/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/bin/$(FLAVOUR_DIR)all/libopenmpt.wasm
-	cp bin/$(FLAVOUR_DIR)stage/all/libopenmpt.wasm.js          bin/$(FLAVOUR_DIR)dist-js/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/bin/$(FLAVOUR_DIR)all/libopenmpt.wasm.js
-	mkdir -p                                     bin/$(FLAVOUR_DIR)dist-js/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/bin/$(FLAVOUR_DIR)wasm
-	cp bin/$(FLAVOUR_DIR)stage/wasm/libopenmpt.js              bin/$(FLAVOUR_DIR)dist-js/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/bin/$(FLAVOUR_DIR)wasm/libopenmpt.js
-	cp bin/$(FLAVOUR_DIR)stage/wasm/libopenmpt.wasm            bin/$(FLAVOUR_DIR)dist-js/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/bin/$(FLAVOUR_DIR)wasm/libopenmpt.wasm
-	mkdir -p                                     bin/$(FLAVOUR_DIR)dist-js/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/bin/$(FLAVOUR_DIR)js
-	cp bin/$(FLAVOUR_DIR)stage/js/libopenmpt.js                bin/$(FLAVOUR_DIR)dist-js/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/bin/$(FLAVOUR_DIR)js/libopenmpt.js
+	mkdir -p                                            bin/$(FLAVOUR_DIR)dist-js
+	rm -rf                                              bin/$(FLAVOUR_DIR)dist-js/libopenmpt-$(DIST_LIBOPENMPT_VERSION)
+	mkdir -p                                            bin/$(FLAVOUR_DIR)dist-js/libopenmpt-$(DIST_LIBOPENMPT_VERSION)
+	mkdir -p                                            bin/$(FLAVOUR_DIR)dist-js/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/licenses
+	svn export ./LICENSE                                bin/$(FLAVOUR_DIR)dist-js/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/license.txt
+	svn export ./src/mpt/LICENSE.BSD-3-Clause.txt       bin/$(FLAVOUR_DIR)dist-js/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/licenses/license.mpt.BSD-3-Clause.txt
+	svn export ./src/mpt/LICENSE.BSL-1.0.txt            bin/$(FLAVOUR_DIR)dist-js/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/licenses/license.mpt.BSL-1.0.txt
+	svn export ./include/minimp3/LICENSE                bin/$(FLAVOUR_DIR)dist-js/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/licenses/license.minimp3.txt
+	svn export ./include/miniz/miniz.c                  bin/$(FLAVOUR_DIR)dist-js/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/licenses/license.miniz.txt
+	svn export ./include/stb_vorbis/stb_vorbis.c        bin/$(FLAVOUR_DIR)dist-js/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/licenses/license.stb_vorbis.txt
+	mkdir -p                                            bin/$(FLAVOUR_DIR)dist-js/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/bin
+	mkdir -p                                            bin/$(FLAVOUR_DIR)dist-js/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/bin/$(FLAVOUR_DIR)all
+	cp bin/$(FLAVOUR_DIR)stage/all/libopenmpt.js        bin/$(FLAVOUR_DIR)dist-js/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/bin/$(FLAVOUR_DIR)all/libopenmpt.js
+	cp bin/$(FLAVOUR_DIR)stage/all/libopenmpt.wasm      bin/$(FLAVOUR_DIR)dist-js/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/bin/$(FLAVOUR_DIR)all/libopenmpt.wasm
+	cp bin/$(FLAVOUR_DIR)stage/all/libopenmpt.wasm.js   bin/$(FLAVOUR_DIR)dist-js/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/bin/$(FLAVOUR_DIR)all/libopenmpt.wasm.js
+	mkdir -p                                            bin/$(FLAVOUR_DIR)dist-js/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/bin/$(FLAVOUR_DIR)wasm
+	cp bin/$(FLAVOUR_DIR)stage/wasm/libopenmpt.js       bin/$(FLAVOUR_DIR)dist-js/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/bin/$(FLAVOUR_DIR)wasm/libopenmpt.js
+	cp bin/$(FLAVOUR_DIR)stage/wasm/libopenmpt.wasm     bin/$(FLAVOUR_DIR)dist-js/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/bin/$(FLAVOUR_DIR)wasm/libopenmpt.wasm
+	mkdir -p                                            bin/$(FLAVOUR_DIR)dist-js/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/bin/$(FLAVOUR_DIR)js
+	cp bin/$(FLAVOUR_DIR)stage/js/libopenmpt.js         bin/$(FLAVOUR_DIR)dist-js/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/bin/$(FLAVOUR_DIR)js/libopenmpt.js
 	cd bin/$(FLAVOUR_DIR)dist-js/ && tar cv --numeric-owner --owner=0 --group=0 libopenmpt-$(DIST_LIBOPENMPT_VERSION) > libopenmpt-$(DIST_LIBOPENMPT_VERSION).dev.js.tar
 
 .PHONY: bin/$(FLAVOUR_DIR)dist-dos/libopenmpt-$(DIST_LIBOPENMPT_VERSION).bin.dos.zip
 bin/$(FLAVOUR_DIR)dist-dos/libopenmpt-$(DIST_LIBOPENMPT_VERSION).bin.dos.zip:
 	mkdir -p bin/$(FLAVOUR_DIR)dist-dos
-	rm -rf                                       bin/$(FLAVOUR_DIR)dist-dos/libopenmpt-$(DIST_LIBOPENMPT_VERSION)
-	mkdir -p                                     bin/$(FLAVOUR_DIR)dist-dos/libopenmpt-$(DIST_LIBOPENMPT_VERSION)
-	mkdir -p                                     bin/$(FLAVOUR_DIR)dist-dos/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/LICENSES
-	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 --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
+	rm -rf                                              bin/$(FLAVOUR_DIR)dist-dos/libopenmpt-$(DIST_LIBOPENMPT_VERSION)
+	mkdir -p                                            bin/$(FLAVOUR_DIR)dist-dos/libopenmpt-$(DIST_LIBOPENMPT_VERSION)
+	mkdir -p                                            bin/$(FLAVOUR_DIR)dist-dos/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/LICENSES
+	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 ...
 
[truncated message content]

[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

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

Flat | Threaded

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