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

[<sv...@op...>]

Author: sagamusix
Date: Thu Jul  4 23:03:12 2024
New Revision: 21127
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21127

Log:
[Imp] S3M: Detect Liquid Tracker and NESMusa (tool by Bisqwit?)

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	Wed Jul  3 19:09:44 2024	(r21126)
+++ trunk/OpenMPT/soundlib/Load_s3m.cpp	Thu Jul  4 23:03:12 2024	(r21127)
@@ -335,7 +335,14 @@
 		nonCompatTracker = true;
 		break;
 	case S3MFileHeader::trkOpenMPT:
-		if(fileHeader.cwtv != S3MFileHeader::trkGraoumfTracker)
+		if(fileHeader.cwtv == S3MFileHeader::trkLiquidTracker && fileHeader.ultraClicks == 16)
+		{
+			madeWithTracker = U_("Liquid Tracker");
+		} else if((fileHeader.cwtv & 0xFF00) == S3MFileHeader::trkNESMusa)
+		{
+			madeWithTracker = U_("NESMusa");
+			formatTrackerStr = true;
+		} else if(fileHeader.cwtv != S3MFileHeader::trkGraoumfTracker)
 		{
 			uint32 mptVersion = (fileHeader.cwtv & S3MFileHeader::versionMask) << 16;
 			if(mptVersion >= 0x01'29'00'00)

Modified: trunk/OpenMPT/soundlib/S3MTools.h
==============================================================================
--- trunk/OpenMPT/soundlib/S3MTools.h	Wed Jul  3 19:09:44 2024	(r21126)
+++ trunk/OpenMPT/soundlib/S3MTools.h	Thu Jul  4 23:03:12 2024	(r21127)
@@ -52,8 +52,10 @@
 		trkIT2_14         = 0x3214,
 		trkBeRoTrackerOld = 0x4100,  // Used from 2004 to 2012
 		trkGraoumfTracker = 0x5447,
+		trkLiquidTracker  = 0x5125,  // Clashes with OpenMPT 1.25
+		trkNESMusa        = 0x5700,
 		trkCamoto         = 0xCA00,
-		trkPlayerPRO      = 0x2013  // PlayerPRO on Intel doesn't byte-swap the tracker ID bytes
+		trkPlayerPRO      = 0x2013,  // PlayerPRO on Intel doesn't byte-swap the tracker ID bytes
 	};
 
 	// Flags