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

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

Author: sagamusix
Date: Sun Jul 21 13:37:31 2024
New Revision: 21212
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21212

Log:
Merged revision(s) 21189 from trunk/OpenMPT:
[Fix] MED: Apply more suitable lower period limits. Should fix Silly.med. The limit for software mixing may not be accurate.
........
Merged revision(s) 21188 from trunk/OpenMPT:
[Fix] MED: Command 0F was not imported properly.
........

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

Modified: branches/OpenMPT-1.30/soundlib/Load_med.cpp
==============================================================================
--- branches/OpenMPT-1.30/soundlib/Load_med.cpp	Sun Jul 21 07:10:46 2024	(r21211)
+++ branches/OpenMPT-1.30/soundlib/Load_med.cpp	Sun Jul 21 13:37:31 2024	(r21212)
@@ -439,7 +439,7 @@
 			if(m.param < 0x20)
 				m.param = 0x20;
 #endif  // MODPLUG_TRACKER
-		} else switch(m.command)
+		} else switch(m.param)
 		{
 			case 0xF1:  // Play note twice
 				m.command = CMD_MODCMDEX;
@@ -747,6 +747,7 @@
 	// - starkelsesirap.mmd0 (synth instruments) on the other hand don't need it
 	// In MMD2 / MMD3, the mix flag is used instead.
 	const bool hardwareMixSamples = (version < 2) || (version >= 2 && !(songHeader.flags2 & MMDSong::FLAG2_MIX));
+	m_nMinPeriod = hardwareMixSamples ? (113 * 4) : (55 * 4);
 
 	bool needInstruments = false;
 	bool anySynthInstrs = false;