[OMPT-svn-commit] OpenMPT r23163 - in branches/OpenMPT-1.32: . soundlib test

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

Author: sagamusix
Date: Thu May  8 11:52:08 2025
New Revision: 23163
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=23163

Log:
Merged revision(s) 23162 from trunk/OpenMPT:
[Fix] MOD: Automatic hiding of volume column was broken (https://bugs.openmpt.org/view.php?id=1884).
........

Modified:
   branches/OpenMPT-1.32/   (props changed)
   branches/OpenMPT-1.32/soundlib/Load_mod.cpp
   branches/OpenMPT-1.32/test/test.cpp

Modified: branches/OpenMPT-1.32/soundlib/Load_mod.cpp
==============================================================================
--- branches/OpenMPT-1.32/soundlib/Load_mod.cpp	Thu May  8 11:50:39 2025	(r23162)
+++ branches/OpenMPT-1.32/soundlib/Load_mod.cpp	Thu May  8 11:52:08 2025	(r23163)
@@ -298,7 +298,6 @@
 	}
 
 	InitializeGlobals(MOD_TYPE_MOD, modMagicResult.numChannels);
-	m_SongFlags.set(SONG_FORMAT_NO_VOLCOL);
 
 	bool isNoiseTracker = modMagicResult.isNoiseTracker;
 	bool isStartrekker = modMagicResult.isStartrekker;
@@ -432,7 +431,7 @@
 	// is the maximum possible sample pre-amp without getting distortion (Compatible mix levels given).
 	// The more channels we have, the less likely it is that all of them are used at the same time, though, so cap at 32...
 	m_nSamplePreAmp = Clamp(256 / GetNumChannels(), 32, 128);
-	m_SongFlags.reset();  // SONG_ISAMIGA will be set conditionally
+	m_SongFlags = SONG_FORMAT_NO_VOLCOL;  // SONG_ISAMIGA will be set conditionally
 
 	// Setup channel pan positions and volume
 	SetupMODPanning();

Modified: branches/OpenMPT-1.32/test/test.cpp
==============================================================================
--- branches/OpenMPT-1.32/test/test.cpp	Thu May  8 11:50:39 2025	(r23162)
+++ branches/OpenMPT-1.32/test/test.cpp	Thu May  8 11:52:08 2025	(r23163)
@@ -3473,7 +3473,7 @@
 {
 	// Global Variables
 	VERIFY_EQUAL_NONCONT(sndFile.GetTitle(), "MOD_Test___________X");
-	VERIFY_EQUAL_NONCONT(sndFile.m_SongFlags, SONG_PT_MODE | SONG_AMIGALIMITS | SONG_ISAMIGA);
+	VERIFY_EQUAL_NONCONT(sndFile.m_SongFlags, SONG_PT_MODE | SONG_AMIGALIMITS | SONG_ISAMIGA | SONG_FORMAT_NO_VOLCOL);
 	VERIFY_EQUAL_NONCONT(sndFile.GetMixLevels(), MixLevels::Compatible);
 	VERIFY_EQUAL_NONCONT(sndFile.m_nTempoMode, TempoMode::Classic);
 	VERIFY_EQUAL_NONCONT(sndFile.GetNumChannels(), 4);