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

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

Flat | Threaded

<< < 1 .. 126 127 128 129 130 .. 964 > >> (Page 128 of 964)

[OMPT-svn-commit] OpenMPT r20906 - in branches/OpenMPT-1.30: . contrib/fuzzing soundlib

From: <sv...@op...> - 2024-06-02 14:49:15

Author: sagamusix
Date: Sun Jun  2 16:49:04 2024
New Revision: 20906
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20906

Log:
Merged revision(s) 20901, 20903-20904 from trunk/OpenMPT:
[Fix] PSM: File header probing was stricter than actual file loader.
........
[Fix] Fuzzer: Don't return from the AFL loop if we weren't able to load a file.
........
[Fix] PSM: Header probing was still too strict.
........

Modified:
   branches/OpenMPT-1.30/   (props changed)
   branches/OpenMPT-1.30/contrib/fuzzing/fuzz.cpp
   branches/OpenMPT-1.30/soundlib/Load_psm.cpp

Modified: branches/OpenMPT-1.30/contrib/fuzzing/fuzz.cpp
==============================================================================
--- branches/OpenMPT-1.30/contrib/fuzzing/fuzz.cpp	Sun Jun  2 16:48:17 2024	(r20905)
+++ branches/OpenMPT-1.30/contrib/fuzzing/fuzz.cpp	Sun Jun  2 16:49:04 2024	(r20906)
@@ -60,7 +60,7 @@
 		OpenMPT::mpt::reinit_global_random();
 		openmpt_module * mod = openmpt_module_create_from_memory2( fileBuffer, fileSize, nullptr, nullptr, ErrFunc, nullptr, nullptr, nullptr, nullptr);
 		if ( mod == NULL )
-			return 1;
+			break;
 
 		// verify API contract: If the file can be loaded, header probing must be successful too.
 		if ( openmpt_probe_file_header( OPENMPT_PROBE_FILE_HEADER_FLAGS_DEFAULT, fileBuffer, fileSize, fileSize, nullptr, nullptr, ErrFunc, nullptr, nullptr, nullptr ) == OPENMPT_PROBE_FILE_HEADER_RESULT_FAILURE )

Modified: branches/OpenMPT-1.30/soundlib/Load_psm.cpp
==============================================================================
--- branches/OpenMPT-1.30/soundlib/Load_psm.cpp	Sun Jun  2 16:48:17 2024	(r20905)
+++ branches/OpenMPT-1.30/soundlib/Load_psm.cpp	Sun Jun  2 16:49:04 2024	(r20906)
@@ -261,19 +261,6 @@
 	{
 		return ProbeFailure;
 	}
-	PSMChunk chunkHeader;
-	if(!file.ReadStruct(chunkHeader))
-	{
-		return ProbeWantMoreData;
-	}
-	if(chunkHeader.length == 0)
-	{
-		return ProbeFailure;
-	}
-	if((chunkHeader.id & 0x7F7F7F7Fu) != chunkHeader.id) // ASCII?
-	{
-		return ProbeFailure;
-	}
 	MPT_UNREFERENCED_PARAMETER(pfilesize);
 	return ProbeSuccess;
 }

[OMPT-svn-commit] OpenMPT r20905 - in branches/OpenMPT-1.31: . contrib/fuzzing soundlib

From: <sv...@op...> - 2024-06-02 14:48:24

Author: sagamusix
Date: Sun Jun  2 16:48:17 2024
New Revision: 20905
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20905

Log:
Merged revision(s) 20901-20904 from trunk/OpenMPT:
[Fix] PSM: File header probing was stricter than actual file loader.
........
[Fix] DSm: Don't import as Amiga module, as this format can exceed the Amiga frequency range.
........
[Fix] Fuzzer: Don't return from the AFL loop if we weren't able to load a file.
........
[Fix] PSM: Header probing was still too strict.
........

Modified:
   branches/OpenMPT-1.31/   (props changed)
   branches/OpenMPT-1.31/contrib/fuzzing/fuzz.cpp
   branches/OpenMPT-1.31/soundlib/Load_dsm.cpp
   branches/OpenMPT-1.31/soundlib/Load_psm.cpp

Modified: branches/OpenMPT-1.31/contrib/fuzzing/fuzz.cpp
==============================================================================
--- branches/OpenMPT-1.31/contrib/fuzzing/fuzz.cpp	Sun Jun  2 16:47:37 2024	(r20904)
+++ branches/OpenMPT-1.31/contrib/fuzzing/fuzz.cpp	Sun Jun  2 16:48:17 2024	(r20905)
@@ -60,7 +60,7 @@
 		OpenMPT::mpt::reinit_global_random();
 		openmpt_module * mod = openmpt_module_create_from_memory2( fileBuffer, fileSize, nullptr, nullptr, ErrFunc, nullptr, nullptr, nullptr, nullptr);
 		if ( mod == NULL )
-			return 1;
+			break;
 
 		// verify API contract: If the file can be loaded, header probing must be successful too.
 		if ( openmpt_probe_file_header( OPENMPT_PROBE_FILE_HEADER_FLAGS_DEFAULT, fileBuffer, fileSize, fileSize, nullptr, nullptr, ErrFunc, nullptr, nullptr, nullptr ) == OPENMPT_PROBE_FILE_HEADER_RESULT_FAILURE )

Modified: branches/OpenMPT-1.31/soundlib/Load_dsm.cpp
==============================================================================
--- branches/OpenMPT-1.31/soundlib/Load_dsm.cpp	Sun Jun  2 16:47:37 2024	(r20904)
+++ branches/OpenMPT-1.31/soundlib/Load_dsm.cpp	Sun Jun  2 16:48:17 2024	(r20905)
@@ -401,7 +401,7 @@
 		return true;
 
 	InitializeGlobals(MOD_TYPE_MOD);
-	m_SongFlags.set(SONG_IMPORTED);
+	m_SongFlags = SONG_IMPORTED;
 	m_nChannels = fileHeader.numChannels;
 	static_assert(MAX_BASECHANNELS >= 32 && MAX_SAMPLES > 255);
 	m_nSamples = fileHeader.numSamples;

Modified: branches/OpenMPT-1.31/soundlib/Load_psm.cpp
==============================================================================
--- branches/OpenMPT-1.31/soundlib/Load_psm.cpp	Sun Jun  2 16:47:37 2024	(r20904)
+++ branches/OpenMPT-1.31/soundlib/Load_psm.cpp	Sun Jun  2 16:48:17 2024	(r20905)
@@ -263,19 +263,6 @@
 	{
 		return ProbeFailure;
 	}
-	PSMChunk chunkHeader;
-	if(!file.ReadStruct(chunkHeader))
-	{
-		return ProbeWantMoreData;
-	}
-	if(chunkHeader.length == 0)
-	{
-		return ProbeFailure;
-	}
-	if((chunkHeader.id & 0x7F7F7F7Fu) != chunkHeader.id) // ASCII?
-	{
-		return ProbeFailure;
-	}
 	MPT_UNREFERENCED_PARAMETER(pfilesize);
 	return ProbeSuccess;
 }

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

From: <sv...@op...> - 2024-06-02 14:47:44

Author: sagamusix
Date: Sun Jun  2 16:47:37 2024
New Revision: 20904
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20904

Log:
[Fix] PSM: Header probing was still too strict.

Modified:
   trunk/OpenMPT/soundlib/Load_psm.cpp

Modified: trunk/OpenMPT/soundlib/Load_psm.cpp
==============================================================================
--- trunk/OpenMPT/soundlib/Load_psm.cpp	Sun Jun  2 15:04:17 2024	(r20903)
+++ trunk/OpenMPT/soundlib/Load_psm.cpp	Sun Jun  2 16:47:37 2024	(r20904)
@@ -257,15 +257,6 @@
 	{
 		return ProbeFailure;
 	}
-	PSMChunk chunkHeader;
-	if(!file.ReadStruct(chunkHeader))
-	{
-		return ProbeWantMoreData;
-	}
-	if(chunkHeader.length == 0)
-	{
-		return ProbeFailure;
-	}
 	MPT_UNREFERENCED_PARAMETER(pfilesize);
 	return ProbeSuccess;
 }

[OMPT-svn-commit] OpenMPT r20903 - trunk/OpenMPT/contrib/fuzzing

From: <sv...@op...> - 2024-06-02 13:04:30

Author: sagamusix
Date: Sun Jun  2 15:04:17 2024
New Revision: 20903
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20903

Log:
[Fix] Fuzzer: Don't return from the AFL loop if we weren't able to load a file.

Modified:
   trunk/OpenMPT/contrib/fuzzing/fuzz.cpp

Modified: trunk/OpenMPT/contrib/fuzzing/fuzz.cpp
==============================================================================
--- trunk/OpenMPT/contrib/fuzzing/fuzz.cpp	Sun Jun  2 01:12:52 2024	(r20902)
+++ trunk/OpenMPT/contrib/fuzzing/fuzz.cpp	Sun Jun  2 15:04:17 2024	(r20903)
@@ -60,7 +60,7 @@
 		OpenMPT::mpt::reinit_global_random();
 		openmpt_module * mod = openmpt_module_create_from_memory2( fileBuffer, fileSize, nullptr, nullptr, ErrFunc, nullptr, nullptr, nullptr, nullptr);
 		if ( mod == NULL )
-			return 1;
+			break;
 
 		// verify API contract: If the file can be loaded, header probing must be successful too.
 		if ( openmpt_probe_file_header( OPENMPT_PROBE_FILE_HEADER_FLAGS_DEFAULT, fileBuffer, fileSize, fileSize, nullptr, nullptr, ErrFunc, nullptr, nullptr, nullptr ) == OPENMPT_PROBE_FILE_HEADER_RESULT_FAILURE )

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

From: <sv...@op...> - 2024-06-01 23:13:04

Author: sagamusix
Date: Sun Jun  2 01:12:52 2024
New Revision: 20902
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20902

Log:
[Fix] DSm: Don't import as Amiga module, as this format can exceed the Amiga frequency range.

Modified:
   trunk/OpenMPT/soundlib/Load_dsm.cpp

Modified: trunk/OpenMPT/soundlib/Load_dsm.cpp
==============================================================================
--- trunk/OpenMPT/soundlib/Load_dsm.cpp	Sat Jun  1 23:50:46 2024	(r20901)
+++ trunk/OpenMPT/soundlib/Load_dsm.cpp	Sun Jun  2 01:12:52 2024	(r20902)
@@ -401,7 +401,7 @@
 		return true;
 
 	InitializeGlobals(MOD_TYPE_MOD);
-	m_SongFlags.set(SONG_IMPORTED);
+	m_SongFlags = SONG_IMPORTED;
 	m_nChannels = fileHeader.numChannels;
 	static_assert(MAX_BASECHANNELS >= 32 && MAX_SAMPLES > 255);
 	m_nSamples = fileHeader.numSamples;

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

From: <sv...@op...> - 2024-06-01 21:50:58

Author: sagamusix
Date: Sat Jun  1 23:50:46 2024
New Revision: 20901
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20901

Log:
[Fix] PSM: File header probing was stricter than actual file loader.

Modified:
   trunk/OpenMPT/soundlib/Load_psm.cpp

Modified: trunk/OpenMPT/soundlib/Load_psm.cpp
==============================================================================
--- trunk/OpenMPT/soundlib/Load_psm.cpp	Sat Jun  1 23:44:32 2024	(r20900)
+++ trunk/OpenMPT/soundlib/Load_psm.cpp	Sat Jun  1 23:50:46 2024	(r20901)
@@ -266,10 +266,6 @@
 	{
 		return ProbeFailure;
 	}
-	if((chunkHeader.id & 0x7F7F7F7Fu) != chunkHeader.id) // ASCII?
-	{
-		return ProbeFailure;
-	}
 	MPT_UNREFERENCED_PARAMETER(pfilesize);
 	return ProbeSuccess;
 }

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

From: <sv...@op...> - 2024-06-01 21:44:38

Author: sagamusix
Date: Sat Jun  1 23:44:32 2024
New Revision: 20900
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20900

Log:
[Fix] FTM: Possible crash when combining a sample modification command disabling the loop with "clone track", which would then copy over the loop flag from the sample slot again.

Modified:
   trunk/OpenMPT/soundlib/InstrumentSynth.cpp

Modified: trunk/OpenMPT/soundlib/InstrumentSynth.cpp
==============================================================================
--- trunk/OpenMPT/soundlib/InstrumentSynth.cpp	Sat Jun  1 23:43:03 2024	(r20899)
+++ trunk/OpenMPT/soundlib/InstrumentSynth.cpp	Sat Jun  1 23:44:32 2024	(r20900)
@@ -752,8 +752,7 @@
 				chn.nNewIns = srcChn.nNewIns;
 				chn.pModSample = srcChn.pModSample;
 				chn.position = srcChn.position;
-				if(srcChn.pModSample)
-					chn.dwFlags = (chn.dwFlags & CHN_CHANNELFLAGS) | srcChn.pModSample->uFlags;
+				chn.dwFlags = (chn.dwFlags & CHN_CHANNELFLAGS) | (srcChn.dwFlags & CHN_SAMPLEFLAGS);
 				chn.nLength = srcChn.nLength;
 				chn.nLoopStart = srcChn.nLoopStart;
 				chn.nLoopEnd = srcChn.nLoopEnd;

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

From: <sv...@op...> - 2024-06-01 21:43:10

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

Log:
[Fix] ChipTracker probing was inconsistent with actual loader.

Modified:
   trunk/OpenMPT/soundlib/Load_kris.cpp

Modified: trunk/OpenMPT/soundlib/Load_kris.cpp
==============================================================================
--- trunk/OpenMPT/soundlib/Load_kris.cpp	Sat Jun  1 23:19:57 2024	(r20898)
+++ trunk/OpenMPT/soundlib/Load_kris.cpp	Sat Jun  1 23:43:03 2024	(r20899)
@@ -33,7 +33,8 @@
 	{
 		MODSampleHeader sampleHeader;
 		file.ReadStruct(sampleHeader);
-		invalidBytes += sampleHeader.GetInvalidByteScore();
+		if(sampleHeader.name[0] != 0)
+			invalidBytes += sampleHeader.GetInvalidByteScore();
 		if(invalidBytes > MODSampleHeader::INVALID_BYTE_THRESHOLD)
 			return ProbeFailure;
 	}

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

From: <sv...@op...> - 2024-06-01 21:20:04

Author: sagamusix
Date: Sat Jun  1 23:19:57 2024
New Revision: 20898
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20898

Log:
[Fix] FTM: The song tempo appears to fluctuate - especially on the first played beat the tempo appears to be slower, although this sometimes repeats at later points in time. Change the tempo conversion so that it matches the tempo that FTM hits *mpst of the time*. Fixes stomper.ftm.

Modified:
   trunk/OpenMPT/soundlib/InstrumentSynth.cpp
   trunk/OpenMPT/soundlib/Load_ftm.cpp

Modified: trunk/OpenMPT/soundlib/InstrumentSynth.cpp
==============================================================================
--- trunk/OpenMPT/soundlib/InstrumentSynth.cpp	Sat Jun  1 16:38:52 2024	(r20897)
+++ trunk/OpenMPT/soundlib/InstrumentSynth.cpp	Sat Jun  1 23:19:57 2024	(r20898)
@@ -809,7 +809,7 @@
 		playState.m_nGlobalVolume = event.u16;
 		return false;
 	case Event::Type::FTM_SetTempo:
-		playState.m_nMusicTempo = TEMPO(1766278.163 / event.u16);
+		playState.m_nMusicTempo = TEMPO(1777517.482 / event.u16);
 		return false;
 	case Event::Type::FTM_SetSpeed:
 		playState.m_nMusicSpeed = event.u16;

Modified: trunk/OpenMPT/soundlib/Load_ftm.cpp
==============================================================================
--- trunk/OpenMPT/soundlib/Load_ftm.cpp	Sat Jun  1 16:38:52 2024	(r20897)
+++ trunk/OpenMPT/soundlib/Load_ftm.cpp	Sat Jun  1 23:19:57 2024	(r20898)
@@ -29,7 +29,7 @@
 	uint8    version;     // ...I guess?
 	uint8    numSamples;  // 0...63
 	uint16be numMeasures;
-	uint16be tempo;         // Smaller values = faster, the default of 14209 is ~124.307 BPM
+	uint16be tempo;         // Smaller values = faster, the default of 14209 is ~125.098 BPM (though it seems to fluctuate and *sometimes* it drops to 124.307 BPM?)
 	uint8    tonality;      // Not relevant for playback (0 = C/a, 1 = Db/bb, etc.)
 	uint8    muteStatus;
 	uint8    globalVolume;  // 0...63
@@ -115,7 +115,7 @@
 	m_playBehaviour.set(kST3NoMutedChannels);
 	m_playBehaviour.set(kApplyUpperPeriodLimit);
 	Order().SetDefaultSpeed(fileHeader.ticksPerRow);
-	Order().SetDefaultTempo(TEMPO(1766278.163 / fileHeader.tempo));
+	Order().SetDefaultTempo(TEMPO(1777517.482 / fileHeader.tempo));
 	m_nDefaultRowsPerMeasure = fileHeader.rowsPerMeasure;
 	if(fileHeader.ticksPerRow == 2 || fileHeader.ticksPerRow == 4 || fileHeader.ticksPerRow == 8 || fileHeader.ticksPerRow == 16)
 		m_nDefaultRowsPerBeat = m_nDefaultRowsPerMeasure / 3;

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

From: <sv...@op...> - 2024-06-01 14:39:05

Author: manx
Date: Sat Jun  1 16:38:52 2024
New Revision: 20897
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20897

Log:
[Imp] build: download_externals.cmd: Provide multiple URLs for WA5.55_SDK.exe.

Modified:
   trunk/OpenMPT/build/download_externals.cmd

Modified: trunk/OpenMPT/build/download_externals.cmd
==============================================================================
--- trunk/OpenMPT/build/download_externals.cmd	Sat Jun  1 16:37:36 2024	(r20896)
+++ trunk/OpenMPT/build/download_externals.cmd	Sat Jun  1 16:38:52 2024	(r20897)
@@ -33,7 +33,7 @@
 call build\scriptlib\download.cmd "build\externals\7z2406-extra.7z"                1610111 6b88a761f7cc8b8affc074b24750bcdc65cc3ab18d127c8bfdd1eca953d43e21558eb1137c4b934689990564d7d24cf14e249a773dc1e5ddb7316b10d73682f8 "https://7-zip.org/a/7z2406-extra.7z" || goto error
 call build\scriptlib\download.cmd "build\externals\7z2406-x64.exe"                 1619556 b635b449f49aac29234f677e662be35f72a059401ea0786d956485d07134f9dd10ed284338503f08ff7aad16833cf034eb955ca34e1faf35a8177ccad1f20c75 "https://7-zip.org/a/7z2406-x64.exe" || goto error
 
-call build\scriptlib\download.cmd "build\externals\WA5.55_SDK.exe"                  336166 394375db8a16bf155b5de9376f6290488ab339e503dbdfdc4e2f5bede967799e625c559cca363bc988324f1a8e86e5fd28a9f697422abd7bb3dcde4a766607b5 "https://web.archive.org/web/20131217072017if_/http://download.nullsoft.com/winamp/plugin-dev/WA5.55_SDK.exe" || goto error
+call build\scriptlib\download.cmd "build\externals\WA5.55_SDK.exe"                  336166 394375db8a16bf155b5de9376f6290488ab339e503dbdfdc4e2f5bede967799e625c559cca363bc988324f1a8e86e5fd28a9f697422abd7bb3dcde4a766607b5 "http://download.nullsoft.com/winamp/plugin-dev/WA5.55_SDK.exe" "https://web.archive.org/web/20131217072017if_/http://download.nullsoft.com/winamp/plugin-dev/WA5.55_SDK.exe" || goto error
 call build\scriptlib\download.cmd "build\externals\xmp-sdk.zip"                     322744 62c442d656d4bb380360368a0f5f01da11b4ed54333d7f54f875a9a5ec390b08921e00bd08e62cd7a0a5fe642e3377023f20a950cc2a42898ff4cda9ab88fc91 "https://www.un4seen.com/files/xmp-sdk.zip" || goto error
 
 call build\scriptlib\download.cmd "build\externals\htmlhelp.exe"                   3509072 d91371244ea98c691b4674ee266c4a2496a296800c176adae069d21f5c52c0763b21cc7859cfffa865b89e50171a2c99a6d14620c32f7d72c0ef04045348f856 "https://web.archive.org/web/20200918004813if_/http://download.microsoft.com/download/0/A/9/0A939EF6-E31C-430F-A3DF-DFAE7960D564/htmlhelp.exe" || goto error

[OMPT-svn-commit] OpenMPT r20896 - in trunk/OpenMPT/build: . scriptlib

From: <sv...@op...> - 2024-06-01 14:37:44

Author: manx
Date: Sat Jun  1 16:37:36 2024
New Revision: 20896
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20896

Log:
[Ref] build: download_externals.cmd: Rewrite to closer match download_externals.sh.
[Imp] build: download_externals.cmd: Support multiple URLs per file.

Modified:
   trunk/OpenMPT/build/download_externals.cmd
   trunk/OpenMPT/build/scriptlib/Verify-File.ps1
   trunk/OpenMPT/build/scriptlib/download.cmd

Modified: trunk/OpenMPT/build/download_externals.cmd
==============================================================================
--- trunk/OpenMPT/build/download_externals.cmd	Sat Jun  1 15:58:36 2024	(r20895)
+++ trunk/OpenMPT/build/download_externals.cmd	Sat Jun  1 16:37:36 2024	(r20896)
@@ -1,15 +1,15 @@
 @echo off
 
 if not "x%1" == "xauto" (
-	echo "WARNING: This script will unconditionally remove all files from the destination directories."
-	pause
+ echo "WARNING: This script will unconditionally remove all files from the destination directories."
+ pause
 )
 
 if "x%2" == "xnodownload" (
- set MPT_DOWNLOAD=no
+ set MPT_DOWNLOAD_DO=no
 )
 if not "x%2" == "xnodownload" (
- set MPT_DOWNLOAD=yes
+ set MPT_DOWNLOAD_DO=yes
 )
 
 set MY_DIR=%CD%
@@ -29,32 +29,22 @@
 if not exist "build\tools"     mkdir "build\tools"
 
 
-call build\scriptlib\download.cmd %MPT_DOWNLOAD% x%1 "https://7-zip.org/a/7za920.zip"                                                              "build\externals\7za920.zip"                   84e830c91a0e8ae499cc4814080da6569d8a6acbddc585c8b62abc86c809793aeb669b0a741063a379fd281ade85f120bc27efeb67d63bf961be893eec8bc3b3  384846 || goto error
+call build\scriptlib\download.cmd "build\externals\7za920.zip"                      384846 84e830c91a0e8ae499cc4814080da6569d8a6acbddc585c8b62abc86c809793aeb669b0a741063a379fd281ade85f120bc27efeb67d63bf961be893eec8bc3b3 "https://7-zip.org/a/7za920.zip" || goto error
+call build\scriptlib\download.cmd "build\externals\7z2406-extra.7z"                1610111 6b88a761f7cc8b8affc074b24750bcdc65cc3ab18d127c8bfdd1eca953d43e21558eb1137c4b934689990564d7d24cf14e249a773dc1e5ddb7316b10d73682f8 "https://7-zip.org/a/7z2406-extra.7z" || goto error
+call build\scriptlib\download.cmd "build\externals\7z2406-x64.exe"                 1619556 b635b449f49aac29234f677e662be35f72a059401ea0786d956485d07134f9dd10ed284338503f08ff7aad16833cf034eb955ca34e1faf35a8177ccad1f20c75 "https://7-zip.org/a/7z2406-x64.exe" || goto error
 
-call build\scriptlib\download.cmd %MPT_DOWNLOAD% x%1 "https://7-zip.org/a/7z2406-extra.7z"                                                         "build\externals\7z2406-extra.7z"              6b88a761f7cc8b8affc074b24750bcdc65cc3ab18d127c8bfdd1eca953d43e21558eb1137c4b934689990564d7d24cf14e249a773dc1e5ddb7316b10d73682f8 1610111 || goto error
+call build\scriptlib\download.cmd "build\externals\WA5.55_SDK.exe"                  336166 394375db8a16bf155b5de9376f6290488ab339e503dbdfdc4e2f5bede967799e625c559cca363bc988324f1a8e86e5fd28a9f697422abd7bb3dcde4a766607b5 "https://web.archive.org/web/20131217072017if_/http://download.nullsoft.com/winamp/plugin-dev/WA5.55_SDK.exe" || goto error
+call build\scriptlib\download.cmd "build\externals\xmp-sdk.zip"                     322744 62c442d656d4bb380360368a0f5f01da11b4ed54333d7f54f875a9a5ec390b08921e00bd08e62cd7a0a5fe642e3377023f20a950cc2a42898ff4cda9ab88fc91 "https://www.un4seen.com/files/xmp-sdk.zip" || goto error
 
-call build\scriptlib\download.cmd %MPT_DOWNLOAD% x%1 "https://7-zip.org/a/7z2406-x64.exe"                                                              "build\externals\7z2406-x64.exe"                   b635b449f49aac29234f677e662be35f72a059401ea0786d956485d07134f9dd10ed284338503f08ff7aad16833cf034eb955ca34e1faf35a8177ccad1f20c75 1619556 || goto error
+call build\scriptlib\download.cmd "build\externals\htmlhelp.exe"                   3509072 d91371244ea98c691b4674ee266c4a2496a296800c176adae069d21f5c52c0763b21cc7859cfffa865b89e50171a2c99a6d14620c32f7d72c0ef04045348f856 "https://web.archive.org/web/20200918004813if_/http://download.microsoft.com/download/0/A/9/0A939EF6-E31C-430F-A3DF-DFAE7960D564/htmlhelp.exe" || goto error
 
+call build\scriptlib\download.cmd "build\externals\python-3.12.3-embed-amd64.zip" 11055461 b09fb48e9e17117d0e370e4a9934296c1211556594933ecaed4438daaa5e55fe673bb40e9ee0bc1bf7a038fa0711fbcc853422c84f3862703085cf891fae4298 "https://www.python.org/ftp/python/3.12.3/python-3.12.3-embed-amd64.zip" || goto error
 
-call build\scriptlib\download.cmd %MPT_DOWNLOAD% x%1 "https://web.archive.org/web/20131217072017if_/http://download.nullsoft.com/winamp/plugin-dev/WA5.55_SDK.exe" "build\externals\WA5.55_SDK.exe"               394375db8a16bf155b5de9376f6290488ab339e503dbdfdc4e2f5bede967799e625c559cca363bc988324f1a8e86e5fd28a9f697422abd7bb3dcde4a766607b5  336166 || goto error
+call build\scriptlib\download.cmd "build\externals\innounp050.rar"                  141621 dbbc809308267a866db9d6b751fdeda6d179e1a65d8ddb14bb51984431ae91493f9a76105e1789b245732043a2c696c869ed10964b48cf59f81e55bd52f85330 "https://netcologne.dl.sourceforge.net/project/innounp/innounp/innounp%%%%200.50/innounp050.rar" || goto error
+call build\scriptlib\download.cmd "build\externals\innosetup-6.2.2.exe"            4722512 496375b1ce9c0d2f8eb3930ebd8366f5c4c938bc1eda47aed415e3f02bd8651a84a770a15f2825bf3c8ed9dbefa355b9eb805dd76bc782f6d8c8096d80443099 "https://files.jrsoftware.org/is/6/innosetup-6.2.2.exe" || goto error
+call build\scriptlib\download.cmd "build\externals\isetup-5.5.8-unicode.exe"       2342456 da7e27d85caec85b4194c7b1412c5a64c0ae12f22d903b94f2f4ee9ea0cb99c91b2d1dbb49262eefae8129e6b91f5c46f26f353011076e77e75f9c955fc5e1cb "https://files.jrsoftware.org/is/5/isetup-5.5.8-unicode.exe" || goto error
 
-call build\scriptlib\download.cmd %MPT_DOWNLOAD% x%1 "https://www.un4seen.com/files/xmp-sdk.zip"                                                       "build\externals\xmp-sdk.zip"                  62c442d656d4bb380360368a0f5f01da11b4ed54333d7f54f875a9a5ec390b08921e00bd08e62cd7a0a5fe642e3377023f20a950cc2a42898ff4cda9ab88fc91  322744 || goto error
-
-
-call build\scriptlib\download.cmd %MPT_DOWNLOAD% x%1 "https://web.archive.org/web/20200918004813if_/http://download.microsoft.com/download/0/A/9/0A939EF6-E31C-430F-A3DF-DFAE7960D564/htmlhelp.exe" "build\externals\htmlhelp.exe"                 d91371244ea98c691b4674ee266c4a2496a296800c176adae069d21f5c52c0763b21cc7859cfffa865b89e50171a2c99a6d14620c32f7d72c0ef04045348f856 3509072 || goto error
-
-
-call build\scriptlib\download.cmd %MPT_DOWNLOAD% x%1 "https://www.python.org/ftp/python/3.12.3/python-3.12.3-embed-amd64.zip"                          "build\externals\python-3.12.3-embed-amd64.zip" b09fb48e9e17117d0e370e4a9934296c1211556594933ecaed4438daaa5e55fe673bb40e9ee0bc1bf7a038fa0711fbcc853422c84f3862703085cf891fae4298 11055461 || goto error
-
-
-call build\scriptlib\download.cmd %MPT_DOWNLOAD% x%1 "https://netcologne.dl.sourceforge.net/project/innounp/innounp/innounp%%%%200.50/innounp050.rar"  "build\externals\innounp050.rar"               dbbc809308267a866db9d6b751fdeda6d179e1a65d8ddb14bb51984431ae91493f9a76105e1789b245732043a2c696c869ed10964b48cf59f81e55bd52f85330  141621 || goto error
-
-call build\scriptlib\download.cmd %MPT_DOWNLOAD% x%1 "https://files.jrsoftware.org/is/6/innosetup-6.2.2.exe"                                            "build\externals\innosetup-6.2.2.exe"  496375b1ce9c0d2f8eb3930ebd8366f5c4c938bc1eda47aed415e3f02bd8651a84a770a15f2825bf3c8ed9dbefa355b9eb805dd76bc782f6d8c8096d80443099 4722512 || goto error
-
-call build\scriptlib\download.cmd %MPT_DOWNLOAD% x%1 "https://files.jrsoftware.org/is/5/isetup-5.5.8-unicode.exe" "build\externals\isetup-5.5.8-unicode.exe"  da7e27d85caec85b4194c7b1412c5a64c0ae12f22d903b94f2f4ee9ea0cb99c91b2d1dbb49262eefae8129e6b91f5c46f26f353011076e77e75f9c955fc5e1cb 2342456 || goto error
-
-
-call build\scriptlib\download.cmd %MPT_DOWNLOAD% x%1 "https://download.openmpt.org/resources/modules/example_songs_ompt_1_30.7z"                       "build\externals\example_songs_ompt_1_30.7z"  bfecf7f97fd71bd52bcfb38307ccb98c751e6a0fa0c1f31208b22b9392f03ea3da8f9271327df2de4fc2e463e0c13c6a24107fbe18caf8f446b7e7cf93073fa5 4881392 || goto error
+call build\scriptlib\download.cmd "build\externals\example_songs_ompt_1_30.7z"     4881392 bfecf7f97fd71bd52bcfb38307ccb98c751e6a0fa0c1f31208b22b9392f03ea3da8f9271327df2de4fc2e463e0c13c6a24107fbe18caf8f446b7e7cf93073fa5 "https://download.openmpt.org/resources/modules/example_songs_ompt_1_30.7z" || goto error
 
 
 call :killdir "build\tools\7zipold" || goto error

Modified: trunk/OpenMPT/build/scriptlib/Verify-File.ps1
==============================================================================
--- trunk/OpenMPT/build/scriptlib/Verify-File.ps1	Sat Jun  1 15:58:36 2024	(r20895)
+++ trunk/OpenMPT/build/scriptlib/Verify-File.ps1	Sat Jun  1 16:37:36 2024	(r20896)
@@ -6,13 +6,13 @@
 	$FileStream.Close()
 	$StringBuilder.ToString()
 }
-Write-Output "Verify " $filename
+Write-Output "Verify $filename"
 if ((Get-Item $filename).length -ne $filesize) {
-	Write-Output "Failed " $filename
+	Write-Output "Failed $filename"
 	exit 1
 }
 if ((Get-FileHashWin7 $filename $hashname) -ne $hashvalue) {
-	Write-Output "Failed " $filename
+	Write-Output "Failed $filename"
 	exit 1
 }
 exit 0

Modified: trunk/OpenMPT/build/scriptlib/download.cmd
==============================================================================
--- trunk/OpenMPT/build/scriptlib/download.cmd	Sat Jun  1 15:58:36 2024	(r20895)
+++ trunk/OpenMPT/build/scriptlib/download.cmd	Sat Jun  1 16:37:36 2024	(r20896)
@@ -1,17 +1,34 @@
-rem bDOWNLOAD bAUTO URL FILE HASH SIZE 
-echo URL %3
-if "%1" == "yes" (
- if "%2" == "xauto" (
-  echo Check %3 ...
-  if exist "%~4" (
-   powershell -ExecutionPolicy Unrestricted .\build\scriptlib\Verify-File.ps1 -hashvalue %5 -filesize %6 -filename %4 || del /Q "%4"
+rem FILE SIZE HASH [URLS...]
+set MPT_DOWNLOAD_FILENAME=%~1
+set MPT_DOWNLOAD_FILESIZE=%2
+set MPT_DOWNLOAD_FILEHASH=%3
+shift
+shift
+shift
+
+echo "Checking '%MPT_DOWNLOAD_FILENAME%' ..."
+if exist "%MPT_DOWNLOAD_FILENAME%" (
+ powershell -ExecutionPolicy Unrestricted .\build\scriptlib\Verify-File.ps1 -filename %MPT_DOWNLOAD_FILENAME% -filesize %MPT_DOWNLOAD_FILESIZE% -hashvalue %MPT_DOWNLOAD_FILEHASH% || del /Q "%MPT_DOWNLOAD_FILENAME%"
+)
+
+if "x%MPT_DOWNLOAD_DO%" == "xyes" (
+ :loop
+ if not "%~1" == "" (
+  if not exist "%MPT_DOWNLOAD_FILENAME%" (
+   echo "Downloading '%MPT_DOWNLOAD_FILENAME%' from '%~1' ..."
+   powershell -Command "(New-Object Net.WebClient).DownloadFile('%~1', '%MPT_DOWNLOAD_FILENAME%')" || exit /B 1
+   echo "Verifying '%~1' ..."
+   if exist "%MPT_DOWNLOAD_FILENAME%" (
+    powershell -ExecutionPolicy Unrestricted .\build\scriptlib\Verify-File.ps1 -filename %MPT_DOWNLOAD_FILENAME% -filesize %MPT_DOWNLOAD_FILESIZE% -hashvalue %MPT_DOWNLOAD_FILEHASH% || del /Q "%MPT_DOWNLOAD_FILENAME%"
+   )
   )
+  shift
+  goto loop
  )
- if not exist "%~4" (
-  echo Download %3 ...
-  powershell -Command "(New-Object Net.WebClient).DownloadFile('%~3', '%~4')" || exit /B 1
- )
 )
-echo Verify %4 ...
-powershell -ExecutionPolicy Unrestricted .\build\scriptlib\Verify-File.ps1 -hashvalue %5 -filesize %6 -filename %4 || exit /B 1
-exit /B 0
+
+if not exist "%MPT_DOWNLOAD_FILENAME%" (
+ echo "Failed to download '%MPT_DOWNLOAD_FILENAME%'."
+ exit /B 1
+)
+exit /b 0

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

From: <sv...@op...> - 2024-06-01 13:58:49

Author: sagamusix
Date: Sat Jun  1 15:58:36 2024
New Revision: 20895
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20895

Log:
Merged revision(s) 20884-20885, 20888-20889 from trunk/OpenMPT:
[Fix] General tab: In r14537, drawing of the background of some regions in the lower half of the general tab under some circumstances (strangely, it appears to depend on whether position of the currently selected tab is right of the rightmost pixel of the dialog resource). This happens because the Z-order of the tab control was changed in that commit. However, putting the tab control bottom-most is required for tooltips to work. Setting the dialog style to WS_EX_COMPOSITED fixes the problem for some reason while keeping tooltips working.
........
[Fix] Allow mptrack.rc to be opened in VS resource editor again.
........
[Fix] General tabs: Updates received from other views could cause unintended data changes (e.g. truncating fractional tempo if it is technically unsupported by current format).
........
[Fix] Previous commit was incomplete.
........

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

Modified: branches/OpenMPT-1.31/mptrack/Ctrl_com.cpp
==============================================================================
--- branches/OpenMPT-1.31/mptrack/Ctrl_com.cpp	Sat Jun  1 15:58:00 2024	(r20894)
+++ branches/OpenMPT-1.31/mptrack/Ctrl_com.cpp	Sat Jun  1 15:58:36 2024	(r20895)
@@ -123,8 +123,8 @@
 {
 	CommentHint commentHint = hint.ToType<CommentHint>();
 	if (pHint == this || !commentHint.GetType()[HINT_MODCOMMENTS | HINT_MPTOPTIONS | HINT_MODTYPE]) return;
-	if (m_nLockCount) return;
-	m_nLockCount++;
+	if (IsLocked()) return;
+	LockControls();
 
 	static FontSetting previousFont;
 	FontSetting font = TrackerSettings::Instance().commentsFont;
@@ -176,7 +176,7 @@
 	}
 
 	m_EditComments.SetRedraw(TRUE);
-	m_nLockCount--;
+	UnlockControls();
 }
 
 

Modified: branches/OpenMPT-1.31/mptrack/Ctrl_gen.cpp
==============================================================================
--- branches/OpenMPT-1.31/mptrack/Ctrl_gen.cpp	Sat Jun  1 15:58:00 2024	(r20894)
+++ branches/OpenMPT-1.31/mptrack/Ctrl_gen.cpp	Sat Jun  1 15:58:36 2024	(r20895)
@@ -247,6 +247,7 @@
 
 	const auto resamplingModes = Resampling::AllModes();
 
+	LockControls();
 	if (hintType == HINT_MPTOPTIONS || updateAll)
 	{
 		CString defaultResampler;
@@ -373,6 +374,7 @@
 		m_VuMeterLeft.InvalidateRect(NULL, FALSE);
 		m_VuMeterRight.InvalidateRect(NULL, FALSE);
 	}
+	UnlockControls();
 }
 
 
@@ -498,7 +500,7 @@
 
 void CCtrlGeneral::OnTempoChanged()
 {
-	if (m_bInitialized && m_EditTempo.GetWindowTextLength() > 0)
+	if (m_bInitialized && m_EditTempo.GetWindowTextLength() > 0 && !IsLocked())
 	{
 		TEMPO tempo = m_EditTempo.GetTempoValue();
 		Limit(tempo, m_tempoMin, m_tempoMax);

Modified: branches/OpenMPT-1.31/mptrack/mptrack.rc
==============================================================================
--- branches/OpenMPT-1.31/mptrack/mptrack.rc	Sat Jun  1 15:58:00 2024	(r20894)
+++ branches/OpenMPT-1.31/mptrack/mptrack.rc	Sat Jun  1 15:58:36 2024	(r20895)
@@ -19,6 +19,10 @@
 LANGUAGE LANG_GERMAN, SUBLANG_GERMAN
 #pragma code_page(1252)
 
+#if !defined(WS_EX_COMPOSITED)
+#define WS_EX_COMPOSITED 0x02000000L
+#endif
+
 /////////////////////////////////////////////////////////////////////////////
 //
 // Dialog
@@ -1694,9 +1698,14 @@
 
 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
     EDITTEXT        IDC_EDIT9,10,30,89,12,ES_AUTOHSCROLL
     GROUPBOX        "Channel 2",IDC_TEXT2,108,18,99,157
@@ -1705,10 +1714,6 @@
     EDITTEXT        IDC_EDIT11,216,30,89,12,ES_AUTOHSCROLL
     GROUPBOX        "Channel 4",IDC_TEXT4,314,18,99,157
     EDITTEXT        IDC_EDIT12,319,30,89,12,ES_AUTOHSCROLL
-    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
     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

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

From: <sv...@op...> - 2024-06-01 13:58:12

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

Log:
Merged revision(s) 20867, 20872, 20883 from trunk/OpenMPT:
[Fix] ModCommand::GetEffectWeight did not contain a weight for CMD_CHANNELVOLSLIDE.
........
[Fix] Also disable loop wrap-around buffer logic if the sample loop start doesn't match.
........
[Fix] AMS: Default channel panning was broken, using all-center panning instead of MOD panning.
........

Modified:
   branches/OpenMPT-1.31/   (props changed)
   branches/OpenMPT-1.31/soundlib/Fastmix.cpp
   branches/OpenMPT-1.31/soundlib/Load_ams.cpp
   branches/OpenMPT-1.31/soundlib/modcommand.cpp

Modified: branches/OpenMPT-1.31/soundlib/Fastmix.cpp
==============================================================================
--- branches/OpenMPT-1.31/soundlib/Fastmix.cpp	Sat Jun  1 15:56:54 2024	(r20893)
+++ branches/OpenMPT-1.31/soundlib/Fastmix.cpp	Sat Jun  1 15:58:00 2024	(r20894)
@@ -76,7 +76,7 @@
 			const bool inSustainLoop = chn.InSustainLoop() && chn.nLoopStart == chn.pModSample->nSustainStart && chn.nLoopEnd == chn.pModSample->nSustainEnd;
 
 			// Do not enable wraparound magic if we're previewing a custom loop!
-			if(inSustainLoop || chn.nLoopEnd == chn.pModSample->nLoopEnd)
+			if(inSustainLoop || (chn.nLoopStart == chn.pModSample->nLoopStart && chn.nLoopEnd == chn.pModSample->nLoopEnd))
 			{
 				SmpLength lookaheadOffset = 3 * InterpolationLookaheadBufferSize + chn.pModSample->nLength - chn.nLoopEnd;
 				if(inSustainLoop)

Modified: branches/OpenMPT-1.31/soundlib/Load_ams.cpp
==============================================================================
--- branches/OpenMPT-1.31/soundlib/Load_ams.cpp	Sat Jun  1 15:56:54 2024	(r20893)
+++ branches/OpenMPT-1.31/soundlib/Load_ams.cpp	Sat Jun  1 15:58:00 2024	(r20894)
@@ -401,6 +401,7 @@
 	}
 
 	InitializeGlobals(MOD_TYPE_AMS);
+	InitializeChannels();
 
 	m_SongFlags = SONG_ITCOMPATGXX | SONG_ITOLDEFFECTS;
 	m_nChannels = (fileHeader.channelConfig & 0x1F) + 1;
@@ -435,7 +436,6 @@
 	// Read channel names
 	for(CHANNELINDEX chn = 0; chn < GetNumChannels(); chn++)
 	{
-		ChnSettings[chn].Reset();
 		file.ReadSizedString<uint8le, mpt::String::spacePadded>(ChnSettings[chn].szName);
 	}
 

Modified: branches/OpenMPT-1.31/soundlib/modcommand.cpp
==============================================================================
--- branches/OpenMPT-1.31/soundlib/modcommand.cpp	Sat Jun  1 15:56:54 2024	(r20893)
+++ branches/OpenMPT-1.31/soundlib/modcommand.cpp	Sat Jun  1 15:58:00 2024	(r20894)
@@ -1173,7 +1173,7 @@
 		CMD_TONEPORTAMENTO,
 		CMD_TONEPORTAVOL,
 		CMD_DBMECHO,
-		CMD_GLOBALVOLSLIDE,
+		CMD_CHANNELVOLSLIDE,
 		CMD_CHANNELVOLUME,
 		CMD_GLOBALVOLSLIDE,
 		CMD_GLOBALVOLUME,
@@ -1192,6 +1192,7 @@
 		}
 	}
 	// Invalid / unknown command.
+	MPT_ASSERT_NOTREACHED();
 	return 0;
 }

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

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

Author: sagamusix
Date: Sat Jun  1 15:56:54 2024
New Revision: 20893
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20893

Log:
[Fix] S3M: Rework r20871. The file sounds broken in Impulse Tracker, which the sample text even warns about.

Modified:
   trunk/OpenMPT/soundlib/Load_s3m.cpp

Modified: trunk/OpenMPT/soundlib/Load_s3m.cpp
==============================================================================
--- trunk/OpenMPT/soundlib/Load_s3m.cpp	Sat Jun  1 09:21:46 2024	(r20892)
+++ trunk/OpenMPT/soundlib/Load_s3m.cpp	Sat Jun  1 15:56:54 2024	(r20893)
@@ -312,7 +312,6 @@
 		m_playBehaviour.set(kITRetrigger);
 		m_playBehaviour.set(kITShortSampleRetrig);
 		m_playBehaviour.set(kST3SampleSwap);  // Not exactly like ST3, but close enough
-		// alien.s3m by Davers (pattern 13) needs these to play the Gxx with sample switch as intended
 		m_playBehaviour.set(kITPortaNoNote);
 		m_playBehaviour.set(kITPortamentoSwapResetsPos);
 		m_nMinPeriod = 1;
@@ -374,7 +373,7 @@
 	{
 		m_playBehaviour.reset(kST3NoMutedChannels);
 		m_playBehaviour.reset(kST3EffectMemory);
-		m_playBehaviour.set(kST3PortaSampleChange, (fileHeader.cwtv& S3MFileHeader::trackerMask) == S3MFileHeader::trkImpulseTracker);
+		m_playBehaviour.reset(kST3PortaSampleChange);
 		m_playBehaviour.reset(kST3VibratoMemory);
 		m_playBehaviour.reset(KST3PortaAfterArpeggio);
 		m_playBehaviour.reset(kST3OffsetWithoutInstrument);

[OMPT-svn-commit] OpenMPT r20892 - in branches/OpenMPT-1.31: . build build/auto

From: <sv...@op...> - 2024-06-01 07:21:53

Author: manx
Date: Sat Jun  1 09:21:46 2024
New Revision: 20892
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20892

Log:
Merged revision(s) 20880 from trunk/OpenMPT:
[Var] 7-zip: Update to v24.06.
[Imp] build: Set 7-zip 7z compatibility to v15.12. Remove explicit no-filters option.
........

Modified:
   branches/OpenMPT-1.31/   (props changed)
   branches/OpenMPT-1.31/build/auto/build_openmpt_release_packages_multiarch.py
   branches/OpenMPT-1.31/build/auto/build_openmpt_release_packages_retro.py
   branches/OpenMPT-1.31/build/auto/setup_arguments.cmd
   branches/OpenMPT-1.31/build/download_externals.cmd

Modified: branches/OpenMPT-1.31/build/auto/build_openmpt_release_packages_multiarch.py
==============================================================================
--- branches/OpenMPT-1.31/build/auto/build_openmpt_release_packages_multiarch.py	Sat Jun  1 09:21:15 2024	(r20891)
+++ branches/OpenMPT-1.31/build/auto/build_openmpt_release_packages_multiarch.py	Sat Jun  1 09:21:46 2024	(r20892)
@@ -296,7 +296,7 @@
 if singleThreaded:
 	p7zarm64.communicate()
 
-p7zsymbols = Popen([path7z, "a", "-t7z", "-mx=9", "-mf=off", "../" + openmpt_version_name + "-symbols.7z", "."], cwd=openmpt_zip_symbols_basepath)
+p7zsymbols = Popen([path7z, "a", "-t7z", "-mx=9", "-myv=1512", "../" + openmpt_version_name + "-symbols.7z", "."], cwd=openmpt_zip_symbols_basepath)
 if singleThreaded:
 	p7zsymbols.communicate()
 

Modified: branches/OpenMPT-1.31/build/auto/build_openmpt_release_packages_retro.py
==============================================================================
--- branches/OpenMPT-1.31/build/auto/build_openmpt_release_packages_retro.py	Sat Jun  1 09:21:15 2024	(r20891)
+++ branches/OpenMPT-1.31/build/auto/build_openmpt_release_packages_retro.py	Sat Jun  1 09:21:46 2024	(r20892)
@@ -217,7 +217,7 @@
 if singleThreaded:
 	p7zamd64.communicate()
 
-p7zsymbols = Popen([path7z, "a", "-t7z", "-mx=9", "-mf=off", "../" + openmpt_version_name + "-RETRO-symbols.7z", "."], cwd=openmpt_zip_symbols_basepath)
+p7zsymbols = Popen([path7z, "a", "-t7z", "-mx=9", "-myv=1512", "../" + openmpt_version_name + "-RETRO-symbols.7z", "."], cwd=openmpt_zip_symbols_basepath)
 if singleThreaded:
 	p7zsymbols.communicate()
 

Modified: branches/OpenMPT-1.31/build/auto/setup_arguments.cmd
==============================================================================
--- branches/OpenMPT-1.31/build/auto/setup_arguments.cmd	Sat Jun  1 09:21:15 2024	(r20891)
+++ branches/OpenMPT-1.31/build/auto/setup_arguments.cmd	Sat Jun  1 09:21:46 2024	(r20892)
@@ -166,7 +166,7 @@
 if "%MPT_PKG_FORMAT%" == "7z" set MPT_PKG_FORMAT_SYMBOLS=xz
 if "%MPT_PKG_FORMAT%" == "zip" set MPT_PKG_FORMAT_SYMBOLS=zip
 
-if "%MPT_PKG_FORMAT%" == "7z" set MPT_PKG_FORMAT_OPTIONS=-mf=off
+if "%MPT_PKG_FORMAT%" == "7z" set MPT_PKG_FORMAT_OPTIONS=-myv=1512
 if "%MPT_PKG_FORMAT%" == "zip" set MPT_PKG_FORMAT_OPTIONS=
 
 if "%MPT_PKG_FORMAT_SYMBOLS%" == "" set MPT_PKG_FORMAT_SYMBOLS=zip

Modified: branches/OpenMPT-1.31/build/download_externals.cmd
==============================================================================
--- branches/OpenMPT-1.31/build/download_externals.cmd	Sat Jun  1 09:21:15 2024	(r20891)
+++ branches/OpenMPT-1.31/build/download_externals.cmd	Sat Jun  1 09:21:46 2024	(r20892)
@@ -31,9 +31,9 @@
 
 call build\scriptlib\download.cmd %MPT_DOWNLOAD% x%1 "https://7-zip.org/a/7za920.zip"                                                              "build\externals\7za920.zip"                   84e830c91a0e8ae499cc4814080da6569d8a6acbddc585c8b62abc86c809793aeb669b0a741063a379fd281ade85f120bc27efeb67d63bf961be893eec8bc3b3  384846 || goto error
 
-call build\scriptlib\download.cmd %MPT_DOWNLOAD% x%1 "https://7-zip.org/a/7z2301-extra.7z"                                                         "build\externals\7z2301-extra.7z"              c849c2cb489cf5b6eeb92bfbc27dcb37d0349c36971e1bc7ef32c7cde1b659e19e8b46d734ba90f47affe07fdfd5b4774cbfa0fdf4b681e9f60bb46bba1f7f9b 1027828 || goto error
+call build\scriptlib\download.cmd %MPT_DOWNLOAD% x%1 "https://7-zip.org/a/7z2406-extra.7z"                                                         "build\externals\7z2406-extra.7z"              6b88a761f7cc8b8affc074b24750bcdc65cc3ab18d127c8bfdd1eca953d43e21558eb1137c4b934689990564d7d24cf14e249a773dc1e5ddb7316b10d73682f8 1610111 || goto error
 
-call build\scriptlib\download.cmd %MPT_DOWNLOAD% x%1 "https://7-zip.org/a/7z2301-x64.exe"                                                              "build\externals\7z2301-x64.exe"                   1f4da167ff2f1d34eeaf76c3003ba5fcabfc7a7da40e73e317aa99c6e1321cdf97e00f4feb9e79e1a72240e0376af0c3becb3d309e5bb0385e5192da17ea77ff 1589510 || goto error
+call build\scriptlib\download.cmd %MPT_DOWNLOAD% x%1 "https://7-zip.org/a/7z2406-x64.exe"                                                              "build\externals\7z2406-x64.exe"                   b635b449f49aac29234f677e662be35f72a059401ea0786d956485d07134f9dd10ed284338503f08ff7aad16833cf034eb955ca34e1faf35a8177ccad1f20c75 1619556 || goto error
 
 
 call build\scriptlib\download.cmd %MPT_DOWNLOAD% x%1 "https://web.archive.org/web/20131217072017if_/http://download.nullsoft.com/winamp/plugin-dev/WA5.55_SDK.exe" "build\externals\WA5.55_SDK.exe"               394375db8a16bf155b5de9376f6290488ab339e503dbdfdc4e2f5bede967799e625c559cca363bc988324f1a8e86e5fd28a9f697422abd7bb3dcde4a766607b5  336166 || goto error
@@ -63,10 +63,10 @@
 rem Get old 7zip distributed as zip and unpack with built-in zip depacker
 rem Get current 7zip commandline version which can unpack 7zip and the 7zip installer but not other archive formats
 rem Get 7zip installer and unpack it with current commandline 7zip
-rem This is a mess for automatic. Oh well.
+rem This is a mess for automation. Oh well.
 cscript build\scriptlib\unpack-zip.vbs "build\externals\7za920.zip" "build\tools\7zipold" || goto error
-build\tools\7zipold\7za.exe x -y -obuild\tools\7zipa "build\externals\7z2301-extra.7z" || goto error
-build\tools\7zipa\7za.exe x -y -obuild\tools\7zip "build\externals\7z2301-x64.exe" || goto error
+build\tools\7zipold\7za.exe x -y -obuild\tools\7zipa "build\externals\7z2406-extra.7z" || goto error
+build\tools\7zipa\7za.exe x -y -obuild\tools\7zip "build\externals\7z2406-x64.exe" || goto error
 
 call build\scriptlib\unpack.cmd "build\tools\htmlhelp" "build\externals\htmlhelp.exe" "." || goto error

[OMPT-svn-commit] OpenMPT r20891 - in branches/OpenMPT-1.31: . build build/auto

From: <sv...@op...> - 2024-06-01 07:21:23

Author: manx
Date: Sat Jun  1 09:21:15 2024
New Revision: 20891
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20891

Log:
Merged revision(s) 20482-20483 from trunk/OpenMPT:
[Fix] build: Disable all file format filters when compressing 7z archives. Newer 7-zip versions introduce new filters all the time, making the resulting archives incompatible with earlier 7-zip versions. This introduced a slight regression in compression ratio but allows us updating 7-zip in return. See r19844.
........
[Var] 7-zip: Update to v23.01.
........

Modified:
   branches/OpenMPT-1.31/   (props changed)
   branches/OpenMPT-1.31/build/auto/build_openmpt_release_packages_multiarch.py
   branches/OpenMPT-1.31/build/auto/build_openmpt_release_packages_retro.py
   branches/OpenMPT-1.31/build/auto/package_libopenmpt_multi_args.cmd
   branches/OpenMPT-1.31/build/auto/package_libopenmpt_retro_winxp.cmd
   branches/OpenMPT-1.31/build/auto/setup_arguments.cmd
   branches/OpenMPT-1.31/build/download_externals.cmd

Modified: branches/OpenMPT-1.31/build/auto/build_openmpt_release_packages_multiarch.py
==============================================================================
--- branches/OpenMPT-1.31/build/auto/build_openmpt_release_packages_multiarch.py	Sat Jun  1 00:14:34 2024	(r20890)
+++ branches/OpenMPT-1.31/build/auto/build_openmpt_release_packages_multiarch.py	Sat Jun  1 09:21:15 2024	(r20891)
@@ -296,7 +296,7 @@
 if singleThreaded:
 	p7zarm64.communicate()
 
-p7zsymbols = Popen([path7z, "a", "-t7z", "-mx=9", "../" + openmpt_version_name + "-symbols.7z", "."], cwd=openmpt_zip_symbols_basepath)
+p7zsymbols = Popen([path7z, "a", "-t7z", "-mx=9", "-mf=off", "../" + openmpt_version_name + "-symbols.7z", "."], cwd=openmpt_zip_symbols_basepath)
 if singleThreaded:
 	p7zsymbols.communicate()
 

Modified: branches/OpenMPT-1.31/build/auto/build_openmpt_release_packages_retro.py
==============================================================================
--- branches/OpenMPT-1.31/build/auto/build_openmpt_release_packages_retro.py	Sat Jun  1 00:14:34 2024	(r20890)
+++ branches/OpenMPT-1.31/build/auto/build_openmpt_release_packages_retro.py	Sat Jun  1 09:21:15 2024	(r20891)
@@ -217,7 +217,7 @@
 if singleThreaded:
 	p7zamd64.communicate()
 
-p7zsymbols = Popen([path7z, "a", "-t7z", "-mx=9", "../" + openmpt_version_name + "-RETRO-symbols.7z", "."], cwd=openmpt_zip_symbols_basepath)
+p7zsymbols = Popen([path7z, "a", "-t7z", "-mx=9", "-mf=off", "../" + openmpt_version_name + "-RETRO-symbols.7z", "."], cwd=openmpt_zip_symbols_basepath)
 if singleThreaded:
 	p7zsymbols.communicate()
 

Modified: branches/OpenMPT-1.31/build/auto/package_libopenmpt_multi_args.cmd
==============================================================================
--- branches/OpenMPT-1.31/build/auto/package_libopenmpt_multi_args.cmd	Sat Jun  1 00:14:34 2024	(r20890)
+++ branches/OpenMPT-1.31/build/auto/package_libopenmpt_multi_args.cmd	Sat Jun  1 09:21:15 2024	(r20891)
@@ -103,7 +103,7 @@
 copy /y ..\..\bin\release\%MPT_VS_VER%-win7-static\x86\openmpt-mpg123.dll .\XMPlay-legacy\ || goto error
 copy /y ..\..\bin\release\%MPT_VS_VER%-win7-static\x86\in_openmpt.dll .\Winamp-legacy\ || goto error
 copy /y ..\..\bin\release\%MPT_VS_VER%-win7-static\x86\openmpt-mpg123.dll .\Winamp-legacy\ || goto error
-..\..\build\tools\7zip\7z.exe a -t%MPT_PKG_FORMAT% -mx=9 ..\libopenmpt\bin.windows\%LIBOPENMPT_VERSION_STRING%\libopenmpt-%MPT_REVISION%.bin.windows.%MPT_PKG_FORMAT% ^
+..\..\build\tools\7zip\7z.exe a -t%MPT_PKG_FORMAT% -mx=9 %MPT_PKG_FORMAT_OPTIONS% ..\libopenmpt\bin.windows\%LIBOPENMPT_VERSION_STRING%\libopenmpt-%MPT_REVISION%.bin.windows.%MPT_PKG_FORMAT% ^
  LICENSE.txt ^
  Licenses ^
  changelog.md ^
@@ -248,7 +248,7 @@
 copy /y ..\..\bin\release\%MPT_VS_VER%-win7-shared\amd64\openmpt-ogg.dll bin\amd64-legacy\ || goto error
 copy /y ..\..\bin\release\%MPT_VS_VER%-win7-shared\amd64\openmpt-vorbis.dll bin\amd64-legacy\ || goto error
 copy /y ..\..\bin\release\%MPT_VS_VER%-win7-shared\amd64\openmpt-zlib.dll bin\amd64-legacy\ || goto error
-..\..\build\tools\7zip\7z.exe a -t%MPT_PKG_FORMAT% -mx=9 ..\libopenmpt\dev.windows.%MPT_VS_VER%\%LIBOPENMPT_VERSION_STRING%\libopenmpt-%MPT_REVISION%.dev.windows.%MPT_VS_VER%.%MPT_PKG_FORMAT% ^
+..\..\build\tools\7zip\7z.exe a -t%MPT_PKG_FORMAT% -mx=9 %MPT_PKG_FORMAT_OPTIONS% ..\libopenmpt\dev.windows.%MPT_VS_VER%\%LIBOPENMPT_VERSION_STRING%\libopenmpt-%MPT_REVISION%.dev.windows.%MPT_VS_VER%.%MPT_PKG_FORMAT% ^
  LICENSE.txt ^
  Licenses ^
  changelog.md ^

Modified: branches/OpenMPT-1.31/build/auto/package_libopenmpt_retro_winxp.cmd
==============================================================================
--- branches/OpenMPT-1.31/build/auto/package_libopenmpt_retro_winxp.cmd	Sat Jun  1 00:14:34 2024	(r20890)
+++ branches/OpenMPT-1.31/build/auto/package_libopenmpt_retro_winxp.cmd	Sat Jun  1 09:21:15 2024	(r20891)
@@ -83,7 +83,7 @@
 copy /y ..\..\bin\release\vs2017-winxp-static\x86\openmpt-mpg123.dll .\XMPlay\ || goto error
 copy /y ..\..\bin\release\vs2017-winxp-static\x86\in_openmpt.dll .\Winamp\ || goto error
 copy /y ..\..\bin\release\vs2017-winxp-static\x86\openmpt-mpg123.dll .\Winamp\ || goto error
-..\..\build\tools\7zip\7z.exe a -t%MPT_PKG_FORMAT% -mx=9 ..\libopenmpt\bin.retro.winxp\%LIBOPENMPT_VERSION_STRING%\libopenmpt-%MPT_REVISION%.bin.retro.winxp.%MPT_PKG_FORMAT% ^
+..\..\build\tools\7zip\7z.exe a -t%MPT_PKG_FORMAT% -mx=9 %MPT_PKG_FORMAT_OPTIONS% ..\libopenmpt\bin.retro.winxp\%LIBOPENMPT_VERSION_STRING%\libopenmpt-%MPT_REVISION%.bin.retro.winxp.%MPT_PKG_FORMAT% ^
  LICENSE.txt ^
  Licenses ^
  changelog.md ^
@@ -182,7 +182,7 @@
 copy /y ..\..\bin\release\vs2017-winxp-shared\amd64\openmpt-ogg.dll bin\amd64-retro-winxp\ || goto error
 copy /y ..\..\bin\release\vs2017-winxp-shared\amd64\openmpt-vorbis.dll bin\amd64-retro-winxp\ || goto error
 copy /y ..\..\bin\release\vs2017-winxp-shared\amd64\openmpt-zlib.dll bin\amd64-retro-winxp\ || goto error
-..\..\build\tools\7zip\7z.exe a -t%MPT_PKG_FORMAT% -mx=9 ..\libopenmpt\dev.windows.retro.winxp\%LIBOPENMPT_VERSION_STRING%\libopenmpt-%MPT_REVISION%.dev.windows.retro.winxp.%MPT_PKG_FORMAT% ^
+..\..\build\tools\7zip\7z.exe a -t%MPT_PKG_FORMAT% -mx=9 %MPT_PKG_FORMAT_OPTIONS% ..\libopenmpt\dev.windows.retro.winxp\%LIBOPENMPT_VERSION_STRING%\libopenmpt-%MPT_REVISION%.dev.windows.retro.winxp.%MPT_PKG_FORMAT% ^
  LICENSE.txt ^
  Licenses ^
  changelog.md ^

Modified: branches/OpenMPT-1.31/build/auto/setup_arguments.cmd
==============================================================================
--- branches/OpenMPT-1.31/build/auto/setup_arguments.cmd	Sat Jun  1 00:14:34 2024	(r20890)
+++ branches/OpenMPT-1.31/build/auto/setup_arguments.cmd	Sat Jun  1 09:21:15 2024	(r20891)
@@ -162,8 +162,13 @@
 
 
 if "%MPT_PKG_FORMAT%" == "" set MPT_PKG_FORMAT=zip
+
 if "%MPT_PKG_FORMAT%" == "7z" set MPT_PKG_FORMAT_SYMBOLS=xz
 if "%MPT_PKG_FORMAT%" == "zip" set MPT_PKG_FORMAT_SYMBOLS=zip
+
+if "%MPT_PKG_FORMAT%" == "7z" set MPT_PKG_FORMAT_OPTIONS=-mf=off
+if "%MPT_PKG_FORMAT%" == "zip" set MPT_PKG_FORMAT_OPTIONS=
+
 if "%MPT_PKG_FORMAT_SYMBOLS%" == "" set MPT_PKG_FORMAT_SYMBOLS=zip
 
 

Modified: branches/OpenMPT-1.31/build/download_externals.cmd
==============================================================================
--- branches/OpenMPT-1.31/build/download_externals.cmd	Sat Jun  1 00:14:34 2024	(r20890)
+++ branches/OpenMPT-1.31/build/download_externals.cmd	Sat Jun  1 09:21:15 2024	(r20891)
@@ -29,11 +29,11 @@
 if not exist "build\tools"     mkdir "build\tools"
 
 
-call build\scriptlib\download.cmd %MPT_DOWNLOAD% x%1 "https://www.7-zip.org/a/7za920.zip"                                                              "build\externals\7za920.zip"                   84e830c91a0e8ae499cc4814080da6569d8a6acbddc585c8b62abc86c809793aeb669b0a741063a379fd281ade85f120bc27efeb67d63bf961be893eec8bc3b3  384846 || goto error
+call build\scriptlib\download.cmd %MPT_DOWNLOAD% x%1 "https://7-zip.org/a/7za920.zip"                                                              "build\externals\7za920.zip"                   84e830c91a0e8ae499cc4814080da6569d8a6acbddc585c8b62abc86c809793aeb669b0a741063a379fd281ade85f120bc27efeb67d63bf961be893eec8bc3b3  384846 || goto error
 
-call build\scriptlib\download.cmd %MPT_DOWNLOAD% x%1 "https://www.7-zip.org/a/7z2201-extra.7z"                                                         "build\externals\7z2201-extra.7z"              845b3fd5dda4187e47fa0650a5d8465484e6c407a2a1745bb12bc50aa266cc4b573393184642c1875388c262f16039c1b93f102908799147dbfc824a52d8d89d 1018450 || goto error
+call build\scriptlib\download.cmd %MPT_DOWNLOAD% x%1 "https://7-zip.org/a/7z2301-extra.7z"                                                         "build\externals\7z2301-extra.7z"              c849c2cb489cf5b6eeb92bfbc27dcb37d0349c36971e1bc7ef32c7cde1b659e19e8b46d734ba90f47affe07fdfd5b4774cbfa0fdf4b681e9f60bb46bba1f7f9b 1027828 || goto error
 
-call build\scriptlib\download.cmd %MPT_DOWNLOAD% x%1 "https://www.7-zip.org/a/7z2201-x64.exe"                                                              "build\externals\7z2201-x64.exe"                   965d43f06d104bf6707513c459f18aaf8b049f4a043643d720b184ed9f1bb6c929309c51c3991d5aaff7b9d87031a7248ee3274896521abe955d0e49f901ac94 1575742 || goto error
+call build\scriptlib\download.cmd %MPT_DOWNLOAD% x%1 "https://7-zip.org/a/7z2301-x64.exe"                                                              "build\externals\7z2301-x64.exe"                   1f4da167ff2f1d34eeaf76c3003ba5fcabfc7a7da40e73e317aa99c6e1321cdf97e00f4feb9e79e1a72240e0376af0c3becb3d309e5bb0385e5192da17ea77ff 1589510 || goto error
 
 
 call build\scriptlib\download.cmd %MPT_DOWNLOAD% x%1 "https://web.archive.org/web/20131217072017if_/http://download.nullsoft.com/winamp/plugin-dev/WA5.55_SDK.exe" "build\externals\WA5.55_SDK.exe"               394375db8a16bf155b5de9376f6290488ab339e503dbdfdc4e2f5bede967799e625c559cca363bc988324f1a8e86e5fd28a9f697422abd7bb3dcde4a766607b5  336166 || goto error
@@ -65,8 +65,8 @@
 rem Get 7zip installer and unpack it with current commandline 7zip
 rem This is a mess for automatic. Oh well.
 cscript build\scriptlib\unpack-zip.vbs "build\externals\7za920.zip" "build\tools\7zipold" || goto error
-build\tools\7zipold\7za.exe x -y -obuild\tools\7zipa "build\externals\7z2201-extra.7z" || goto error
-build\tools\7zipa\7za.exe x -y -obuild\tools\7zip "build\externals\7z2201-x64.exe" || goto error
+build\tools\7zipold\7za.exe x -y -obuild\tools\7zipa "build\externals\7z2301-extra.7z" || goto error
+build\tools\7zipa\7za.exe x -y -obuild\tools\7zip "build\externals\7z2301-x64.exe" || goto error
 
 call build\scriptlib\unpack.cmd "build\tools\htmlhelp" "build\externals\htmlhelp.exe" "." || goto error

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

From: <sv...@op...> - 2024-05-31 22:14:55

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

Property diff:
--- old property value
+++ new property value
@@ -1 +1 @@
-[Fix] FTM: Lower period limit was wrong.
\ No newline at end of file
+[Fix] FTM: Upper period limit was wrong.
\ No newline at end of file

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

From: <sv...@op...> - 2024-05-31 22:14:45

Author: sagamusix
Date: Sat Jun  1 00:14:34 2024
New Revision: 20890
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20890

Log:
[Fix] FTM: Lower period limit was wrong.

Modified:
   trunk/OpenMPT/soundlib/Load_ftm.cpp

Modified: trunk/OpenMPT/soundlib/Load_ftm.cpp
==============================================================================
--- trunk/OpenMPT/soundlib/Load_ftm.cpp	Fri May 31 23:37:13 2024	(r20889)
+++ trunk/OpenMPT/soundlib/Load_ftm.cpp	Sat Jun  1 00:14:34 2024	(r20890)
@@ -123,7 +123,7 @@
 		m_nDefaultRowsPerBeat = m_nDefaultRowsPerMeasure / 4;
 	m_nDefaultGlobalVolume = Util::muldivr_unsigned(fileHeader.globalVolume, MAX_GLOBAL_VOLUME, 63);
 	m_nMinPeriod = 3208;
-	m_nMaxPeriod = 5172;
+	m_nMaxPeriod = 5376;
 	const bool moduleWithSamples = (fileHeader.flags & 0x01);
 	
 	m_modFormat.formatName = U_("Face The Music");

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

From: <sv...@op...> - 2024-05-31 21:37:25

Author: sagamusix
Date: Fri May 31 23:37:13 2024
New Revision: 20889
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20889

Log:
[Fix] Previous commit was incomplete.

Modified:
   trunk/OpenMPT/mptrack/Ctrl_gen.cpp

Modified: trunk/OpenMPT/mptrack/Ctrl_gen.cpp
==============================================================================
--- trunk/OpenMPT/mptrack/Ctrl_gen.cpp	Fri May 31 23:35:13 2024	(r20888)
+++ trunk/OpenMPT/mptrack/Ctrl_gen.cpp	Fri May 31 23:37:13 2024	(r20889)
@@ -521,7 +521,7 @@
 
 void CCtrlGeneral::OnTempoChanged()
 {
-	if (m_bInitialized && m_EditTempo.GetWindowTextLength() > 0)
+	if (m_bInitialized && m_EditTempo.GetWindowTextLength() > 0 && !IsLocked())
 	{
 		TEMPO tempo = m_EditTempo.GetTempoValue();
 		Limit(tempo, m_tempoMin, m_tempoMax);

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

From: <sv...@op...> - 2024-05-31 21:35:21

Author: sagamusix
Date: Fri May 31 23:35:13 2024
New Revision: 20888
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20888

Log:
[Fix] General tabs: Updates received from other views could cause unintended data changes (e.g. truncating fractional tempo if it is technically unsupported by current format).

Modified:
   trunk/OpenMPT/mptrack/Ctrl_com.cpp
   trunk/OpenMPT/mptrack/Ctrl_gen.cpp

Modified: trunk/OpenMPT/mptrack/Ctrl_com.cpp
==============================================================================
--- trunk/OpenMPT/mptrack/Ctrl_com.cpp	Fri May 31 21:35:16 2024	(r20887)
+++ trunk/OpenMPT/mptrack/Ctrl_com.cpp	Fri May 31 23:35:13 2024	(r20888)
@@ -127,8 +127,8 @@
 {
 	CommentHint commentHint = hint.ToType<CommentHint>();
 	if (pHint == this || !commentHint.GetType()[HINT_MODCOMMENTS | HINT_MPTOPTIONS | HINT_MODTYPE]) return;
-	if (m_nLockCount) return;
-	m_nLockCount++;
+	if (IsLocked()) return;
+	LockControls();
 
 	static FontSetting previousFont;
 	FontSetting font = TrackerSettings::Instance().commentsFont;
@@ -180,7 +180,7 @@
 	}
 
 	m_EditComments.SetRedraw(TRUE);
-	m_nLockCount--;
+	UnlockControls();
 }
 
 

Modified: trunk/OpenMPT/mptrack/Ctrl_gen.cpp
==============================================================================
--- trunk/OpenMPT/mptrack/Ctrl_gen.cpp	Fri May 31 21:35:16 2024	(r20887)
+++ trunk/OpenMPT/mptrack/Ctrl_gen.cpp	Fri May 31 23:35:13 2024	(r20888)
@@ -260,6 +260,7 @@
 
 	const auto resamplingModes = Resampling::AllModes();
 
+	LockControls();
 	if (hintType == HINT_MPTOPTIONS || updateAll)
 	{
 		CString defaultResampler;
@@ -394,6 +395,7 @@
 		m_VuMeterLeft.InvalidateRect(NULL, FALSE);
 		m_VuMeterRight.InvalidateRect(NULL, FALSE);
 	}
+	UnlockControls();
 }

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

From: <sv...@op...> - 2024-05-31 19:35:23

Author: sagamusix
Date: Fri May 31 21:35:16 2024
New Revision: 20887
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20887

Log:
[Fix] FTM: Don't import as IT, as that will always cause lone instrument numbers to retrigger stopped samples. Instead we import as MOD with linear pitch slides (as weird as it may sound ;).
[Fix] Apply frequency frequency limit to instrument scripts. They are evaluted after the regular period limits are applied.

Modified:
   trunk/OpenMPT/soundlib/InstrumentSynth.cpp
   trunk/OpenMPT/soundlib/Load_ftm.cpp
   trunk/OpenMPT/soundlib/Snd_fx.cpp

Modified: trunk/OpenMPT/soundlib/InstrumentSynth.cpp
==============================================================================
--- trunk/OpenMPT/soundlib/InstrumentSynth.cpp	Fri May 31 20:40:32 2024	(r20886)
+++ trunk/OpenMPT/soundlib/InstrumentSynth.cpp	Fri May 31 21:35:16 2024	(r20887)
@@ -30,6 +30,7 @@
 	int16 m_volumeAdd = int16_min;
 	uint16 m_panning = 2048;
 	int16 m_linearPitchFactor = 0;
+	int16 m_periodFreqSlide = 0;
 	int16 m_periodAdd = 0;
 	uint16 m_loopCount = 0;
 	bool m_condition = false;
@@ -110,10 +111,11 @@
 }
 
 
-static int32 TranslateFTMPitch(uint16 pitch, const ModChannel &chn, const CSoundFile &sndFile)
+static int32 TranslateFTMPitch(uint16 pitch, ModChannel &chn, const CSoundFile &sndFile)
 {
 	int32 period = sndFile.GetPeriodFromNote(NOTE_MIDDLEC - 12 + pitch / 16, chn.nFineTune, chn.nC5Speed);
-	return ApplyLinearPitchSlide(period, pitch % 16, sndFile.PeriodsAreFrequencies());
+	sndFile.DoFreqSlide(chn, period, (pitch % 16) * 4);
+	return period;
 }
 
 
@@ -211,6 +213,7 @@
 	if(events.empty())
 		return;
 
+	const CHANNELINDEX origChannel = channel;
 	channel = FTMRealChannel(channel, sndFile);
 	ModChannel *chn = &playState.Chn[channel];
 
@@ -283,11 +286,9 @@
 					if(jumpCount++ > 10)
 						break;
 				}
-				if(m_ftmWorkTrack)
-				{
-					channel = FTMRealChannel(channel, sndFile);
-					chn = &playState.Chn[channel];
-				}
+
+				channel = FTMRealChannel(origChannel, sndFile);
+				chn = &playState.Chn[channel];
 			}
 		}
 	}
@@ -373,7 +374,7 @@
 		case 0x70: m_ftmLFO[2].depth = static_cast<uint8>(value / 64); break;
 		case 0x80: m_ftmLFO[3].depth = static_cast<uint8>(value / 64); break;
 		case 0xA0: m_volumeAdd = mpt::saturate_cast<int16>(value * 4); break;
-		case 0xF0: m_linearPitchFactor = static_cast<int16>(value / 32); break;
+		case 0xF0: m_periodFreqSlide = static_cast<int16>(value / 8); break;
 		}
 		
 		uint16 newPos = lfo.position + lfo.speed;
@@ -411,10 +412,20 @@
 	const bool periodsAreFrequencies = sndFile.PeriodsAreFrequencies();
 	if(m_linearPitchFactor != 0)
 		period = ApplyLinearPitchSlide(period, m_linearPitchFactor, periodsAreFrequencies);
+	if(m_periodFreqSlide != 0)
+		sndFile.DoFreqSlide(chn, period, m_periodFreqSlide);
 	if(periodsAreFrequencies)
 		period -= m_periodAdd;
 	else
 		period += m_periodAdd;
+
+	if((m_linearPitchFactor || m_periodFreqSlide || m_periodAdd) && !sndFile.PeriodsAreFrequencies())
+	{
+		if(period < sndFile.m_nMinPeriod)
+			period = sndFile.m_nMinPeriod;
+		else if(period > sndFile.m_nMaxPeriod && sndFile.m_playBehaviour[kApplyUpperPeriodLimit])
+			period = sndFile.m_nMaxPeriod;
+	}
 	if(period < 1)
 		period = 1;
 
@@ -618,8 +629,9 @@
 
 	case Event::Type::FTM_SetCondition:
  		{
- 			const int32 threshold = (event.u8 < 3) ? TranslateFTMPitch(event.u16, chn, sndFile) : event.u16;
-			const int32 compare = (event.u8 < 3) ? chn.nPeriod : chn.nGlobalVol;
+			MPT_ASSERT(!sndFile.PeriodsAreFrequencies());
+ 			const int32 threshold = (event.u8 < 3) ? int32_max - TranslateFTMPitch(event.u16, chn, sndFile) : event.u16;
+			const int32 compare = (event.u8 < 3) ? int32_max - chn.nPeriod : chn.nGlobalVol;
 			switch(event.u8 % 3u)
 			{
 			case 0: m_condition = (compare == threshold); break;
@@ -665,7 +677,7 @@
 	case Event::Type::FTM_AddPitch:
 		if(event.i16)
 		{
-			chn.nPeriod = ApplyLinearPitchSlide(chn.nPeriod, event.i16 * 2, sndFile.PeriodsAreFrequencies());
+			sndFile.DoFreqSlide(chn, chn.nPeriod, event.i16 * 8);
 			const int32 limit = TranslateFTMPitch((event.i16 < 0) ? 0 : 0x21E, chn, sndFile);
 			if((event.i16 > 0) == sndFile.PeriodsAreFrequencies())
 				chn.nPeriod = std::min(chn.nPeriod, limit);

Modified: trunk/OpenMPT/soundlib/Load_ftm.cpp
==============================================================================
--- trunk/OpenMPT/soundlib/Load_ftm.cpp	Fri May 31 20:40:32 2024	(r20886)
+++ trunk/OpenMPT/soundlib/Load_ftm.cpp	Fri May 31 21:35:16 2024	(r20887)
@@ -102,7 +102,7 @@
 	else if(loadFlags == onlyVerifyHeader)
 		return true;
 
-	InitializeGlobals(MOD_TYPE_IT);
+	InitializeGlobals(MOD_TYPE_MOD);
 	m_nChannels = 8;
 	InitializeChannels();
 	for(CHANNELINDEX chn = 0; chn < 8; chn++)
@@ -113,7 +113,7 @@
 	m_SongFlags.set(SONG_LINEARSLIDES | SONG_ISAMIGA | SONG_IMPORTED);
 	m_playBehaviour.set(kContinueSampleWithoutInstr);
 	m_playBehaviour.set(kST3NoMutedChannels);
-	m_playBehaviour.reset(kITInitialNoteMemory);
+	m_playBehaviour.set(kApplyUpperPeriodLimit);
 	Order().SetDefaultSpeed(fileHeader.ticksPerRow);
 	Order().SetDefaultTempo(TEMPO(1766278.163 / fileHeader.tempo));
 	m_nDefaultRowsPerMeasure = fileHeader.rowsPerMeasure;
@@ -122,8 +122,8 @@
 	else
 		m_nDefaultRowsPerBeat = m_nDefaultRowsPerMeasure / 4;
 	m_nDefaultGlobalVolume = Util::muldivr_unsigned(fileHeader.globalVolume, MAX_GLOBAL_VOLUME, 63);
-	m_nMinPeriod = 113 * 4;
-	m_nMaxPeriod = 856 * 4;
+	m_nMinPeriod = 3208;
+	m_nMaxPeriod = 5172;
 	const bool moduleWithSamples = (fileHeader.flags & 0x01);
 	
 	m_modFormat.formatName = U_("Face The Music");

Modified: trunk/OpenMPT/soundlib/Snd_fx.cpp
==============================================================================
--- trunk/OpenMPT/soundlib/Snd_fx.cpp	Fri May 31 20:40:32 2024	(r20886)
+++ trunk/OpenMPT/soundlib/Snd_fx.cpp	Fri May 31 21:35:16 2024	(r20887)
@@ -6115,28 +6115,33 @@
 	} else if(GetType() == MOD_TYPE_FAR)
 	{
 		period += (amount * 36318 / 1024);
-	} else if(m_SongFlags[SONG_LINEARSLIDES] && GetType() != MOD_TYPE_XM)
+	} else if(m_SongFlags[SONG_LINEARSLIDES] && !(GetType() & (MOD_TYPE_XM | MOD_TYPE_MOD)))
 	{
 		// IT Linear slides
 		const auto oldPeriod = period;
-		uint32 n = std::abs(amount);
-		LimitMax(n, 255u * 4u);
+		uint32 absAmount = std::abs(amount);
 
 		// Note: IT ignores the lower 2 bits when abs(mount) > 16 (it either uses the fine *or* the regular table, not both)
 		// This means that vibratos are slightly less accurate in this range than they could be.
 		// Other code paths will *either* have an amount that's a multiple of 4 *or* it's less than 16.
-		if(amount > 0)
+		if(absAmount < 16)
 		{
-			if(n < 16)
-				period = Util::muldivr(period, GetFineLinearSlideUpTable(this, n), 65536);
+			if(amount > 0)
+				period = Util::muldivr(period, GetFineLinearSlideUpTable(this, absAmount), 65536);
 			else
-				period = Util::muldivr(period, GetLinearSlideUpTable(this, n / 4u), 65536);
+				period = Util::muldivr(period, GetFineLinearSlideDownTable(this, absAmount), 65536);
 		} else
 		{
-			if(n < 16)
-				period = Util::muldivr(period, GetFineLinearSlideDownTable(this, n), 65536);
-			else
-				period = Util::muldivr(period, GetLinearSlideDownTable(this, n / 4u), 65536);
+			absAmount /= 4u;
+			while(absAmount > 0)
+			{
+				const uint32 n = std::min(absAmount, static_cast<uint32>(std::size(LinearSlideUpTable) - 1));
+				if(amount > 0)
+					period = Util::muldivr(period, GetLinearSlideUpTable(this, n), 65536);
+				else
+					period = Util::muldivr(period, GetLinearSlideDownTable(this, n), 65536);
+				absAmount -= n;
+			}
 		}
 
 		if(period == oldPeriod)
@@ -6524,7 +6529,7 @@
 			return Util::muldiv_unsigned(8363, (FreqS3MTable[note % 12u] << 5), nC5Speed << (note / 12u));
 			//8363 * freq[note%12] / nC5Speed * 2^(5-note/12)
 		}
-	} else if(GetType() & (MOD_TYPE_XM | MOD_TYPE_MTM))
+	} else if((GetType() & (MOD_TYPE_XM | MOD_TYPE_MTM)) || m_SongFlags[SONG_LINEARSLIDES])
 	{
 		if (note < 12) note = 12;
 		note -= 12;
@@ -6582,7 +6587,7 @@
 uint32 CSoundFile::GetFreqFromPeriod(uint32 period, uint32 c5speed, int32 nPeriodFrac) const
 {
 	if (!period) return 0;
-	if (GetType() & (MOD_TYPE_XM | MOD_TYPE_MTM))
+	if ((GetType() & (MOD_TYPE_XM | MOD_TYPE_MTM)) || (m_SongFlags[SONG_LINEARSLIDES] && UseFinetuneAndTranspose()))
 	{
 		if(m_playBehaviour[kFT2Periods])
 		{

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

From: <sv...@op...> - 2024-05-31 18:40:44

Author: sagamusix
Date: Fri May 31 20:40:32 2024
New Revision: 20886
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20886

Log:
[Fix] FTM: Don't look for command to run new effect on work track but the exact channel we are evaluating.
[Fix] FTM: Trying to trigger an undefined effect executed the effect with the next higher ID instead.

Modified:
   trunk/OpenMPT/soundlib/InstrumentSynth.cpp
   trunk/OpenMPT/soundlib/Load_ftm.cpp

Modified: trunk/OpenMPT/soundlib/InstrumentSynth.cpp
==============================================================================
--- trunk/OpenMPT/soundlib/InstrumentSynth.cpp	Fri May 31 19:31:28 2024	(r20885)
+++ trunk/OpenMPT/soundlib/InstrumentSynth.cpp	Fri May 31 20:40:32 2024	(r20886)
@@ -860,8 +860,7 @@
 	for(CHANNELINDEX chn = 0; chn < sndFile.GetNumChannels(); chn++)
 	{
 		auto &state = states[chn];
-		CHANNELINDEX realChn = state.FTMRealChannel(chn, sndFile);
-		auto &modChn = playState.Chn[realChn];
+		auto &modChn = playState.Chn[chn];
 		if(modChn.rowCommand.command == CMD_MED_SYNTH_JUMP && modChn.isFirstTick)
 			states[chn].JumpToPosition(sndFile.m_globalScript, modChn.rowCommand.param);
 		int32 period = 0;

Modified: trunk/OpenMPT/soundlib/Load_ftm.cpp
==============================================================================
--- trunk/OpenMPT/soundlib/Load_ftm.cpp	Fri May 31 19:31:28 2024	(r20885)
+++ trunk/OpenMPT/soundlib/Load_ftm.cpp	Fri May 31 20:40:32 2024	(r20886)
@@ -179,14 +179,17 @@
 	}
 
 	auto &events = m_globalScript;
+	constexpr uint16 STOP_INDEX = uint16_max - 1;
 	std::map<uint16, uint16> offsetToIndex;
+	std::bitset<64> effectDefined;
 	for(uint8 effect = 0; effect < fileHeader.numEffects; effect++)
 	{
 		const auto [numLines, index] = file.ReadArray<uint16be, 2>();
 		if(numLines > 0x200 || index > 63 || offsetToIndex.count(index << 10))
 			return false;
-		events.reserve(5 + numLines);
-		events.push_back(InstrumentSynth::Event::StopScript());
+		effectDefined.set(index);
+		events.reserve(events.size() + 4 + numLines);
+		events.push_back(InstrumentSynth::Event::Jump(STOP_INDEX));
 		events.push_back(InstrumentSynth::Event::JumpMarker(index));
 		events.push_back(InstrumentSynth::Event::FTM_SetWorkTrack(uint8_max, false));
 		events.push_back(InstrumentSynth::Event::FTM_SetInterrupt(uint16_max, uint8_max));
@@ -223,8 +226,7 @@
 				events.push_back(InstrumentSynth::Event::Jump(static_cast<uint16>((u12hi << 10) | (jumpTarget & 0x3FF))));
 				break;
 			case 5:  // END OF EFFECT [......]
-				events.push_back(InstrumentSynth::Event::FTM_SetInterrupt(uint16_max, uint8_max));
-				events.push_back(InstrumentSynth::Event::StopScript());
+				events.push_back(InstrumentSynth::Event::Jump(STOP_INDEX));
 				break;
 			case 6:   // IF PITCH=v GOTO l [ppplll]
 			case 7:   // IF PITCH<v GOTO l [ppplll]
@@ -334,6 +336,11 @@
 				break;
 			}
 		}
+	}
+	if(fileHeader.numEffects)
+	{
+		events.push_back(InstrumentSynth::Event::JumpMarker(64));
+		offsetToIndex[STOP_INDEX] = static_cast<uint16>(events.size());
 		events.push_back(InstrumentSynth::Event::FTM_SetInterrupt(uint16_max, uint8_max));
 	}
 	for(auto &event : events)
@@ -390,7 +397,7 @@
 					m.instr = param;
 					break;
 				case 0xB0:  // SEL effect
-					m.SetEffectCommand(CMD_MED_SYNTH_JUMP, param);
+					m.SetEffectCommand(CMD_MED_SYNTH_JUMP, (param < effectDefined.size() && effectDefined[param]) ? param : 64);
 					break;
 				case 0xC0:  // Pitch bend
 					m.SetEffectCommand(CMD_TONEPORTA_DURATION, param);

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

From: <sv...@op...> - 2024-05-31 17:31:40

Author: sagamusix
Date: Fri May 31 19:31:28 2024
New Revision: 20885
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20885

Log:
[Fix] Allow mptrack.rc to be opened in VS resource editor again.

Modified:
   trunk/OpenMPT/mptrack/mptrack.rc

Modified: trunk/OpenMPT/mptrack/mptrack.rc
==============================================================================
--- trunk/OpenMPT/mptrack/mptrack.rc	Fri May 31 19:26:15 2024	(r20884)
+++ trunk/OpenMPT/mptrack/mptrack.rc	Fri May 31 19:31:28 2024	(r20885)
@@ -19,6 +19,10 @@
 LANGUAGE LANG_GERMAN, SUBLANG_GERMAN
 #pragma code_page(1252)
 
+#if !defined(WS_EX_COMPOSITED)
+#define WS_EX_COMPOSITED 0x02000000L
+#endif
+
 /////////////////////////////////////////////////////////////////////////////
 //
 // Dialog

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

From: <sv...@op...> - 2024-05-31 17:26:23

Author: sagamusix
Date: Fri May 31 19:26:15 2024
New Revision: 20884
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20884

Log:
[Fix] General tab: In r14537, drawing of the background of some regions in the lower half of the general tab under some circumstances (strangely, it appears to depend on whether position of the currently selected tab is right of the rightmost pixel of the dialog resource). This happens because the Z-order of the tab control was changed in that commit. However, putting the tab control bottom-most is required for tooltips to work. Setting the dialog style to WS_EX_COMPOSITED fixes the problem for some reason while keeping tooltips working.

Modified:
   trunk/OpenMPT/mptrack/mptrack.rc

Modified: trunk/OpenMPT/mptrack/mptrack.rc
==============================================================================
--- trunk/OpenMPT/mptrack/mptrack.rc	Fri May 31 16:13:28 2024	(r20883)
+++ trunk/OpenMPT/mptrack/mptrack.rc	Fri May 31 19:26:15 2024	(r20884)
@@ -1699,9 +1699,14 @@
 
 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
     EDITTEXT        IDC_EDIT9,10,30,89,12,ES_AUTOHSCROLL
     GROUPBOX        "Channel 2",IDC_TEXT2,108,18,99,157
@@ -1710,10 +1715,6 @@
     EDITTEXT        IDC_EDIT11,216,30,89,12,ES_AUTOHSCROLL
     GROUPBOX        "Channel 4",IDC_TEXT4,314,18,99,157
     EDITTEXT        IDC_EDIT12,319,30,89,12,ES_AUTOHSCROLL
-    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
     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

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

From: <sv...@op...> - 2024-05-31 14:13:35

Author: sagamusix
Date: Fri May 31 16:13:28 2024
New Revision: 20883
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20883

Log:
[Fix] AMS: Default channel panning was broken, using all-center panning instead of MOD panning.

Modified:
   trunk/OpenMPT/soundlib/Load_ams.cpp

Modified: trunk/OpenMPT/soundlib/Load_ams.cpp
==============================================================================
--- trunk/OpenMPT/soundlib/Load_ams.cpp	Fri May 31 15:50:38 2024	(r20882)
+++ trunk/OpenMPT/soundlib/Load_ams.cpp	Fri May 31 16:13:28 2024	(r20883)
@@ -401,6 +401,7 @@
 	}
 
 	InitializeGlobals(MOD_TYPE_AMS);
+	InitializeChannels();
 
 	m_SongFlags = SONG_ITCOMPATGXX | SONG_ITOLDEFFECTS;
 	m_nChannels = (fileHeader.channelConfig & 0x1F) + 1;
@@ -435,7 +436,6 @@
 	// Read channel names
 	for(CHANNELINDEX chn = 0; chn < GetNumChannels(); chn++)
 	{
-		ChnSettings[chn].Reset();
 		file.ReadSizedString<uint8le, mpt::String::spacePadded>(ChnSettings[chn].szName);
 	}

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

Flat | Threaded

<< < 1 .. 126 127 128 129 130 .. 964 > >> (Page 128 of 964)