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

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

Author: sagamusix
Date: Sun Nov 24 14:03:24 2024
New Revision: 22289
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22289

Log:
Merged revision(s) 22250 from trunk/OpenMPT:
[Fix] MED: 7-bit volume doesn't apply to just any file with a BlockInfo. Maybe it's actually the 2nd command level extension that should enable it instead... Fixes ShowMeLove.med (https://www.un4seen.com/forum/?topic=15448.msg144136#msg144136).
........

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 Nov 24 13:59:47 2024	(r22288)
+++ branches/OpenMPT-1.31/soundlib/Load_med.cpp	Sun Nov 24 14:03:24 2024	(r22289)
@@ -1432,7 +1432,6 @@
 				numRows = patHeader.numRows + 1;
 				if(patHeader.blockInfoOffset)
 				{
-					vol7bit = true;
 					auto offset = file.GetPosition();
 					file.Seek(patHeader.blockInfoOffset);
 					MMDBlockInfo blockInfo;
@@ -1457,6 +1456,7 @@
 					   && file.Seek(blockInfo.cmdExtTableOffset)
 					   && file.Seek(file.ReadUint32BE()))
 					{
+						vol7bit = true;
 						cmdExt = file.ReadChunk(numTracks * numRows * (1 + numPages));
 					}