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

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

Author: sagamusix
Date: Sun Jul 21 18:20:11 2024
New Revision: 21242
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21242

Log:
Merged revision(s) 21241 from trunk/OpenMPT:
[Fix] MED: Also disallow free panning if hardware mixing is enabled (https://www.un4seen.com/forum/?topic=15448.msg143278#msg143278).
........

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

Modified: branches/OpenMPT-1.31/soundlib/Load_med.cpp
==============================================================================
--- branches/OpenMPT-1.31/soundlib/Load_med.cpp	Sun Jul 21 18:19:44 2024	(r21241)
+++ branches/OpenMPT-1.31/soundlib/Load_med.cpp	Sun Jul 21 18:20:11 2024	(r21242)
@@ -1143,7 +1143,7 @@
 			if(header.numTracks < 1 || header.numTracks > 64 || m_nChannels > 64)
 				return false;
 
-			const bool freePan = (header.flags3 & MMD2Song::FLAG3_FREEPAN);
+			const bool freePan = !hardwareMixSamples && (header.flags3 & MMD2Song::FLAG3_FREEPAN);
 			if(header.volAdjust)
 				preamp = Util::muldivr_unsigned(preamp, std::min<uint16>(header.volAdjust, 800), 100);
 			if (freePan)