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

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Author: sagamusix
Date: Fri Jul 12 20:51:28 2024
New Revision: 21146
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21146

Log:
[Imp] S3M: Detect UNMO3, deMODifier and Kosmic To-S3M.

Modified:
   trunk/OpenMPT/soundlib/Load_s3m.cpp
   trunk/OpenMPT/soundlib/S3MTools.h

Modified: trunk/OpenMPT/soundlib/Load_s3m.cpp
==============================================================================

--- trunk/OpenMPT/soundlib/Load_s3m.cpp	Fri Jul 12 19:00:47 2024	(r21145)
+++ trunk/OpenMPT/soundlib/Load_s3m.cpp	Fri Jul 12 20:51:28 2024	(r21146)
@@ -35,7 +35,7 @@
 	case '@': m.command = (m.param ? CMD_DUMMY : CMD_NONE); break;
 	case 'A': m.command = CMD_SPEED; break;
 	case 'B': m.command = CMD_POSITIONJUMP; break;
-	case 'C': m.command = CMD_PATTERNBREAK; if (!fromIT) m.param = static_cast<uint8>((m.param >> 4) * 10 + (m.param & 0x0F)); break;
+	case 'C': m.command = CMD_PATTERNBREAK; if(!fromIT) m.param = static_cast<uint8>((m.param >> 4) * 10 + (m.param & 0x0F)); break;
 	case 'D': m.command = CMD_VOLUMESLIDE; break;
 	case 'E': m.command = CMD_PORTAMENTODOWN; break;
 	case 'F': m.command = CMD_PORTAMENTOUP; break;
@@ -86,8 +86,8 @@
 	case CMD_POSITIONJUMP:    command = 'B'; break;
 	case CMD_PATTERNBREAK:    command = 'C'; if(!toIT) param = static_cast<uint8>(((param / 10) << 4) + (param % 10)); break;
 	case CMD_VOLUMESLIDE:     command = 'D'; break;
-	case CMD_PORTAMENTODOWN:  command = 'E'; if (param >= 0xE0 && (GetType() & (MOD_TYPE_MOD | MOD_TYPE_XM))) param = 0xDF; break;
-	case CMD_PORTAMENTOUP:    command = 'F'; if (param >= 0xE0 && (GetType() & (MOD_TYPE_MOD | MOD_TYPE_XM))) param = 0xDF; break;
+	case CMD_PORTAMENTODOWN:  command = 'E'; if(param >= 0xE0 && (GetType() & (MOD_TYPE_MOD | MOD_TYPE_XM))) param = 0xDF; break;
+	case CMD_PORTAMENTOUP:    command = 'F'; if(param >= 0xE0 && (GetType() & (MOD_TYPE_MOD | MOD_TYPE_XM))) param = 0xDF; break;
 	case CMD_TONEPORTAMENTO:  command = 'G'; break;
 	case CMD_VIBRATO:         command = 'H'; break;
 	case CMD_TREMOR:          command = 'I'; break;
@@ -110,11 +110,11 @@
 		command = 'X';
 		if(toIT && !(GetType() & (MOD_TYPE_IT | MOD_TYPE_MPT | MOD_TYPE_XM | MOD_TYPE_MOD)))
 		{
-			if (param == 0xA4) { command = 'S'; param = 0x91; }
-			else if (param == 0x80) { param = 0xFF; }
-			else if (param < 0x80) { param <<= 1; }
+			if(param == 0xA4) { command = 'S'; param = 0x91; }
+			else if(param == 0x80) { param = 0xFF; }
+			else if(param < 0x80) { param <<= 1; }
 			else command = 0;
-		} else if (!toIT && (GetType() & (MOD_TYPE_IT | MOD_TYPE_MPT | MOD_TYPE_XM | MOD_TYPE_MOD)))
+		} else if(!toIT && (GetType() & (MOD_TYPE_IT | MOD_TYPE_MPT | MOD_TYPE_XM | MOD_TYPE_MOD)))
 		{
 			param >>= 1;
 		}
@@ -240,49 +240,50 @@
 	bool nonCompatTracker = false;
 	bool isST3 = false;
 	bool isSchism = false;
+	const bool usePanningTable = fileHeader.usePanningTable == S3MFileHeader::idPanning;
 	const int32 schismDateVersion = SchismTrackerEpoch + ((fileHeader.cwtv == 0x4FFF) ? fileHeader.reserved2 : (fileHeader.cwtv - 0x4050));
 	switch(fileHeader.cwtv & S3MFileHeader::trackerMask)
 	{
 	case S3MFileHeader::trkAkord & S3MFileHeader::trackerMask:
 		if(fileHeader.cwtv == S3MFileHeader::trkAkord)
-			madeWithTracker = U_("Akord");
+			madeWithTracker = UL_("Akord");
 		break;
 	case S3MFileHeader::trkScreamTracker:
 		if(!memcmp(&fileHeader.reserved2, "SCLUB2.0", 8))
 		{
-			madeWithTracker = U_("Sound Club 2");
-		} else if(fileHeader.cwtv == S3MFileHeader::trkST3_20 && fileHeader.special == 0 && (fileHeader.ordNum & 0x0F) == 0 && fileHeader.ultraClicks == 0 && (fileHeader.flags & ~0x50) == 0 && fileHeader.usePanningTable == S3MFileHeader::idPanning)
+			madeWithTracker = UL_("Sound Club 2");
+		} else if(fileHeader.cwtv == S3MFileHeader::trkST3_20 && fileHeader.special == 0 && (fileHeader.ordNum & 0x0F) == 0 && fileHeader.ultraClicks == 0 && (fileHeader.flags & ~0x50) == 0 && usePanningTable)
 		{
 			// MPT and OpenMPT before 1.17.03.02 - Simply keep default (filter) MIDI macros
 			if((fileHeader.masterVolume & 0x80) != 0)
 			{
 				m_dwLastSavedWithVersion = MPT_V("1.16");
-				madeWithTracker = U_("ModPlug Tracker / OpenMPT 1.17");
+				madeWithTracker = UL_("ModPlug Tracker / OpenMPT 1.17");
 			} else
 			{
 				// MPT 1.0 alpha5 doesn't set the stereo flag, but MPT 1.0 alpha6 does.
 				m_dwLastSavedWithVersion = MPT_V("1.00.00.A0");
-				madeWithTracker = U_("ModPlug Tracker 1.0 alpha");
+				madeWithTracker = UL_("ModPlug Tracker 1.0 alpha");
 			}
 			keepMidiMacros = true;
 			nonCompatTracker = true;
 			m_playBehaviour.set(kST3LimitPeriod);
-		} else if(fileHeader.cwtv == S3MFileHeader::trkST3_20 && fileHeader.special == 0 && fileHeader.ultraClicks == 0 && fileHeader.flags == 0 && fileHeader.usePanningTable == 0)
+		} else if(fileHeader.cwtv == S3MFileHeader::trkST3_20 && fileHeader.special == 0 && fileHeader.ultraClicks == 0 && fileHeader.flags == 0 && !usePanningTable)
 		{
 			if(fileHeader.globalVol == 64 && fileHeader.masterVolume == 48)
-				madeWithTracker = U_("PlayerPRO");
+				madeWithTracker = UL_("PlayerPRO");
 			else  // Always stereo
-				madeWithTracker = U_("Velvet Studio");
-		} else if(fileHeader.cwtv == S3MFileHeader::trkST3_20 && fileHeader.special == 0 && fileHeader.ultraClicks == 0 && fileHeader.flags == 8 && fileHeader.usePanningTable == 0)
+				madeWithTracker = UL_("Velvet Studio");
+		} else if(fileHeader.cwtv == S3MFileHeader::trkST3_20 && fileHeader.special == 0 && fileHeader.ultraClicks == 0 && fileHeader.flags == 8 && !usePanningTable)
 		{
-			madeWithTracker = U_("Impulse Tracker < 1.03");  // Not sure if 1.02 saves like this as I don't have it
+			madeWithTracker = UL_("Impulse Tracker < 1.03");  // Not sure if 1.02 saves like this as I don't have it
 		} else
 		{
 			// ST3.20 should only ever write ultra-click values 16, 24 and 32 (corresponding to 8, 12 and 16 in the GUI), ST3.01/3.03 should only write 0,
 			// though several ST3.01/3.03 files with ultra-click values of 16 have been found as well.
 			// However, we won't fingerprint these values here as it's unlikely that there is any other tracker out there disguising as ST3 and using a strange ultra-click value.
 			// Also, re-saving a file with a strange ultra-click value in ST3 doesn't fix this value unless the user manually changes it, or if it's below 16.
-			madeWithTracker = U_("Scream Tracker");
+			madeWithTracker = UL_("Scream Tracker");
 			formatTrackerStr = true;
 			isST3 = true;
 		}
@@ -290,19 +291,19 @@
 	case S3MFileHeader::trkImagoOrpheus:
 		formatTrackerStr = (fileHeader.cwtv != S3MFileHeader::trkPlayerPRO);
 		if(formatTrackerStr)
-			madeWithTracker = U_("Imago Orpheus");
+			madeWithTracker = UL_("Imago Orpheus");
 		else
-			madeWithTracker = U_("PlayerPRO");
+			madeWithTracker = UL_("PlayerPRO");
 		nonCompatTracker = true;
 		break;
 	case S3MFileHeader::trkImpulseTracker:
 		if(fileHeader.cwtv <= S3MFileHeader::trkIT2_14)
 		{
-			madeWithTracker = U_("Impulse Tracker");
+			madeWithTracker = UL_("Impulse Tracker");
 			formatTrackerStr = true;
-		} else if (fileHeader.cwtv == S3MFileHeader::trkIT1_old)
+		} else if(fileHeader.cwtv == S3MFileHeader::trkIT1_old)
 		{
-			madeWithTracker = U_("Impulse Tracker 1.03");  // Could also be 1.02, maybe? I don't have that one
+			madeWithTracker = UL_("Impulse Tracker 1.03");  // Could also be 1.02, maybe? I don't have that one
 		} else
 		{
 			madeWithTracker = MPT_UFORMAT("Impulse Tracker 2.14p{}")(fileHeader.cwtv - S3MFileHeader::trkIT2_14);
@@ -328,7 +329,7 @@
 	case S3MFileHeader::trkSchismTracker:
 		if(fileHeader.cwtv == S3MFileHeader::trkBeRoTrackerOld)
 		{
-			madeWithTracker = U_("BeRoTracker");
+			madeWithTracker = UL_("BeRoTracker");
 			m_playBehaviour.set(kST3LimitPeriod);
 		} else
 		{
@@ -346,7 +347,7 @@
 	case S3MFileHeader::trkOpenMPT:
 		if((fileHeader.cwtv & 0xFF00) == S3MFileHeader::trkNESMusa)
 		{
-			madeWithTracker = U_("NESMusa");
+			madeWithTracker = UL_("NESMusa");
 			formatTrackerStr = true;
 		} else if(fileHeader.reserved2 == 0 && fileHeader.ultraClicks == 16 && fileHeader.channels[1] != 1)
 		{
@@ -354,7 +355,7 @@
 			// OpenMPT started writing full version information with OpenMPT 1.29 and later changed the ultraClicks value from 8 to 16.
 			// Liquid Tracker writes an ultraClicks value of 16.
 			// So we assume that a file was saved with Liquid Tracker if the reserved fields are 0 and ultraClicks is 16.
-			madeWithTracker = U_("Liquid Tracker");
+			madeWithTracker = UL_("Liquid Tracker");
 			formatTrackerStr = true;
 		} else if(fileHeader.cwtv != S3MFileHeader::trkGraoumfTracker)
 		{
@@ -362,22 +363,22 @@
 			if(mptVersion >= 0x01'29'00'00)
 				mptVersion |= fileHeader.reserved2;
 			m_dwLastSavedWithVersion = Version(mptVersion);
-			madeWithTracker = U_("OpenMPT ") + mpt::ufmt::val(m_dwLastSavedWithVersion);
+			madeWithTracker = UL_("OpenMPT ") + mpt::ufmt::val(m_dwLastSavedWithVersion);
 		} else
 		{
-			madeWithTracker = U_("Graoumf Tracker");
+			madeWithTracker = UL_("Graoumf Tracker");
 		}
 		break; 
 	case S3MFileHeader::trkBeRoTracker:
-		madeWithTracker = U_("BeRoTracker");
+		madeWithTracker = UL_("BeRoTracker");
 		m_playBehaviour.set(kST3LimitPeriod);
 		break;
 	case S3MFileHeader::trkCreamTracker:
-		madeWithTracker = U_("CreamTracker");
+		madeWithTracker = UL_("CreamTracker");
 		break;
 	default:
 		if(fileHeader.cwtv == S3MFileHeader::trkCamoto)
-			madeWithTracker = U_("Camoto");
+			madeWithTracker = UL_("Camoto");
 		break;
 	}
 	if(formatTrackerStr)
@@ -385,8 +386,8 @@
 		madeWithTracker = MPT_UFORMAT("{} {}.{}")(madeWithTracker, (fileHeader.cwtv & 0xF00) >> 8, mpt::ufmt::hex0<2>(fileHeader.cwtv & 0xFF));
 	}
 
-	m_modFormat.formatName = U_("Scream Tracker 3");
-	m_modFormat.type = U_("s3m");
+	m_modFormat.formatName = UL_("Scream Tracker 3");
+	m_modFormat.type = UL_("s3m");
 	m_modFormat.madeWithTracker = std::move(madeWithTracker);
 	m_modFormat.charset = m_dwLastSavedWithVersion ? mpt::Charset::Windows1252 : mpt::Charset::CP437;
 
@@ -400,7 +401,7 @@
 		m_playBehaviour.reset(kST3OffsetWithoutInstrument);
 		m_playBehaviour.reset(kApplyUpperPeriodLimit);
 	}
-	if (fileHeader.cwtv <= S3MFileHeader::trkST3_01)
+	if(fileHeader.cwtv <= S3MFileHeader::trkST3_01)
 	{
 		// This broken behaviour is not present in ST3.01
 		m_playBehaviour.reset(kST3TonePortaWithAdlibNote);
@@ -506,7 +507,7 @@
 	file.ReadVector(patternOffsets, fileHeader.patNum);
 
 	// Read extended channel panning
-	if(fileHeader.usePanningTable == S3MFileHeader::idPanning)
+	if(usePanningTable)
 	{
 		bool hasChannelsWithoutPanning = false;
 		const auto pan = file.ReadArray<uint8, 32>();
@@ -521,9 +522,9 @@
 		{
 			// 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");
+				m_modFormat.madeWithTracker = UL_("ModPlug Tracker 1.16 / OpenMPT 1.17");
 			else
-				m_modFormat.madeWithTracker = U_("ModPlug Tracker");
+				m_modFormat.madeWithTracker = UL_("ModPlug Tracker");
 		}
 	}
 
@@ -565,7 +566,17 @@
 		// Hence if a file claims to be written with ST3 (but not ST3.00), but has no GUS addresses, we deduce that it must be written by some other software (e.g. some PSM -> S3M conversions)
 		isST3 = false;
 		MPT_UNUSED(isST3);
-		m_modFormat.madeWithTracker = U_("Unknown");
+		m_modFormat.madeWithTracker = UL_("Unknown");
+		// Check these only after we are certain that it can't be ST3.01 because that version doesn't sanitize the ultraClicks value yet
+		if(fileHeader.cwtv == S3MFileHeader::trkST3_00 && fileHeader.ultraClicks == 0)
+		{
+			if(!(fileHeader.flags & ~S3MFileHeader::fastVolumeSlides) && (fileHeader.masterVolume & 0x80) && usePanningTable)
+				m_modFormat.madeWithTracker = UL_("UNMO3");
+			else if(!fileHeader.flags && fileHeader.globalVol == 48 && fileHeader.masterVolume == 176 && fileHeader.tempo == 150 && !usePanningTable)
+				m_modFormat.madeWithTracker = UL_("deMODifier");  // SoundSmith to S3M converter
+			else if(!fileHeader.flags && fileHeader.globalVol == 64 && fileHeader.speed == 6 && fileHeader.tempo == 125 && !usePanningTable)
+				m_modFormat.madeWithTracker = UL_("Kosmic To-S3M");  // MTM to S3M converter by Zab/Kosmic
+		}
 	} else if(isST3)
 	{
 		// Saving an S3M file in ST3 with the Gravis Ultrasound driver loaded will write a unique GUS memory address for each non-empty sample slot (and 0 for unused slots).
@@ -582,7 +593,7 @@
 	}
 
 	if(anyADPCM)
-		m_modFormat.madeWithTracker += U_(" (ADPCM packed)");
+		m_modFormat.madeWithTracker += UL_(" (ADPCM packed)");
 
 	// Try to find out if Zxx commands are supposed to be panning commands (PixPlay).
 	// Actually I am only aware of one module that uses this panning style, namely "Crawling Despair" by $volkraq

Modified: trunk/OpenMPT/soundlib/S3MTools.h
==============================================================================
--- trunk/OpenMPT/soundlib/S3MTools.h	Fri Jul 12 19:00:47 2024	(r21145)
+++ trunk/OpenMPT/soundlib/S3MTools.h	Fri Jul 12 20:51:28 2024	(r21146)
@@ -46,8 +46,8 @@
 
 		trkAkord          = 0x0208,
 		trkST3_00         = 0x1300,
-		trkST3_20         = 0x1320,
 		trkST3_01         = 0x1301,
+		trkST3_20         = 0x1320,
 		trkIT1_old        = 0x3320,
 		trkIT2_07         = 0x3207,
 		trkIT2_14         = 0x3214,




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

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

A music tracker software for Windows.

modplug-svn-commit — OpenMPT subversion commit notifications