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

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

Flat | Threaded

<< < 1 .. 120 121 122 123 124 .. 964 > >> (Page 122 of 964)

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

From: <sv...@op...> - 2024-06-22 18:41:34

Author: sagamusix
Date: Sat Jun 22 20:41:21 2024
New Revision: 21048
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21048

Log:
[Ref] Small cleanup.

Modified:
   trunk/OpenMPT/soundlib/Sndfile.cpp
   trunk/OpenMPT/soundlib/Sndfile.h

Modified: trunk/OpenMPT/soundlib/Sndfile.cpp
==============================================================================
--- trunk/OpenMPT/soundlib/Sndfile.cpp	Sat Jun 22 10:48:49 2024	(r21047)
+++ trunk/OpenMPT/soundlib/Sndfile.cpp	Sat Jun 22 20:41:21 2024	(r21048)
@@ -2080,11 +2080,12 @@
 #endif // MPT_EXTERNAL_SAMPLES
 
 
-// Set up channel panning and volume suitable for MOD + similar files. If the current mod type is not MOD, bForceSetup has to be set to true.
-void CSoundFile::SetupMODPanning(bool bForceSetup)
+// Set up channel panning suitable for MOD + similar files. If the current mod type is not MOD, forceSetup has to be set to true for this function to take effect.
+void CSoundFile::SetupMODPanning(bool forceSetup)
 {
 	// Setup LRRL panning, max channel volume
-	if(!(GetType() & MOD_TYPE_MOD) && bForceSetup == false) return;
+	if(!(GetType() & MOD_TYPE_MOD) && !forceSetup)
+		return;
 
 	for(CHANNELINDEX chn = 0; chn < GetNumChannels(); chn++)
 	{

Modified: trunk/OpenMPT/soundlib/Sndfile.h
==============================================================================
--- trunk/OpenMPT/soundlib/Sndfile.h	Sat Jun 22 10:48:49 2024	(r21047)
+++ trunk/OpenMPT/soundlib/Sndfile.h	Sat Jun 22 20:41:21 2024	(r21048)
@@ -930,7 +930,7 @@
 	// Converts 4 bytes formatted like SoundTracker/NoiseTracker/ProTracker pattern data by converting the period to a note and filling the instrument number, and returns the effect command and parameter bytes.
 	static std::pair<uint8, uint8> ReadMODPatternEntry(const std::array<uint8, 4> data, ModCommand &m);
 
-	void SetupMODPanning(bool bForceSetup = false); // Setup LRRL panning, max channel volume
+	void SetupMODPanning(bool forceSetup = false);  // Setup LRRL panning
 
 public:
 	// Real-time sound functions

[OMPT-svn-commit] OpenMPT r21047 - in trunk/OpenMPT/build: git svn

From: <sv...@op...> - 2024-06-22 08:49:03

Author: manx
Date: Sat Jun 22 10:48:49 2024
New Revision: 21047
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21047

Log:
[Ref] build: Simplify xpath processing.

Modified:
   trunk/OpenMPT/build/git/generate_gitignore.sh
   trunk/OpenMPT/build/svn/do_libopenmpt_release.sh
   trunk/OpenMPT/build/svn/do_libopenmpt_release_rc.sh

Modified: trunk/OpenMPT/build/git/generate_gitignore.sh
==============================================================================
--- trunk/OpenMPT/build/git/generate_gitignore.sh	Fri Jun 21 10:47:54 2024	(r21046)
+++ trunk/OpenMPT/build/git/generate_gitignore.sh	Sat Jun 22 10:48:49 2024	(r21047)
@@ -7,7 +7,7 @@
 echo "# This file was generated automatically by running build/git/generate_gitignore.sh inside a svn working copy." > .gitignore
 
 (
-	svn pl --recursive --xml | xpath -q -e '/properties/target[property/@name = "svn:ignore"]' | grep '^<target' | sed 's/<target path=//g' | sed 's/>$//g' | sed 's/"//g'
+	svn pl --recursive --xml | xpath -q -e '/properties/target[property/@name = "svn:ignore"]/@path' | sed 's/ path=//g' | sed 's/>$//g' | sed 's/"//g'
 ) | sort | while IFS=$'\n' read -r WCDIR ; do
 	if [ "x$WCDIR" = "x." ] ; then
 		PREFIX="/"

Modified: trunk/OpenMPT/build/svn/do_libopenmpt_release.sh
==============================================================================
--- trunk/OpenMPT/build/svn/do_libopenmpt_release.sh	Fri Jun 21 10:47:54 2024	(r21046)
+++ trunk/OpenMPT/build/svn/do_libopenmpt_release.sh	Sat Jun 22 10:48:49 2024	(r21047)
@@ -15,7 +15,7 @@
 svn ci -m "[Mod] libopenmpt: Prepare for release."
 svn up
 NEWVER=$(make distversion-pure)
-NEWREV=$(svn info --xml . | xpath -e '/info/entry/commit/@revision' -q | sed 's/revision//g' | tr '"' ' ' | tr '=' ' ' | sed 's/ //g')
+NEWREV=$(svn info --xml . | xpath -e 'string(/info/entry/commit/@revision)' -q)
 svn cp -m "tag libopenmpt-${NEWVER}" -r ${NEWREV} https://source.openmpt.org/svn/openmpt/branches/OpenMPT-1.32 https://source.openmpt.org/svn/openmpt/tags/libopenmpt-${NEWVER}
 build/update_libopenmpt_version.sh bumppatch
 build/update_libopenmpt_version.sh bumpltrev

Modified: trunk/OpenMPT/build/svn/do_libopenmpt_release_rc.sh
==============================================================================
--- trunk/OpenMPT/build/svn/do_libopenmpt_release_rc.sh	Fri Jun 21 10:47:54 2024	(r21046)
+++ trunk/OpenMPT/build/svn/do_libopenmpt_release_rc.sh	Sat Jun 22 10:48:49 2024	(r21047)
@@ -5,9 +5,9 @@
 svn up
 
 NEWVER=$(make distversion-pure)
-NEWREV=$(svn info --xml . | xpath -e '/info/entry/commit/@revision' -q | sed 's/revision//g' | tr '"' ' ' | tr '=' ' ' | sed 's/ //g')
+NEWREV=$(svn info --xml . | xpath -e 'string(/info/entry/commit/@revision)' -q)
 svn cp -m "tag libopenmpt-${NEWVER}" -r ${NEWREV} https://source.openmpt.org/svn/openmpt/branches/OpenMPT-1.32 https://source.openmpt.org/svn/openmpt/tags/libopenmpt-${NEWVER}
-TAGREV=$(svn info --xml https://source.openmpt.org/svn/openmpt/tags/libopenmpt-${NEWVER} | xpath -e '/info/entry/commit/@revision' -q | sed 's/revision//g' | tr '"' ' ' | tr '=' ' ' | sed 's/ //g')
+TAGREV=$(svn info --xml https://source.openmpt.org/svn/openmpt/tags/libopenmpt-${NEWVER} | xpath -e 'string(/info/entry/commit/@revision)' -q)
 
 echo "ALL DONE."
 echo "run './release-0.8.sh $NEWVER +r${TAGREV}' in a website checkout after buildbot has finished."

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

From: <sv...@op...> - 2024-06-21 08:48:07

Author: sagamusix
Date: Fri Jun 21 10:47:54 2024
New Revision: 21046
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21046

Log:
[Fix] IT/MPTM: Always load at least one channel, or else we will file loading the file.

Modified:
   trunk/OpenMPT/soundlib/Load_it.cpp

Modified: trunk/OpenMPT/soundlib/Load_it.cpp
==============================================================================
--- trunk/OpenMPT/soundlib/Load_it.cpp	Wed Jun 19 14:52:51 2024	(r21045)
+++ trunk/OpenMPT/soundlib/Load_it.cpp	Fri Jun 21 10:47:54 2024	(r21046)
@@ -876,7 +876,7 @@
 	}
 
 	// Checking for number of used channels, which is not explicitly specified in the file.
-	CHANNELINDEX numChannels = GetNumChannels();
+	CHANNELINDEX numChannels = std::max(GetNumChannels(), CHANNELINDEX(1));
 	for(PATTERNINDEX pat = 0; pat < numPats; pat++)
 	{
 		if(patPos[pat] == 0 || !file.Seek(patPos[pat]))

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

From: <sv...@op...> - 2024-06-19 12:53:03

Author: sagamusix
Date: Wed Jun 19 14:52:51 2024
New Revision: 21045
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21045

Log:
Merged revision(s) 21043 from trunk/OpenMPT:
[Fix] DIGI: Sample play direction was reset if adjacent channel contained a Note Cut note (https://www.un4seen.com/forum/?topic=15448.msg143118#msg143118, libopenmpt only).
........

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

Modified: branches/OpenMPT-1.30/soundlib/Snd_fx.cpp
==============================================================================
--- branches/OpenMPT-1.30/soundlib/Snd_fx.cpp	Wed Jun 19 14:52:13 2024	(r21044)
+++ branches/OpenMPT-1.30/soundlib/Snd_fx.cpp	Wed Jun 19 14:52:51 2024	(r21045)
@@ -2871,7 +2871,8 @@
 				}
 
 				NoteChange(chn, note, bPorta, !(GetType() & (MOD_TYPE_XM | MOD_TYPE_MT2)), false, nChn);
-				HandleDigiSamplePlayDirection(m_PlayState, nChn);
+				if(ModCommand::IsNote(note))
+					HandleDigiSamplePlayDirection(m_PlayState, nChn);
 				if ((bPorta) && (GetType() & (MOD_TYPE_XM|MOD_TYPE_MT2)) && (instr))
 				{
 					chn.dwFlags.set(CHN_FASTVOLRAMP);

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

From: <sv...@op...> - 2024-06-19 12:52:27

Author: sagamusix
Date: Wed Jun 19 14:52:13 2024
New Revision: 21044
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21044

Log:
Merged revision(s) 21043 from trunk/OpenMPT:
[Fix] DIGI: Sample play direction was reset if adjacent channel contained a Note Cut note (https://www.un4seen.com/forum/?topic=15448.msg143118#msg143118, libopenmpt only).
........

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	Wed Jun 19 14:25:57 2024	(r21043)
+++ branches/OpenMPT-1.31/soundlib/Snd_fx.cpp	Wed Jun 19 14:52:13 2024	(r21044)
@@ -2951,7 +2951,8 @@
 				}
 
 				NoteChange(chn, note, bPorta, !(GetType() & (MOD_TYPE_XM | MOD_TYPE_MT2)), false, nChn);
-				HandleDigiSamplePlayDirection(m_PlayState, nChn);
+				if(ModCommand::IsNote(note))
+					HandleDigiSamplePlayDirection(m_PlayState, nChn);
 				if ((bPorta) && (GetType() & (MOD_TYPE_XM|MOD_TYPE_MT2)) && (instr))
 				{
 					chn.dwFlags.set(CHN_FASTVOLRAMP);

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

From: <sv...@op...> - 2024-06-19 12:26:11

Author: sagamusix
Date: Wed Jun 19 14:25:57 2024
New Revision: 21043
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21043

Log:
[Fix] DIGI: Sample play direction was reset if adjacent channel contained a Note Cut note (https://www.un4seen.com/forum/?topic=15448.msg143118#msg143118, libopenmpt only).

Modified:
   trunk/OpenMPT/soundlib/Snd_fx.cpp

Modified: trunk/OpenMPT/soundlib/Snd_fx.cpp
==============================================================================
--- trunk/OpenMPT/soundlib/Snd_fx.cpp	Tue Jun 18 21:19:41 2024	(r21042)
+++ trunk/OpenMPT/soundlib/Snd_fx.cpp	Wed Jun 19 14:25:57 2024	(r21043)
@@ -3079,7 +3079,8 @@
 				NoteChange(chn, note, bPorta, !(GetType() & (MOD_TYPE_XM | MOD_TYPE_MT2)), false, nChn);
 				if(continueNote)
 					chn.nPeriod = chn.nPortamentoDest;
-				HandleDigiSamplePlayDirection(m_PlayState, nChn);
+				if(ModCommand::IsNote(note))
+					HandleDigiSamplePlayDirection(m_PlayState, nChn);
 				if ((bPorta) && (GetType() & (MOD_TYPE_XM|MOD_TYPE_MT2)) && (instr))
 				{
 					chn.dwFlags.set(CHN_FASTVOLRAMP);
@@ -6659,7 +6660,7 @@
 
 PLUGINDEX CSoundFile::GetBestPlugin(const PlayState &playState, CHANNELINDEX nChn, PluginPriority priority, PluginMutePriority respectMutes) const
 {
-	if (nChn >= m_PlayState.Chn.size())		//Check valid channel number
+	if (nChn >= playState.Chn.size())		//Check valid channel number
 	{
 		return 0;
 	}

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

From: <sv...@op...> - 2024-06-18 19:19:53

Author: sagamusix
Date: Tue Jun 18 21:19:41 2024
New Revision: 21042
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21042

Log:
[Fix] IT/MPTM: Previous commit was still incomplete for files with less named channels that channels with plugin assignments.

Modified:
   trunk/OpenMPT/soundlib/Load_it.cpp
   trunk/OpenMPT/soundlib/Sndfile.h

Modified: trunk/OpenMPT/soundlib/Load_it.cpp
==============================================================================
--- trunk/OpenMPT/soundlib/Load_it.cpp	Tue Jun 18 21:08:26 2024	(r21041)
+++ trunk/OpenMPT/soundlib/Load_it.cpp	Tue Jun 18 21:19:41 2024	(r21042)
@@ -700,7 +700,7 @@
 
 	// Read mix plugins information
 	FileReader pluginChunk = file.ReadChunk((minPtr >= file.GetPosition()) ? minPtr - file.GetPosition() : file.BytesLeft());
-	const auto [hasPluginChunks, isBeRoTracker] = LoadMixPlugins(pluginChunk);
+	const auto [hasPluginChunks, isBeRoTracker] = LoadMixPlugins(pluginChunk, false);
 	if(hasPluginChunks)
 		hasModPlugExtensions = true;
 
@@ -2112,7 +2112,7 @@
 #endif // MODPLUG_NO_FILESAVE
 
 
-std::pair<bool, bool> CSoundFile::LoadMixPlugins(FileReader &file)
+std::pair<bool, bool> CSoundFile::LoadMixPlugins(FileReader &file, bool ignoreChannelCount)
 {
 	bool hasPluginChunks = false, isBeRoTracker = false;
 	while(file.CanRead(9))
@@ -2134,9 +2134,9 @@
 		// Channel FX
 		if(!memcmp(code, "CHFX", 4))
 		{
-			if(GetNumChannels() == 0)
+			if(!ignoreChannelCount)
 			{
-				ChnSettings.resize(std::min(MAX_BASECHANNELS, static_cast<CHANNELINDEX>(chunkSize / 4)));
+				ChnSettings.resize(std::clamp(static_cast<CHANNELINDEX>(chunkSize / 4), GetNumChannels(), MAX_BASECHANNELS));
 			}
 			for(auto &chn : ChnSettings)
 			{

Modified: trunk/OpenMPT/soundlib/Sndfile.h
==============================================================================
--- trunk/OpenMPT/soundlib/Sndfile.h	Tue Jun 18 21:08:26 2024	(r21041)
+++ trunk/OpenMPT/soundlib/Sndfile.h	Tue Jun 18 21:19:41 2024	(r21042)
@@ -1222,7 +1222,7 @@
 
 	uint32 MapMidiInstrument(uint8 program, uint16 bank, uint8 midiChannel, uint8 note, bool isXG, std::bitset<16> drumChns);
 	size_t ITInstrToMPT(FileReader &file, ModInstrument &ins, uint16 trkvers);
-	std::pair<bool, bool> LoadMixPlugins(FileReader &file);
+	std::pair<bool, bool> LoadMixPlugins(FileReader &file, bool ignoreChannelCount = true);
 #ifndef NO_PLUGINS
 	static void ReadMixPluginChunk(FileReader &file, SNDMIXPLUGIN &plugin);
 	void ProcessMidiOut(CHANNELINDEX nChn);

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

From: <sv...@op...> - 2024-06-18 19:08:34

Author: sagamusix
Date: Tue Jun 18 21:08:26 2024
New Revision: 21041
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21041

Log:
[Fix] IT/MPTM: r20950 broke loading of channel plugins (https://github.com/OpenMPT/openmpt/pull/20). Patch by cs127.

Modified:
   trunk/OpenMPT/soundlib/Load_it.cpp

Modified: trunk/OpenMPT/soundlib/Load_it.cpp
==============================================================================
--- trunk/OpenMPT/soundlib/Load_it.cpp	Sun Jun 16 19:37:07 2024	(r21040)
+++ trunk/OpenMPT/soundlib/Load_it.cpp	Tue Jun 18 21:08:26 2024	(r21041)
@@ -2134,6 +2134,10 @@
 		// Channel FX
 		if(!memcmp(code, "CHFX", 4))
 		{
+			if(GetNumChannels() == 0)
+			{
+				ChnSettings.resize(std::min(MAX_BASECHANNELS, static_cast<CHANNELINDEX>(chunkSize / 4)));
+			}
 			for(auto &chn : ChnSettings)
 			{
 				chn.nMixPlugin = static_cast<PLUGINDEX>(chunk.ReadUint32LE());

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

From: <sv...@op...> - 2024-06-16 17:37:19

Author: manx
Date: Sun Jun 16 19:37:07 2024
New Revision: 21040
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21040

Log:
[Mod] build: CI: GitHub: Update FreeBSD to 14.1.
[Mod] build: CI: GitHub: Update FreeBSD CPA to commit 6acac3ca1b632aa762721d537dea32398ba0f2b1.

Modified:
   branches/OpenMPT-1.30/.github/workflows/FreeBSD-14.1-Makefile.yml

Modified: branches/OpenMPT-1.30/.github/workflows/FreeBSD-14.1-Makefile.yml
==============================================================================
--- branches/OpenMPT-1.30/.github/workflows/FreeBSD-14.1-Makefile.yml	Sun Jun 16 19:06:05 2024	(r21039)
+++ branches/OpenMPT-1.30/.github/workflows/FreeBSD-14.1-Makefile.yml	Sun Jun 16 19:37:07 2024	(r21040)
@@ -1,4 +1,4 @@
-name: FreeBSD 14.0 Makefile
+name: FreeBSD 14.1 Makefile
 
 on:
   push:

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

From: <sv...@op...> - 2024-06-16 17:06:17

Author: manx
Date: Sun Jun 16 19:06:05 2024
New Revision: 21039
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21039

Log:
[Mod] build: CI: GitHub: Update FreeBSD to 14.1.
[Mod] build: CI: GitHub: Update FreeBSD CPA to commit 6acac3ca1b632aa762721d537dea32398ba0f2b1.

Added:
   branches/OpenMPT-1.30/.github/workflows/FreeBSD-14.1-Makefile.yml
      - copied, changed from r21038, branches/OpenMPT-1.30/.github/workflows/FreeBSD-14.0-Makefile.yml
Deleted:
   branches/OpenMPT-1.30/.github/workflows/FreeBSD-14.0-Makefile.yml

Copied and modified: branches/OpenMPT-1.30/.github/workflows/FreeBSD-14.1-Makefile.yml (from r21038, branches/OpenMPT-1.30/.github/workflows/FreeBSD-14.0-Makefile.yml)
==============================================================================
--- branches/OpenMPT-1.30/.github/workflows/FreeBSD-14.0-Makefile.yml	Sun Jun 16 19:04:55 2024	(r21038, copy source)
+++ branches/OpenMPT-1.30/.github/workflows/FreeBSD-14.1-Makefile.yml	Sun Jun 16 19:06:05 2024	(r21039)
@@ -17,64 +17,64 @@
     - name: Checkout
       uses: actions/checkout@v4
     - name: Startup VM
-      uses: cross-platform-actions/action@v0.24.0
+      uses: cross-platform-actions/action@6acac3ca1b632aa762721d537dea32398ba0f2b1
       with:
         architecture: x86_64
         hypervisor: qemu
         memory: 4G
         operating_system: freebsd
-        version: '14.0'
+        version: '14.1'
         shell: bash
         sync_files: runner-to-vm
         shutdown_vm: false
         run: true
     - name: Install dependencies
-      uses: cross-platform-actions/action@v0.24.0
+      uses: cross-platform-actions/action@6acac3ca1b632aa762721d537dea32398ba0f2b1
       with:
         architecture: x86_64
         hypervisor: qemu
         memory: 4G
         operating_system: freebsd
-        version: '14.0'
+        version: '14.1'
         shell: bash
         sync_files: false
         shutdown_vm: false
         run: |
           sudo pkg install -y subversion p5-XML-XPath git mawk gmake pkgconf autoconf autoconf-archive automake libtool help2man doxygen mpg123 libogg libvorbis flac libsndfile pulseaudio portaudio sdl2
     - name: Build
-      uses: cross-platform-actions/action@v0.24.0
+      uses: cross-platform-actions/action@6acac3ca1b632aa762721d537dea32398ba0f2b1
       with:
         architecture: x86_64
         hypervisor: qemu
         memory: 4G
         operating_system: freebsd
-        version: '14.0'
+        version: '14.1'
         shell: bash
         sync_files: false
         shutdown_vm: false
         run: |
           gmake -j$(sysctl -n hw.ncpu) STRICT=1 VERBOSE=1 AUTO_DEPS=1
     - name: Test
-      uses: cross-platform-actions/action@v0.24.0
+      uses: cross-platform-actions/action@6acac3ca1b632aa762721d537dea32398ba0f2b1
       with:
         architecture: x86_64
         hypervisor: qemu
         memory: 4G
         operating_system: freebsd
-        version: '14.0'
+        version: '14.1'
         shell: bash
         sync_files: false
         shutdown_vm: false
         run: |
           gmake -j$(sysctl -n hw.ncpu) STRICT=1 VERBOSE=1 AUTO_DEPS=1 check
     - name: Shutdown VM
-      uses: cross-platform-actions/action@v0.24.0
+      uses: cross-platform-actions/action@6acac3ca1b632aa762721d537dea32398ba0f2b1
       with:
         architecture: x86_64
         hypervisor: qemu
         memory: 4G
         operating_system: freebsd
-        version: '14.0'
+        version: '14.1'
         shell: bash
         sync_files: false
         shutdown_vm: true

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

From: <sv...@op...> - 2024-06-16 17:05:07

Author: manx
Date: Sun Jun 16 19:04:55 2024
New Revision: 21038
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21038

Log:
Merged revision(s) 21037 from trunk/OpenMPT:
[Mod] build: CI: GitHub: Update FreeBSD to 14.1.
[Mod] build: CI: GitHub: Update FreeBSD CPA to commit 6acac3ca1b632aa762721d537dea32398ba0f2b1.
........

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

Modified: branches/OpenMPT-1.31/.github/workflows/FreeBSD-Autotools.yml
==============================================================================
--- branches/OpenMPT-1.31/.github/workflows/FreeBSD-Autotools.yml	Sun Jun 16 19:04:21 2024	(r21037)
+++ branches/OpenMPT-1.31/.github/workflows/FreeBSD-Autotools.yml	Sun Jun 16 19:04:55 2024	(r21038)
@@ -11,7 +11,7 @@
       fail-fast: false
       matrix:
         include:
-          - { version: '14.0' }
+          - { version: '14.1' }
           - { version: '13.3' }
 
     concurrency:
@@ -24,7 +24,7 @@
     - name: Checkout
       uses: actions/checkout@v4
     - name: Startup VM
-      uses: cross-platform-actions/action@v0.24.0
+      uses: cross-platform-actions/action@6acac3ca1b632aa762721d537dea32398ba0f2b1
       with:
         architecture: x86_64
         hypervisor: qemu
@@ -36,7 +36,7 @@
         shutdown_vm: false
         run: true
     - name: Install dependencies
-      uses: cross-platform-actions/action@v0.24.0
+      uses: cross-platform-actions/action@6acac3ca1b632aa762721d537dea32398ba0f2b1
       with:
         architecture: x86_64
         hypervisor: qemu
@@ -49,7 +49,7 @@
         run: |
           sudo pkg install -y subversion p5-XML-XPath git mawk gmake pkgconf autoconf autoconf-archive automake libtool help2man doxygen mpg123 libogg libvorbis flac libsndfile pulseaudio portaudio sdl2
     - name: Build
-      uses: cross-platform-actions/action@v0.24.0
+      uses: cross-platform-actions/action@6acac3ca1b632aa762721d537dea32398ba0f2b1
       with:
         architecture: x86_64
         hypervisor: qemu
@@ -62,7 +62,7 @@
         run: |
           export MAKEFLAGS="-j$(sysctl -n hw.ncpu)"; ./build/autotools/autoconfiscate.sh
     - name: Shutdown VM
-      uses: cross-platform-actions/action@v0.24.0
+      uses: cross-platform-actions/action@6acac3ca1b632aa762721d537dea32398ba0f2b1
       with:
         architecture: x86_64
         hypervisor: qemu

Modified: branches/OpenMPT-1.31/.github/workflows/FreeBSD-Makefile.yml
==============================================================================
--- branches/OpenMPT-1.31/.github/workflows/FreeBSD-Makefile.yml	Sun Jun 16 19:04:21 2024	(r21037)
+++ branches/OpenMPT-1.31/.github/workflows/FreeBSD-Makefile.yml	Sun Jun 16 19:04:55 2024	(r21038)
@@ -11,9 +11,9 @@
       fail-fast: false
       matrix:
         include:
-          - { version: '14.0', deps: sys   }
-          - { version: '14.0', deps: local }
-          - { version: '14.0', deps: small }
+          - { version: '14.1', deps: sys   }
+          - { version: '14.1', deps: local }
+          - { version: '14.1', deps: small }
           - { version: '13.3', deps: sys   }
           - { version: '13.3', deps: local }
           - { version: '13.3', deps: small }
@@ -28,7 +28,7 @@
     - name: Checkout
       uses: actions/checkout@v4
     - name: Startup VM
-      uses: cross-platform-actions/action@v0.24.0
+      uses: cross-platform-actions/action@6acac3ca1b632aa762721d537dea32398ba0f2b1
       with:
         architecture: x86_64
         hypervisor: qemu
@@ -40,7 +40,7 @@
         shutdown_vm: false
         run: true
     - name: Install dependencies
-      uses: cross-platform-actions/action@v0.24.0
+      uses: cross-platform-actions/action@6acac3ca1b632aa762721d537dea32398ba0f2b1
       with:
         architecture: x86_64
         hypervisor: qemu
@@ -53,7 +53,7 @@
         run: |
           sudo pkg install -y subversion p5-XML-XPath git mawk gmake pkgconf autoconf autoconf-archive automake libtool help2man doxygen mpg123 libogg libvorbis flac libsndfile pulseaudio portaudio sdl2
     - name: Build
-      uses: cross-platform-actions/action@v0.24.0
+      uses: cross-platform-actions/action@6acac3ca1b632aa762721d537dea32398ba0f2b1
       with:
         architecture: x86_64
         hypervisor: qemu
@@ -66,7 +66,7 @@
         run: |
           gmake -j$(sysctl -n hw.ncpu) STRICT=1 VERBOSE=1 ${{ (matrix.deps == 'sys') && 'AUTO_DEPS=1' || (matrix.deps == 'local') && 'LOCAL_ZLIB=1 LOCAL_MPG123=1 LOCAL_OGG=1 LOCAL_VORBIS=1 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_FLAC=1 NO_SNDFILE=1' || 'NO_ZLIB=1 NO_MPG123=1 NO_OGG=1 NO_VORBIS=1 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_FLAC=1 NO_SNDFILE=1' }}
     - name: Test
-      uses: cross-platform-actions/action@v0.24.0
+      uses: cross-platform-actions/action@6acac3ca1b632aa762721d537dea32398ba0f2b1
       with:
         architecture: x86_64
         hypervisor: qemu
@@ -79,7 +79,7 @@
         run: |
           gmake -j$(sysctl -n hw.ncpu) STRICT=1 VERBOSE=1 ${{ (matrix.deps == 'sys') && 'AUTO_DEPS=1' || (matrix.deps == 'local') && 'LOCAL_ZLIB=1 LOCAL_MPG123=1 LOCAL_OGG=1 LOCAL_VORBIS=1 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_FLAC=1 NO_SNDFILE=1' || 'NO_ZLIB=1 NO_MPG123=1 NO_OGG=1 NO_VORBIS=1 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_FLAC=1 NO_SNDFILE=1' }} check
     - name: Shutdown VM
-      uses: cross-platform-actions/action@v0.24.0
+      uses: cross-platform-actions/action@6acac3ca1b632aa762721d537dea32398ba0f2b1
       with:
         architecture: x86_64
         hypervisor: qemu

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

From: <sv...@op...> - 2024-06-16 17:04:29

Author: manx
Date: Sun Jun 16 19:04:21 2024
New Revision: 21037
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21037

Log:
[Mod] build: CI: GitHub: Update FreeBSD to 14.1.
[Mod] build: CI: GitHub: Update FreeBSD CPA to commit 6acac3ca1b632aa762721d537dea32398ba0f2b1.

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

Modified: trunk/OpenMPT/.github/workflows/FreeBSD-Autotools.yml
==============================================================================
--- trunk/OpenMPT/.github/workflows/FreeBSD-Autotools.yml	Sun Jun 16 18:32:07 2024	(r21036)
+++ trunk/OpenMPT/.github/workflows/FreeBSD-Autotools.yml	Sun Jun 16 19:04:21 2024	(r21037)
@@ -13,7 +13,7 @@
       fail-fast: false
       matrix:
         include:
-          - { version: '14.0' }
+          - { version: '14.1' }
           - { version: '13.3' }
 
     concurrency:
@@ -26,7 +26,7 @@
     - name: Checkout
       uses: actions/checkout@v4
     - name: Startup VM
-      uses: cross-platform-actions/action@v0.24.0
+      uses: cross-platform-actions/action@6acac3ca1b632aa762721d537dea32398ba0f2b1
       with:
         architecture: x86_64
         hypervisor: qemu
@@ -38,7 +38,7 @@
         shutdown_vm: false
         run: true
     - name: Install dependencies
-      uses: cross-platform-actions/action@v0.24.0
+      uses: cross-platform-actions/action@6acac3ca1b632aa762721d537dea32398ba0f2b1
       with:
         architecture: x86_64
         hypervisor: qemu
@@ -51,7 +51,7 @@
         run: |
           sudo pkg install -y subversion p5-XML-XPath git mawk gmake pkgconf autoconf autoconf-archive automake libtool help2man doxygen mpg123 libogg libvorbis flac libsndfile pulseaudio portaudio sdl2
     - name: Build
-      uses: cross-platform-actions/action@v0.24.0
+      uses: cross-platform-actions/action@6acac3ca1b632aa762721d537dea32398ba0f2b1
       with:
         architecture: x86_64
         hypervisor: qemu
@@ -64,7 +64,7 @@
         run: |
           export MAKEFLAGS="-j$(sysctl -n hw.ncpu)"; ./build/autotools/autoconfiscate.sh
     - name: Shutdown VM
-      uses: cross-platform-actions/action@v0.24.0
+      uses: cross-platform-actions/action@6acac3ca1b632aa762721d537dea32398ba0f2b1
       with:
         architecture: x86_64
         hypervisor: qemu

Modified: trunk/OpenMPT/.github/workflows/FreeBSD-Makefile.yml
==============================================================================
--- trunk/OpenMPT/.github/workflows/FreeBSD-Makefile.yml	Sun Jun 16 18:32:07 2024	(r21036)
+++ trunk/OpenMPT/.github/workflows/FreeBSD-Makefile.yml	Sun Jun 16 19:04:21 2024	(r21037)
@@ -13,9 +13,9 @@
       fail-fast: false
       matrix:
         include:
-          - { version: '14.0', deps: sys   }
-          - { version: '14.0', deps: local }
-          - { version: '14.0', deps: small }
+          - { version: '14.1', deps: sys   }
+          - { version: '14.1', deps: local }
+          - { version: '14.1', deps: small }
           - { version: '13.3', deps: sys   }
           - { version: '13.3', deps: local }
           - { version: '13.3', deps: small }
@@ -30,7 +30,7 @@
     - name: Checkout
       uses: actions/checkout@v4
     - name: Startup VM
-      uses: cross-platform-actions/action@v0.24.0
+      uses: cross-platform-actions/action@6acac3ca1b632aa762721d537dea32398ba0f2b1
       with:
         architecture: x86_64
         hypervisor: qemu
@@ -42,7 +42,7 @@
         shutdown_vm: false
         run: true
     - name: Install dependencies
-      uses: cross-platform-actions/action@v0.24.0
+      uses: cross-platform-actions/action@6acac3ca1b632aa762721d537dea32398ba0f2b1
       with:
         architecture: x86_64
         hypervisor: qemu
@@ -55,7 +55,7 @@
         run: |
           sudo pkg install -y subversion p5-XML-XPath git mawk gmake pkgconf autoconf autoconf-archive automake libtool help2man doxygen mpg123 libogg libvorbis flac libsndfile pulseaudio portaudio sdl2
     - name: Build
-      uses: cross-platform-actions/action@v0.24.0
+      uses: cross-platform-actions/action@6acac3ca1b632aa762721d537dea32398ba0f2b1
       with:
         architecture: x86_64
         hypervisor: qemu
@@ -68,7 +68,7 @@
         run: |
           gmake -j$(sysctl -n hw.ncpu) STRICT=1 VERBOSE=1 ${{ (matrix.deps == 'sys') && 'AUTO_DEPS=1' || (matrix.deps == 'local') && 'LOCAL_ZLIB=1 LOCAL_MPG123=1 LOCAL_OGG=1 LOCAL_VORBIS=1 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_FLAC=1 NO_SNDFILE=1' || 'NO_ZLIB=1 NO_MPG123=1 NO_OGG=1 NO_VORBIS=1 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_FLAC=1 NO_SNDFILE=1' }}
     - name: Test
-      uses: cross-platform-actions/action@v0.24.0
+      uses: cross-platform-actions/action@6acac3ca1b632aa762721d537dea32398ba0f2b1
       with:
         architecture: x86_64
         hypervisor: qemu
@@ -81,7 +81,7 @@
         run: |
           gmake -j$(sysctl -n hw.ncpu) STRICT=1 VERBOSE=1 ${{ (matrix.deps == 'sys') && 'AUTO_DEPS=1' || (matrix.deps == 'local') && 'LOCAL_ZLIB=1 LOCAL_MPG123=1 LOCAL_OGG=1 LOCAL_VORBIS=1 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_FLAC=1 NO_SNDFILE=1' || 'NO_ZLIB=1 NO_MPG123=1 NO_OGG=1 NO_VORBIS=1 NO_PORTAUDIO=1 NO_PORTAUDIOCPP=1 NO_PULSEAUDIO=1 NO_SDL2=1 NO_FLAC=1 NO_SNDFILE=1' }} check
     - name: Shutdown VM
-      uses: cross-platform-actions/action@v0.24.0
+      uses: cross-platform-actions/action@6acac3ca1b632aa762721d537dea32398ba0f2b1
       with:
         architecture: x86_64
         hypervisor: qemu

[OMPT-svn-commit] OpenMPT r21036 - in trunk/OpenMPT: mptrack soundlib

From: <sv...@op...> - 2024-06-16 16:32:15

Author: sagamusix
Date: Sun Jun 16 18:32:07 2024
New Revision: 21036
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21036

Log:
[Ref] Small cleanups.

Modified:
   trunk/OpenMPT/mptrack/Ctrl_smp.cpp
   trunk/OpenMPT/soundlib/Load_it.cpp
   trunk/OpenMPT/soundlib/Load_s3m.cpp

Modified: trunk/OpenMPT/mptrack/Ctrl_smp.cpp
==============================================================================
--- trunk/OpenMPT/mptrack/Ctrl_smp.cpp	Sun Jun 16 10:52:23 2024	(r21035)
+++ trunk/OpenMPT/mptrack/Ctrl_smp.cpp	Sun Jun 16 18:32:07 2024	(r21036)
@@ -3293,15 +3293,14 @@
 
 // Return currently selected part of the sample.
 // The whole sample size will be returned if no part of the sample is selected.
-// However, point.bSelected indicates whether a sample selection exists or not.
+// However, points.selectionActive indicates whether a sample selection exists or not.
 CCtrlSamples::SampleSelectionPoints CCtrlSamples::GetSelectionPoints()
 {
 	SampleSelectionPoints points;
-	SAMPLEVIEWSTATE viewstate;
+	SAMPLEVIEWSTATE viewstate{};
 	const ModSample &sample = m_sndFile.GetSample(m_nSample);
 
-	Clear(viewstate);
-	SendViewMessage(VIEWMSG_SAVESTATE, (LPARAM)&viewstate);
+	SendViewMessage(VIEWMSG_SAVESTATE, reinterpret_cast<LPARAM>(&viewstate));
 	points.nStart = viewstate.dwBeginSel;
 	points.nEnd = viewstate.dwEndSel;
 	if(points.nEnd > sample.nLength) points.nEnd = sample.nLength;
@@ -3325,13 +3324,12 @@
 	Limit(nStart, SmpLength(0), sample.nLength);
 	Limit(nEnd, SmpLength(0), sample.nLength);
 
-	SAMPLEVIEWSTATE viewstate;
-	Clear(viewstate);
-	SendViewMessage(VIEWMSG_SAVESTATE, (LPARAM)&viewstate);
+	SAMPLEVIEWSTATE viewstate{};
+	SendViewMessage(VIEWMSG_SAVESTATE, reinterpret_cast<LPARAM>(&viewstate));
 
 	viewstate.dwBeginSel = nStart;
 	viewstate.dwEndSel = nEnd;
-	SendViewMessage(VIEWMSG_LOADSTATE, (LPARAM)&viewstate);
+	SendViewMessage(VIEWMSG_LOADSTATE, reinterpret_cast<LPARAM>(&viewstate));
 }
 
 

Modified: trunk/OpenMPT/soundlib/Load_it.cpp
==============================================================================
--- trunk/OpenMPT/soundlib/Load_it.cpp	Sun Jun 16 10:52:23 2024	(r21035)
+++ trunk/OpenMPT/soundlib/Load_it.cpp	Sun Jun 16 18:32:07 2024	(r21036)
@@ -654,7 +654,7 @@
 	} else if(possiblyUNMO3 && fileHeader.special <= 1)
 	{
 		// UNMO3 < v2.4.0.1 will set the edit history special bit iff the MIDI macro embed bit is also set,
-		// but it always writes the two extra bytes for the edit history length (zeroes).
+		// but it always writes the two extra bytes for the edit history length (zeros).
 		// If MIDI macros are embedded, we are fine and end up in the first case of the if statement (read edit history).
 		// Otherwise we end up here and might have to read the edit history length.
 		if(file.ReadUint16LE() == 0)
@@ -875,7 +875,7 @@
 		numPats = 0;
 	}
 
-	// Checking for number of used channels, which is not explicitely specified in the file.
+	// Checking for number of used channels, which is not explicitly specified in the file.
 	CHANNELINDEX numChannels = GetNumChannels();
 	for(PATTERNINDEX pat = 0; pat < numPats; pat++)
 	{
@@ -1083,14 +1083,11 @@
 					if(note > NOTE_MAX && note < 0xFD) note = NOTE_FADE;
 					else if(note == 0xFD) note = NOTE_NONE;
 				}
-				m.note = note;
-				lastValue[ch].note = note;
+				m.note = lastValue[ch].note = note;
 			}
 			if(chnMask[ch] & 2)
 			{
-				uint8 instr = patternData.ReadUint8();
-				m.instr = instr;
-				lastValue[ch].instr = instr;
+				m.instr = lastValue[ch].instr = patternData.ReadUint8();
 			}
 			if(chnMask[ch] & 4)
 			{

Modified: trunk/OpenMPT/soundlib/Load_s3m.cpp
==============================================================================
--- trunk/OpenMPT/soundlib/Load_s3m.cpp	Sun Jun 16 10:52:23 2024	(r21035)
+++ trunk/OpenMPT/soundlib/Load_s3m.cpp	Sun Jun 16 18:32:07 2024	(r21036)
@@ -426,7 +426,9 @@
 	// Global Volume
 	m_nDefaultGlobalVolume = std::min(fileHeader.globalVol.get(), uint8(64)) * 4u;
 	// The following check is probably not very reliable, but it fixes a few tunes, e.g.
-	// DARKNESS.S3M by Purple Motion (ST 3.00) and "Image of Variance" by C.C.Catch (ST 3.01):
+	// DARKNESS.S3M by Purple Motion (ST 3.00) and "Image of Variance" by C.C.Catch (ST 3.01).
+	// Note that even ST 3.01b imports these files with a global volume of 0,
+	// so it's not clear if these files ever played "as intended" in any ST3 versions (I don't have any older ST3 versions).
 	if(m_nDefaultGlobalVolume == 0 && fileHeader.cwtv < S3MFileHeader::trkST3_20)
 	{
 		m_nDefaultGlobalVolume = MAX_GLOBAL_VOLUME;
@@ -496,7 +498,7 @@
 		}
 		if(GetNumChannels() < 32 && m_dwLastSavedWithVersion == MPT_V("1.16"))
 		{
-			// MPT 1.0 alpha 6 up to 1.16.203 set ths panning bit for all channels, regardless of whether they are used or not.
+			// MPT 1.0 alpha 6 up to 1.16.203 set the panning bit for all channels, regardless of whether they are used or not.
 			if(hasChannelsWithoutPanning)
 				m_modFormat.madeWithTracker = U_("ModPlug Tracker 1.16 / OpenMPT 1.17");
 			else
@@ -597,6 +599,7 @@
 		ROWINDEX row = 0;
 		auto rowBase = Patterns[pat].GetRow(0);
 
+		ModCommand dummy;
 		while(row < 64)
 		{
 			uint8 info = file.ReadUint8();
@@ -612,7 +615,6 @@
 			}
 
 			CHANNELINDEX channel = (info & s3mChannelMask);
-			ModCommand dummy;
 			ModCommand &m = (channel < GetNumChannels()) ? rowBase[channel] : dummy;
 
 			if(info & s3mNotePresent)

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

From: <sv...@op...> - 2024-06-16 08:52:30

Author: manx
Date: Sun Jun 16 10:52:23 2024
New Revision: 21035
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21035

Log:
Merged revision(s) 20652, 21034 from trunk/OpenMPT:
[Imp] build: CI: GitHub: macOS: Add XCode 15.4-beta.
........
[Reg] build: CI: GitHub: macOS: Remove all but backwards-compatible XCode 15.3 builders as 15.4 is the latest stable.
........

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

Modified: branches/OpenMPT-1.31/.github/workflows/macOS-Makefile.yml
==============================================================================
--- branches/OpenMPT-1.31/.github/workflows/macOS-Makefile.yml	Sun Jun 16 10:51:31 2024	(r21034)
+++ branches/OpenMPT-1.31/.github/workflows/macOS-Makefile.yml	Sun Jun 16 10:52:23 2024	(r21035)
@@ -11,22 +11,24 @@
       fail-fast: false
       matrix:
         include:
-          - { host: macos-14, compiler: '15.3', arch: ''    , target: ''     , deps: sys  , check: true  }
-          - { host: macos-14, compiler: '15.3', arch: arm64 , target: ''     , deps: local, check: true  }
-          - { host: macos-14, compiler: '15.3', arch: x64_64, target: ''     , deps: local, check: true  }
-          - { host: macos-14, compiler: '15.3', arch: arm64 , target: ''     , deps: small, check: true  }
-          - { host: macos-14, compiler: '15.3', arch: x64_64, target: ''     , deps: small, check: true  }
-          - { host: macos-14, compiler: '15.3', arch: arm64 , target: '14'   , deps: local, check: true  }
-          - { host: macos-14, compiler: '15.3', arch: x64_64, target: '14'   , deps: local, check: true  }
-          - { host: macos-14, compiler: '15.3', arch: arm64 , target: '13'   , deps: local, check: true  }
-          - { host: macos-14, compiler: '15.3', arch: x64_64, target: '13'   , deps: local, check: true  }
-          - { host: macos-14, compiler: '15.3', arch: arm64 , target: '12'   , deps: local, check: true  }
-          - { host: macos-14, compiler: '15.3', arch: x64_64, target: '12'   , deps: local, check: true  }
-          - { host: macos-14, compiler: '15.3', arch: arm64 , target: '11'   , deps: local, check: true  }
-          - { host: macos-14, compiler: '15.3', arch: x64_64, target: '11'   , deps: local, check: true  }
-          - { host: macos-14, compiler: '15.3', arch: x64_64, target: '10.15', deps: local, check: true  }
-          - { host: macos-14, compiler: '15.3', arch: x64_64, target: '10.14', deps: local, check: true  }
-          - { host: macos-14, compiler: '15.3', arch: i386  , target: '10.14', deps: local, check: false }
+          - { host: macos-14, compiler: '15.4', arch: ''    , target: ''     , deps: sys  , check: true  }
+          - { host: macos-14, compiler: '15.4', arch: arm64 , target: ''     , deps: local, check: true  }
+          - { host: macos-14, compiler: '15.4', arch: x64_64, target: ''     , deps: local, check: true  }
+          - { host: macos-14, compiler: '15.4', arch: arm64 , target: ''     , deps: small, check: true  }
+          - { host: macos-14, compiler: '15.4', arch: x64_64, target: ''     , deps: small, check: true  }
+          - { host: macos-14, compiler: '15.4', arch: arm64 , target: '14'   , deps: local, check: true  }
+          - { host: macos-14, compiler: '15.4', arch: x64_64, target: '14'   , deps: local, check: true  }
+          - { host: macos-14, compiler: '15.4', arch: arm64 , target: '13'   , deps: local, check: true  }
+          - { host: macos-14, compiler: '15.4', arch: x64_64, target: '13'   , deps: local, check: true  }
+          - { host: macos-14, compiler: '15.4', arch: arm64 , target: '12'   , deps: local, check: true  }
+          - { host: macos-14, compiler: '15.4', arch: x64_64, target: '12'   , deps: local, check: true  }
+          - { host: macos-14, compiler: '15.4', arch: arm64 , target: '11'   , deps: local, check: true  }
+          - { host: macos-14, compiler: '15.4', arch: x64_64, target: '11'   , deps: local, check: true  }
+          - { host: macos-14, compiler: '15.4', arch: x64_64, target: '10.15', deps: local, check: true  }
+          - { host: macos-14, compiler: '15.4', arch: x64_64, target: '10.14', deps: local, check: true  }
+          - { host: macos-14, compiler: '15.4', arch: i386  , target: '10.14', deps: local, check: false }
+          - { host: macos-14, compiler: '15.4', arch: x64_64, target: '10.13', deps: local, check: true  }
+          - { host: macos-14, compiler: '15.4', arch: i386  , target: '10.13', deps: local, check: false }
           - { host: macos-14, compiler: '15.3', arch: x64_64, target: '10.13', deps: local, check: true  }
           - { host: macos-14, compiler: '15.3', arch: i386  , target: '10.13', deps: local, check: false }
           - { host: macos-13, compiler: '15.2', arch: x64_64, target: '10.13', deps: local, check: true  }

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

From: <sv...@op...> - 2024-06-16 08:51:43

Author: manx
Date: Sun Jun 16 10:51:31 2024
New Revision: 21034
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21034

Log:
[Reg] build: CI: GitHub: macOS: Remove all but backwards-compatible XCode 15.3 builders as 15.4 is the latest stable.

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

Modified: trunk/OpenMPT/.github/workflows/macOS-Makefile.yml
==============================================================================
--- trunk/OpenMPT/.github/workflows/macOS-Makefile.yml	Sun Jun 16 10:48:02 2024	(r21033)
+++ trunk/OpenMPT/.github/workflows/macOS-Makefile.yml	Sun Jun 16 10:51:31 2024	(r21034)
@@ -49,22 +49,6 @@
           - { host: macos-14, compiler: '15.4', arch: i386  , target: '10.14', deps: local, check: false }
           - { host: macos-14, compiler: '15.4', arch: x64_64, target: '10.13', deps: local, check: true  }
           - { host: macos-14, compiler: '15.4', arch: i386  , target: '10.13', deps: local, check: false }
-          - { host: macos-14, compiler: '15.3', arch: ''    , target: ''     , deps: sys  , check: true  }
-          - { host: macos-14, compiler: '15.3', arch: arm64 , target: ''     , deps: local, check: true  }
-          - { host: macos-14, compiler: '15.3', arch: x64_64, target: ''     , deps: local, check: true  }
-          - { host: macos-14, compiler: '15.3', arch: arm64 , target: ''     , deps: small, check: true  }
-          - { host: macos-14, compiler: '15.3', arch: x64_64, target: ''     , deps: small, check: true  }
-          - { host: macos-14, compiler: '15.3', arch: arm64 , target: '14'   , deps: local, check: true  }
-          - { host: macos-14, compiler: '15.3', arch: x64_64, target: '14'   , deps: local, check: true  }
-          - { host: macos-14, compiler: '15.3', arch: arm64 , target: '13'   , deps: local, check: true  }
-          - { host: macos-14, compiler: '15.3', arch: x64_64, target: '13'   , deps: local, check: true  }
-          - { host: macos-14, compiler: '15.3', arch: arm64 , target: '12'   , deps: local, check: true  }
-          - { host: macos-14, compiler: '15.3', arch: x64_64, target: '12'   , deps: local, check: true  }
-          - { host: macos-14, compiler: '15.3', arch: arm64 , target: '11'   , deps: local, check: true  }
-          - { host: macos-14, compiler: '15.3', arch: x64_64, target: '11'   , deps: local, check: true  }
-          - { host: macos-14, compiler: '15.3', arch: x64_64, target: '10.15', deps: local, check: true  }
-          - { host: macos-14, compiler: '15.3', arch: x64_64, target: '10.14', deps: local, check: true  }
-          - { host: macos-14, compiler: '15.3', arch: i386  , target: '10.14', deps: local, check: false }
           - { host: macos-14, compiler: '15.3', arch: x64_64, target: '10.13', deps: local, check: true  }
           - { host: macos-14, compiler: '15.3', arch: i386  , target: '10.13', deps: local, check: false }
           - { host: macos-13, compiler: '15.2', arch: x64_64, target: '10.13', deps: local, check: true  }

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

From: <sv...@op...> - 2024-06-16 08:48:10

Author: manx
Date: Sun Jun 16 10:48:02 2024
New Revision: 21033
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21033

Log:
[Imp] build: CI: GitHub: macOS: Add XCode 16.0-beta.

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

Modified: trunk/OpenMPT/.github/workflows/macOS-Makefile.yml
==============================================================================
--- trunk/OpenMPT/.github/workflows/macOS-Makefile.yml	Sat Jun 15 14:48:53 2024	(r21032)
+++ trunk/OpenMPT/.github/workflows/macOS-Makefile.yml	Sun Jun 16 10:48:02 2024	(r21033)
@@ -13,6 +13,24 @@
       fail-fast: false
       matrix:
         include:
+          - { host: macos-14, compiler: '16.0', arch: ''    , target: ''     , deps: sys  , check: true  }
+          - { host: macos-14, compiler: '16.0', arch: arm64 , target: ''     , deps: local, check: true  }
+          - { host: macos-14, compiler: '16.0', arch: x64_64, target: ''     , deps: local, check: true  }
+          - { host: macos-14, compiler: '16.0', arch: arm64 , target: ''     , deps: small, check: true  }
+          - { host: macos-14, compiler: '16.0', arch: x64_64, target: ''     , deps: small, check: true  }
+          - { host: macos-14, compiler: '16.0', arch: arm64 , target: '14'   , deps: local, check: true  }
+          - { host: macos-14, compiler: '16.0', arch: x64_64, target: '14'   , deps: local, check: true  }
+          - { host: macos-14, compiler: '16.0', arch: arm64 , target: '13'   , deps: local, check: true  }
+          - { host: macos-14, compiler: '16.0', arch: x64_64, target: '13'   , deps: local, check: true  }
+          - { host: macos-14, compiler: '16.0', arch: arm64 , target: '12'   , deps: local, check: true  }
+          - { host: macos-14, compiler: '16.0', arch: x64_64, target: '12'   , deps: local, check: true  }
+          - { host: macos-14, compiler: '16.0', arch: arm64 , target: '11'   , deps: local, check: true  }
+          - { host: macos-14, compiler: '16.0', arch: x64_64, target: '11'   , deps: local, check: true  }
+          - { host: macos-14, compiler: '16.0', arch: x64_64, target: '10.15', deps: local, check: true  }
+          - { host: macos-14, compiler: '16.0', arch: x64_64, target: '10.14', deps: local, check: true  }
+          - { host: macos-14, compiler: '16.0', arch: i386  , target: '10.14', deps: local, check: false }
+          - { host: macos-14, compiler: '16.0', arch: x64_64, target: '10.13', deps: local, check: true  }
+          - { host: macos-14, compiler: '16.0', arch: i386  , target: '10.13', deps: local, check: false }
           - { host: macos-14, compiler: '15.4', arch: ''    , target: ''     , deps: sys  , check: true  }
           - { host: macos-14, compiler: '15.4', arch: arm64 , target: ''     , deps: local, check: true  }
           - { host: macos-14, compiler: '15.4', arch: x64_64, target: ''     , deps: local, check: true  }

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

From: <sv...@op...> - 2024-06-15 12:49:05

Author: sagamusix
Date: Sat Jun 15 14:48:53 2024
New Revision: 21032
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21032

Log:
Merged revision(s) 21031 from trunk/OpenMPT:
[Fix] General tab: Enabling composited window mode breaks UI updates when using UI scaling in Windows (which might also explain why some plugin GUIs have the same issue in OpenMPT). A better workaround for the issue with garbage background on the group boxes is to set their background mode to transparent (https://bugs.openmpt.org/view.php?id=1789).
........

Modified:
   branches/OpenMPT-1.31/   (props changed)
   branches/OpenMPT-1.31/mptrack/mptrack.rc

Modified: branches/OpenMPT-1.31/mptrack/mptrack.rc
==============================================================================
--- branches/OpenMPT-1.31/mptrack/mptrack.rc	Sat Jun 15 14:48:16 2024	(r21031)
+++ branches/OpenMPT-1.31/mptrack/mptrack.rc	Sat Jun 15 14:48:53 2024	(r21032)
@@ -19,10 +19,6 @@
 LANGUAGE LANG_GERMAN, SUBLANG_GERMAN
 #pragma code_page(1252)
 
-#if !defined(WS_EX_COMPOSITED)
-#define WS_EX_COMPOSITED 0x02000000L
-#endif
-
 /////////////////////////////////////////////////////////////////////////////
 //
 // Dialog
@@ -1698,22 +1694,21 @@
 
 IDD_VIEW_GLOBALS DIALOGEX 0, 0, 422, 326
 STYLE DS_SETFONT | DS_3DLOOK | DS_FIXEDSYS | WS_CHILD
-EXSTYLE WS_EX_COMPOSITED
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
-    CONTROL         "",IDC_TABCTRL1,"SysTabControl32",0x0,0,0,412,14
-    CONTROL         "",IDC_BUTTON9,"Button",BS_OWNERDRAW | BS_FLAT | WS_TABSTOP,66,16,33,11
-    CONTROL         "",IDC_BUTTON10,"Button",BS_OWNERDRAW | BS_FLAT | WS_TABSTOP,169,16,33,11
-    CONTROL         "",IDC_BUTTON11,"Button",BS_OWNERDRAW | BS_FLAT | WS_TABSTOP,272,16,33,11
-    CONTROL         "",IDC_BUTTON12,"Button",BS_OWNERDRAW | BS_FLAT | WS_TABSTOP,375,16,33,11
-    GROUPBOX        "Channel 1",IDC_TEXT1,5,18,99,157
+    CONTROL         "",IDC_TABCTRL1,"SysTabControl32",WS_TABSTOP,0,0,412,14
+    GROUPBOX        "Channel 1",IDC_TEXT1,5,18,99,157,0,WS_EX_TRANSPARENT
     EDITTEXT        IDC_EDIT9,10,30,89,12,ES_AUTOHSCROLL
-    GROUPBOX        "Channel 2",IDC_TEXT2,108,18,99,157
+    GROUPBOX        "Channel 2",IDC_TEXT2,108,18,99,157,0,WS_EX_TRANSPARENT
     EDITTEXT        IDC_EDIT10,113,30,89,12,ES_AUTOHSCROLL
-    GROUPBOX        "Channel 3",IDC_TEXT3,211,18,99,157
+    GROUPBOX        "Channel 3",IDC_TEXT3,211,18,99,157,0,WS_EX_TRANSPARENT
     EDITTEXT        IDC_EDIT11,216,30,89,12,ES_AUTOHSCROLL
-    GROUPBOX        "Channel 4",IDC_TEXT4,314,18,99,157
+    GROUPBOX        "Channel 4",IDC_TEXT4,314,18,99,157,0,WS_EX_TRANSPARENT
     EDITTEXT        IDC_EDIT12,319,30,89,12,ES_AUTOHSCROLL
+    CONTROL         "",IDC_BUTTON9,"Button",BS_OWNERDRAW | BS_FLAT | WS_TABSTOP,66,16,33,11,WS_EX_TRANSPARENT
+    CONTROL         "",IDC_BUTTON10,"Button",BS_OWNERDRAW | BS_FLAT | WS_TABSTOP,169,16,33,11,WS_EX_TRANSPARENT
+    CONTROL         "",IDC_BUTTON11,"Button",BS_OWNERDRAW | BS_FLAT | WS_TABSTOP,272,16,33,11,WS_EX_TRANSPARENT
+    CONTROL         "",IDC_BUTTON12,"Button",BS_OWNERDRAW | BS_FLAT | WS_TABSTOP,375,16,33,11,WS_EX_TRANSPARENT
     LTEXT           "Initial Volume:",IDC_STATIC,10,48,45,8
     EDITTEXT        IDC_EDIT1,63,46,36,12,ES_NUMBER
     CONTROL         "Spin1",IDC_SPIN1,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS,95,45,11,14
@@ -1762,7 +1757,7 @@
     COMBOBOX        IDC_COMBO3,216,155,89,99,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     LTEXT           "Effect:",IDC_STATIC,319,146,29,8
     COMBOBOX        IDC_COMBO4,319,155,89,99,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    GROUPBOX        "Plugins",IDC_STATIC,5,177,408,141
+    GROUPBOX        "Plugins",IDC_STATIC,5,177,408,141,0,WS_EX_TRANSPARENT
     PUSHBUTTON      "<<",IDC_BUTTON5,11,191,18,13
     PUSHBUTTON      ">>",IDC_BUTTON4,32,191,18,13
     COMBOBOX        IDC_COMBO5,53,191,135,148,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
@@ -1776,16 +1771,16 @@
     EDITTEXT        IDC_EDIT13,312,191,94,13,ES_CENTER | ES_AUTOHSCROLL
     CTEXT           "I/O Type:",IDC_STATIC,263,208,47,13,SS_CENTERIMAGE,WS_EX_STATICEDGE
     CONTROL         "",IDC_TEXT6,"Static",SS_LEFTNOWORDWRAP | SS_CENTERIMAGE | WS_GROUP,312,208,95,13,WS_EX_STATICEDGE
-    GROUPBOX        "Factory Preset",IDC_STATIC,11,226,177,34
+    GROUPBOX        "Factory Preset",IDC_STATIC,11,226,177,34,0,WS_EX_TRANSPARENT
     COMBOBOX        IDC_COMBO8,16,239,102,68,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     PUSHBUTTON      "Load",IDC_BUTTON6,122,239,27,13
     PUSHBUTTON      "Save",IDC_BUTTON8,154,239,27,13
-    GROUPBOX        "",IDC_STATIC,11,255,177,57
+    GROUPBOX        "",IDC_STATIC,11,255,177,57,0,WS_EX_TRANSPARENT
     CTEXT           "Parameter",IDC_STATIC,16,266,43,13,SS_CENTERIMAGE
     COMBOBOX        IDC_COMBO6,61,266,122,162,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     CONTROL         "ValSld",IDC_SLIDER9,"msctls_trackbar32",TBS_BOTH | TBS_NOTICKS | WS_TABSTOP,16,286,102,14
     EDITTEXT        IDC_EDIT14,121,286,62,14,ES_AUTOHSCROLL
-    GROUPBOX        "Mix Settings",IDC_STATIC,193,226,214,86
+    GROUPBOX        "Mix Settings",IDC_STATIC,193,226,214,86,0,WS_EX_TRANSPARENT
     CONTROL         "&Master",IDC_CHECK9,"Button",BS_AUTOCHECKBOX | BS_FLAT | WS_TABSTOP,199,242,46,10
     CTEXT           "Mix Mode",IDC_STATIC,245,241,37,13,SS_CENTERIMAGE,WS_EX_STATICEDGE
     COMBOBOX        IDC_COMBO9,285,241,62,99,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP

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

From: <sv...@op...> - 2024-06-15 12:48:29

Author: sagamusix
Date: Sat Jun 15 14:48:16 2024
New Revision: 21031
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21031

Log:
[Fix] General tab: Enabling composited window mode breaks UI updates when using UI scaling in Windows (which might also explain why some plugin GUIs have the same issue in OpenMPT). A better workaround for the issue with garbage background on the group boxes is to set their background mode to transparent (https://bugs.openmpt.org/view.php?id=1789).

Modified:
   trunk/OpenMPT/mptrack/mptrack.rc

Modified: trunk/OpenMPT/mptrack/mptrack.rc
==============================================================================
--- trunk/OpenMPT/mptrack/mptrack.rc	Sat Jun 15 00:03:43 2024	(r21030)
+++ trunk/OpenMPT/mptrack/mptrack.rc	Sat Jun 15 14:48:16 2024	(r21031)
@@ -19,10 +19,6 @@
 LANGUAGE LANG_GERMAN, SUBLANG_GERMAN
 #pragma code_page(1252)
 
-#if !defined(WS_EX_COMPOSITED)
-#define WS_EX_COMPOSITED 0x02000000L
-#endif
-
 /////////////////////////////////////////////////////////////////////////////
 //
 // Dialog
@@ -1703,22 +1699,21 @@
 
 IDD_VIEW_GLOBALS DIALOGEX 0, 0, 422, 326
 STYLE DS_SETFONT | DS_3DLOOK | DS_FIXEDSYS | WS_CHILD
-EXSTYLE WS_EX_COMPOSITED
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
-    CONTROL         "",IDC_TABCTRL1,"SysTabControl32",0x0,0,0,412,14
-    CONTROL         "",IDC_BUTTON9,"Button",BS_OWNERDRAW | BS_FLAT | WS_TABSTOP,66,16,33,11
-    CONTROL         "",IDC_BUTTON10,"Button",BS_OWNERDRAW | BS_FLAT | WS_TABSTOP,169,16,33,11
-    CONTROL         "",IDC_BUTTON11,"Button",BS_OWNERDRAW | BS_FLAT | WS_TABSTOP,272,16,33,11
-    CONTROL         "",IDC_BUTTON12,"Button",BS_OWNERDRAW | BS_FLAT | WS_TABSTOP,375,16,33,11
-    GROUPBOX        "Channel 1",IDC_TEXT1,5,18,99,157
+    CONTROL         "",IDC_TABCTRL1,"SysTabControl32",WS_TABSTOP,0,0,412,14
+    GROUPBOX        "Channel 1",IDC_TEXT1,5,18,99,157,0,WS_EX_TRANSPARENT
     EDITTEXT        IDC_EDIT9,10,30,89,12,ES_AUTOHSCROLL
-    GROUPBOX        "Channel 2",IDC_TEXT2,108,18,99,157
+    GROUPBOX        "Channel 2",IDC_TEXT2,108,18,99,157,0,WS_EX_TRANSPARENT
     EDITTEXT        IDC_EDIT10,113,30,89,12,ES_AUTOHSCROLL
-    GROUPBOX        "Channel 3",IDC_TEXT3,211,18,99,157
+    GROUPBOX        "Channel 3",IDC_TEXT3,211,18,99,157,0,WS_EX_TRANSPARENT
     EDITTEXT        IDC_EDIT11,216,30,89,12,ES_AUTOHSCROLL
-    GROUPBOX        "Channel 4",IDC_TEXT4,314,18,99,157
+    GROUPBOX        "Channel 4",IDC_TEXT4,314,18,99,157,0,WS_EX_TRANSPARENT
     EDITTEXT        IDC_EDIT12,319,30,89,12,ES_AUTOHSCROLL
+    CONTROL         "",IDC_BUTTON9,"Button",BS_OWNERDRAW | BS_FLAT | WS_TABSTOP,66,16,33,11,WS_EX_TRANSPARENT
+    CONTROL         "",IDC_BUTTON10,"Button",BS_OWNERDRAW | BS_FLAT | WS_TABSTOP,169,16,33,11,WS_EX_TRANSPARENT
+    CONTROL         "",IDC_BUTTON11,"Button",BS_OWNERDRAW | BS_FLAT | WS_TABSTOP,272,16,33,11,WS_EX_TRANSPARENT
+    CONTROL         "",IDC_BUTTON12,"Button",BS_OWNERDRAW | BS_FLAT | WS_TABSTOP,375,16,33,11,WS_EX_TRANSPARENT
     LTEXT           "Initial Volume:",IDC_STATIC,10,48,45,8
     EDITTEXT        IDC_EDIT1,63,46,36,12,ES_NUMBER
     CONTROL         "Spin1",IDC_SPIN1,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS,95,45,11,14
@@ -1767,7 +1762,7 @@
     COMBOBOX        IDC_COMBO3,216,155,89,99,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     LTEXT           "Effect:",IDC_STATIC,319,146,29,8
     COMBOBOX        IDC_COMBO4,319,155,89,99,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    GROUPBOX        "Plugins",IDC_STATIC,5,177,408,141
+    GROUPBOX        "Plugins",IDC_STATIC,5,177,408,141,0,WS_EX_TRANSPARENT
     PUSHBUTTON      "<<",IDC_BUTTON5,11,191,18,13
     PUSHBUTTON      ">>",IDC_BUTTON4,32,191,18,13
     COMBOBOX        IDC_COMBO5,53,191,135,148,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
@@ -1781,16 +1776,16 @@
     EDITTEXT        IDC_EDIT13,312,191,94,13,ES_CENTER | ES_AUTOHSCROLL
     CTEXT           "I/O Type:",IDC_STATIC,263,208,47,13,SS_CENTERIMAGE,WS_EX_STATICEDGE
     CONTROL         "",IDC_TEXT6,"Static",SS_LEFTNOWORDWRAP | SS_CENTERIMAGE | WS_GROUP,312,208,95,13,WS_EX_STATICEDGE
-    GROUPBOX        "Factory Preset",IDC_STATIC,11,226,177,34
+    GROUPBOX        "Factory Preset",IDC_STATIC,11,226,177,34,0,WS_EX_TRANSPARENT
     COMBOBOX        IDC_COMBO8,16,239,102,68,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     PUSHBUTTON      "Load",IDC_BUTTON6,122,239,27,13
     PUSHBUTTON      "Save",IDC_BUTTON8,154,239,27,13
-    GROUPBOX        "",IDC_STATIC,11,255,177,57
+    GROUPBOX        "",IDC_STATIC,11,255,177,57,0,WS_EX_TRANSPARENT
     CTEXT           "Parameter",IDC_STATIC,16,266,43,13,SS_CENTERIMAGE
     COMBOBOX        IDC_COMBO6,61,266,122,162,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     CONTROL         "ValSld",IDC_SLIDER9,"msctls_trackbar32",TBS_BOTH | TBS_NOTICKS | WS_TABSTOP,16,286,102,14
     EDITTEXT        IDC_EDIT14,121,286,62,14,ES_AUTOHSCROLL
-    GROUPBOX        "Mix Settings",IDC_STATIC,193,226,214,86
+    GROUPBOX        "Mix Settings",IDC_STATIC,193,226,214,86,0,WS_EX_TRANSPARENT
     CONTROL         "&Master",IDC_CHECK9,"Button",BS_AUTOCHECKBOX | BS_FLAT | WS_TABSTOP,199,242,46,10
     CTEXT           "Mix Mode",IDC_STATIC,245,241,37,13,SS_CENTERIMAGE,WS_EX_STATICEDGE
     COMBOBOX        IDC_COMBO9,285,241,62,99,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP

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

From: <sv...@op...> - 2024-06-14 22:03:50

Author: sagamusix
Date: Sat Jun 15 00:03:43 2024
New Revision: 21030
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21030

Log:
Merged revision(s) 21029 from trunk/OpenMPT:
[Fix] MOD: Allow sample swapping to work when swapping from a non-looping, stopped sample back to a looping sample. Fixes MOD.energy (https://www.un4seen.com/forum/?topic=15448.msg143034#msg143034).
........

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	Fri Jun 14 23:47:39 2024	(r21029)
+++ branches/OpenMPT-1.31/soundlib/Snd_fx.cpp	Sat Jun 15 00:03:43 2024	(r21030)
@@ -2707,8 +2707,8 @@
 			if(m_playBehaviour[kMODSampleSwap])
 			{
 				// ProTracker Compatibility: If a sample was stopped before, lone instrument numbers can retrigger it
-				// Test case: PTSwapEmpty.mod, PTInstrVolume.mod, SampleSwap.s3m
-				if(!chn.IsSamplePlaying() && (chn.pModSample == nullptr || !chn.pModSample->HasSampleData()))
+				// Test cases: PTSwapEmpty.mod, PTInstrVolume.mod, PTStoppedSwap.mod
+				if(!chn.IsSamplePlaying() && instr <= GetNumSamples() && Samples[instr].uFlags[CHN_LOOP])
 					keepInstr = true;
 			}

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

From: <sv...@op...> - 2024-06-14 21:47:53

Author: sagamusix
Date: Fri Jun 14 23:47:39 2024
New Revision: 21029
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21029

Log:
[Fix] MOD: Allow sample swapping to work when swapping from a non-looping, stopped sample back to a looping sample. Fixes MOD.energy (https://www.un4seen.com/forum/?topic=15448.msg143034#msg143034).

Modified:
   trunk/OpenMPT/soundlib/Snd_fx.cpp

Modified: trunk/OpenMPT/soundlib/Snd_fx.cpp
==============================================================================
--- trunk/OpenMPT/soundlib/Snd_fx.cpp	Fri Jun 14 23:11:55 2024	(r21028)
+++ trunk/OpenMPT/soundlib/Snd_fx.cpp	Fri Jun 14 23:47:39 2024	(r21029)
@@ -2825,8 +2825,8 @@
 			if(m_playBehaviour[kMODSampleSwap])
 			{
 				// ProTracker Compatibility: If a sample was stopped before, lone instrument numbers can retrigger it
-				// Test case: PTSwapEmpty.mod, PTInstrVolume.mod, SampleSwap.s3m
-				if(!chn.IsSamplePlaying() && (chn.pModSample == nullptr || !chn.pModSample->HasSampleData()))
+				// Test cases: PTSwapEmpty.mod, PTInstrVolume.mod, PTStoppedSwap.mod
+				if(!chn.IsSamplePlaying() && instr <= GetNumSamples() && Samples[instr].uFlags[CHN_LOOP])
 					keepInstr = true;
 			}

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

From: <sv...@op...> - 2024-06-14 21:12:11

Author: sagamusix
Date: Fri Jun 14 23:11:55 2024
New Revision: 21028
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21028

Log:
Merged revision(s) 21023, 21025-21027 from trunk/OpenMPT:
[Fix] XM: oggmod doesn't know what stereo samples are. As it is difficult (if possible at all) to reconstruct the waveform of the right channel, we restrict importing of those samples as mono samples instead of not importing them at all (which is what happened until now). The stereo sample path remains present as in theory someone could write a bugfixed oggmod tool that writes proper stereo samples.
........
[Imp] DTM: Detect Digital Tracker 2.3, which is the only version writing the ProTracker-like pattern format.
........
[Fix] AMF: When running out of sample slots, file reading became be misaligned because the sample name was not skipped.
........
[Imp] IT: Detect itwriter (https://github.com/chr15m/itwriter/).
........

Modified:
   branches/OpenMPT-1.31/   (props changed)
   branches/OpenMPT-1.31/soundlib/Load_ams.cpp
   branches/OpenMPT-1.31/soundlib/Load_dtm.cpp
   branches/OpenMPT-1.31/soundlib/Load_it.cpp
   branches/OpenMPT-1.31/soundlib/Load_xm.cpp

Modified: branches/OpenMPT-1.31/soundlib/Load_ams.cpp
==============================================================================
--- branches/OpenMPT-1.31/soundlib/Load_ams.cpp	Fri Jun 14 22:20:17 2024	(r21027)
+++ branches/OpenMPT-1.31/soundlib/Load_ams.cpp	Fri Jun 14 23:11:55 2024	(r21028)
@@ -826,12 +826,12 @@
 		}
 
 		uint8 numSamples = file.ReadUint8();
-		uint8 sampleAssignment[120];
-		MemsetZero(sampleAssignment);	// Only really needed for v2.0, where the lowest and highest octave aren't cleared.
+		std::array<uint8, 120> sampleAssignment;
+		sampleAssignment.fill(0);  // Only really needed for v2.0, where the lowest and highest octave aren't cleared.
 
 		if(numSamples == 0
-			|| (fileHeader.versionLow > 0 && !file.ReadArray(sampleAssignment))	// v2.01+: 120 Notes
-			|| (fileHeader.versionLow == 0 && !file.ReadRaw(mpt::span(sampleAssignment + 12, 96)).size()))	// v2.0: 96 Notes
+			|| (fileHeader.versionLow > 0 && !file.ReadArray(sampleAssignment))  // v2.01+: 120 Notes
+			|| (fileHeader.versionLow == 0 && !file.ReadRaw(mpt::as_span(sampleAssignment).subspan(12, 96)).size()))  // v2.0: 96 Notes
 		{
 			continue;
 		}
@@ -878,18 +878,17 @@
 		// Sample headers - we will have to read them even for shadow samples, and we will have to load them several times,
 		// as it is possible that shadow samples use different sample settings like base frequency or panning.
 		const SAMPLEINDEX firstSmp = GetNumSamples() + 1;
+		std::string sampleName;
 		for(SAMPLEINDEX smp = 0; smp < numSamples; smp++)
 		{
-			if(firstSmp + smp >= MAX_SAMPLES)
-			{
-				file.Skip(sizeof(AMS2SampleHeader));
-				break;
-			}
-			file.ReadSizedString<uint8le, mpt::String::spacePadded>(m_szNames[firstSmp + smp]);
-
+			file.ReadSizedString<uint8le, mpt::String::spacePadded>(sampleName);
 			AMS2SampleHeader sampleHeader;
 			file.ReadStruct(sampleHeader);
+			if(firstSmp + smp >= MAX_SAMPLES)
+				continue;
+
 			sampleHeader.ConvertToMPT(Samples[firstSmp + smp]);
+			m_szNames[firstSmp + smp] = sampleName;
 
 			uint16 settings = (instrHeader.shadowInstr & instrIndexMask)
 				| ((smp << sampleIndexShift) & sampleIndexMask)

Modified: branches/OpenMPT-1.31/soundlib/Load_dtm.cpp
==============================================================================
--- branches/OpenMPT-1.31/soundlib/Load_dtm.cpp	Fri Jun 14 22:20:17 2024	(r21027)
+++ branches/OpenMPT-1.31/soundlib/Load_dtm.cpp	Fri Jun 14 23:11:55 2024	(r21028)
@@ -576,6 +576,9 @@
 	if(patternFormat == DTM_206_PATTERN_FORMAT)
 	{
 		tracker = U_("Digital Home Studio");
+	} else if(patternFormat == DTM_PT_PATTERN_FORMAT)
+	{
+		tracker = U_("Digital Tracker 2.3");
 	} else if(FileReader chunk = chunks.GetChunk(DTMChunk::idVERS))
 	{
 		uint32 version = chunk.ReadUint32BE();

Modified: branches/OpenMPT-1.31/soundlib/Load_it.cpp
==============================================================================
--- branches/OpenMPT-1.31/soundlib/Load_it.cpp	Fri Jun 14 22:20:17 2024	(r21027)
+++ branches/OpenMPT-1.31/soundlib/Load_it.cpp	Fri Jun 14 23:11:55 2024	(r21028)
@@ -1320,7 +1320,12 @@
 				madeWithTracker = MPT_UFORMAT("ITMCK {}.{}.{}")((fileHeader.cwtv >> 8) & 0x0F, (fileHeader.cwtv >> 4) & 0x0F, fileHeader.cwtv & 0x0F);
 			break;
 		case 0xD:
-			madeWithTracker = U_("spc2it");
+			if(fileHeader.cwtv == 0xDAEB)
+				madeWithTracker = U_("spc2it");
+			else if(fileHeader.cwtv == 0xD1CE)
+				madeWithTracker = U_("itwriter");
+			else
+				madeWithTracker = U_("Unknown");
 			break;
 		}
 	}

Modified: branches/OpenMPT-1.31/soundlib/Load_xm.cpp
==============================================================================
--- branches/OpenMPT-1.31/soundlib/Load_xm.cpp	Fri Jun 14 22:20:17 2024	(r21027)
+++ branches/OpenMPT-1.31/soundlib/Load_xm.cpp	Fri Jun 14 23:11:55 2024	(r21028)
@@ -480,6 +480,13 @@
 						{
 							decodedSamples = ret;
 							LimitMax(decodedSamples, mpt::saturate_cast<long>(sample.nLength - offset));
+							if(offset == 0 && channels == 1 && sample.GetNumChannels() == 2)
+							{
+								// oggmod doesn't know what stereo samples are, so it treats them as mono samples, but doesn't clear the unknown stereo flag.
+								// We just take the left channel in this case, as it is difficult (if possible at all) to properly reconstruct the waveform of the right channel.
+								// Due to XM's delta-encoding and Vorbis being a lossless codec, samples could distort easily even when the delta encoding was off by a very small amount.
+								sample.uFlags.reset(CHN_STEREO);
+							}
 							if(decodedSamples > 0 && channels == sample.GetNumChannels())
 							{
 								if(sample.uFlags[CHN_16BIT])

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

From: <sv...@op...> - 2024-06-14 20:20:25

Author: sagamusix
Date: Fri Jun 14 22:20:17 2024
New Revision: 21027
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21027

Log:
[Imp] IT: Detect itwriter (https://github.com/chr15m/itwriter/).

Modified:
   trunk/OpenMPT/soundlib/Load_it.cpp

Modified: trunk/OpenMPT/soundlib/Load_it.cpp
==============================================================================
--- trunk/OpenMPT/soundlib/Load_it.cpp	Thu Jun 13 21:56:07 2024	(r21026)
+++ trunk/OpenMPT/soundlib/Load_it.cpp	Fri Jun 14 22:20:17 2024	(r21027)
@@ -1298,7 +1298,12 @@
 				madeWithTracker = MPT_UFORMAT("ITMCK {}.{}.{}")((fileHeader.cwtv >> 8) & 0x0F, (fileHeader.cwtv >> 4) & 0x0F, fileHeader.cwtv & 0x0F);
 			break;
 		case 0xD:
-			madeWithTracker = U_("spc2it");
+			if(fileHeader.cwtv == 0xDAEB)
+				madeWithTracker = U_("spc2it");
+			else if(fileHeader.cwtv == 0xD1CE)
+				madeWithTracker = U_("itwriter");
+			else
+				madeWithTracker = U_("Unknown");
 			break;
 		}
 	}

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

From: <sv...@op...> - 2024-06-13 19:56:26

Author: sagamusix
Date: Thu Jun 13 21:56:07 2024
New Revision: 21026
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21026

Log:
[Fix] AMF: When running out of sample slots, file reading became be misaligned because the sample name was not skipped.

Modified:
   trunk/OpenMPT/soundlib/Load_ams.cpp

Modified: trunk/OpenMPT/soundlib/Load_ams.cpp
==============================================================================
--- trunk/OpenMPT/soundlib/Load_ams.cpp	Thu Jun 13 21:43:32 2024	(r21025)
+++ trunk/OpenMPT/soundlib/Load_ams.cpp	Thu Jun 13 21:56:07 2024	(r21026)
@@ -823,12 +823,12 @@
 		}
 
 		uint8 numSamples = file.ReadUint8();
-		uint8 sampleAssignment[120];
-		MemsetZero(sampleAssignment);  // Only really needed for v2.0, where the lowest and highest octave aren't cleared.
+		std::array<uint8, 120> sampleAssignment;
+		sampleAssignment.fill(0);  // Only really needed for v2.0, where the lowest and highest octave aren't cleared.
 
 		if(numSamples == 0
 			|| (fileHeader.versionLow > 0 && !file.ReadArray(sampleAssignment))  // v2.01+: 120 Notes
-			|| (fileHeader.versionLow == 0 && !file.ReadRaw(mpt::span(sampleAssignment + 12, 96)).size()))  // v2.0: 96 Notes
+			|| (fileHeader.versionLow == 0 && !file.ReadRaw(mpt::as_span(sampleAssignment).subspan(12, 96)).size()))  // v2.0: 96 Notes
 		{
 			continue;
 		}
@@ -875,18 +875,17 @@
 		// Sample headers - we will have to read them even for shadow samples, and we will have to load them several times,
 		// as it is possible that shadow samples use different sample settings like base frequency or panning.
 		const SAMPLEINDEX firstSmp = GetNumSamples() + 1;
+		std::string sampleName;
 		for(SAMPLEINDEX smp = 0; smp < numSamples; smp++)
 		{
-			if(firstSmp + smp >= MAX_SAMPLES)
-			{
-				file.Skip(sizeof(AMS2SampleHeader));
-				break;
-			}
-			file.ReadSizedString<uint8le, mpt::String::spacePadded>(m_szNames[firstSmp + smp]);
-
+			file.ReadSizedString<uint8le, mpt::String::spacePadded>(sampleName);
 			AMS2SampleHeader sampleHeader;
 			file.ReadStruct(sampleHeader);
+			if(firstSmp + smp >= MAX_SAMPLES)
+				continue;
+
 			sampleHeader.ConvertToMPT(Samples[firstSmp + smp]);
+			m_szNames[firstSmp + smp] = sampleName;
 
 			uint16 settings = (instrHeader.shadowInstr & instrIndexMask)
 				| ((smp << sampleIndexShift) & sampleIndexMask)

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

From: <sv...@op...> - 2024-06-13 19:43:44

Author: sagamusix
Date: Thu Jun 13 21:43:32 2024
New Revision: 21025
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21025

Log:
[Imp] DTM: Detect Digital Tracker 2.3, which is the only version writing the ProTracker-like pattern format.

Modified:
   trunk/OpenMPT/soundlib/Load_dtm.cpp

Modified: trunk/OpenMPT/soundlib/Load_dtm.cpp
==============================================================================
--- trunk/OpenMPT/soundlib/Load_dtm.cpp	Thu Jun 13 21:42:57 2024	(r21024)
+++ trunk/OpenMPT/soundlib/Load_dtm.cpp	Thu Jun 13 21:43:32 2024	(r21025)
@@ -574,6 +574,9 @@
 	if(patternFormat == DTM_206_PATTERN_FORMAT)
 	{
 		tracker = U_("Digital Home Studio");
+	} else if(patternFormat == DTM_PT_PATTERN_FORMAT)
+	{
+		tracker = U_("Digital Tracker 2.3");
 	} else if(FileReader chunk = chunks.GetChunk(DTMChunk::idVERS))
 	{
 		uint32 version = chunk.ReadUint32BE();

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

From: <sv...@op...> - 2024-06-13 19:43:08

Author: sagamusix
Date: Thu Jun 13 21:42:57 2024
New Revision: 21024
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21024

Log:
[Ref] FTM: Don't set number of instruments. No instruments are created so it's reset to 0 later anyway.

Modified:
   trunk/OpenMPT/soundlib/Load_ftm.cpp

Modified: trunk/OpenMPT/soundlib/Load_ftm.cpp
==============================================================================
--- trunk/OpenMPT/soundlib/Load_ftm.cpp	Thu Jun 13 21:42:29 2024	(r21023)
+++ trunk/OpenMPT/soundlib/Load_ftm.cpp	Thu Jun 13 21:42:57 2024	(r21024)
@@ -132,7 +132,7 @@
 	m_songName = mpt::String::ReadBuf(mpt::String::nullTerminated, fileHeader.title);
 	m_songArtist = mpt::ToUnicode(mpt::Charset::Amiga_no_C1, mpt::String::ReadBuf(mpt::String::nullTerminated, fileHeader.artist));
 
-	m_nSamples = m_nInstruments = fileHeader.numSamples;
+	m_nSamples = fileHeader.numSamples;
 	for(SAMPLEINDEX smp = 1; smp <= m_nSamples; smp++)
 	{
 		Samples[smp].Initialize(MOD_TYPE_MOD);

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

Flat | Threaded

<< < 1 .. 120 121 122 123 124 .. 964 > >> (Page 122 of 964)