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

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

Author: sagamusix
Date: Fri Jun  7 19:29:11 2024
New Revision: 20948
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20948

Log:
Merged revision(s) 20947 from trunk/OpenMPT:
[Fix] STM/STX: Don't import channels with panning. ST2 only outputs mono sound. The SoundBlaster Pro was only released around the same time as the last ST2 release, so stereo support was just not possible (tx cs127).
........

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

Modified: branches/OpenMPT-1.31/soundlib/Load_stm.cpp
==============================================================================
--- branches/OpenMPT-1.31/soundlib/Load_stm.cpp	Fri Jun  7 19:28:20 2024	(r20947)
+++ branches/OpenMPT-1.31/soundlib/Load_stm.cpp	Fri Jun  7 19:29:11 2024	(r20948)
@@ -230,6 +230,7 @@
 		return true;
 
 	InitializeGlobals(MOD_TYPE_STM);
+	InitializeChannels();
 
 	m_songName = mpt::String::ReadBuf(mpt::String::maybeNullTerminated, fileHeader.songname);
 
@@ -258,13 +259,6 @@
 	if(fileHeader.verMinor > 10)
 		m_nDefaultGlobalVolume = std::min(fileHeader.globalVolume, uint8(64)) * 4u;
 
-	// Setting up channels
-	for(CHANNELINDEX chn = 0; chn < 4; chn++)
-	{
-		ChnSettings[chn].Reset();
-		ChnSettings[chn].nPan = (chn & 1) ? 0x40 : 0xC0;
-	}
-
 	// Read samples
 	uint16 sampleOffsets[31];
 	for(SAMPLEINDEX smp = 1; smp <= 31; smp++)
@@ -461,6 +455,7 @@
 		return true;
 
 	InitializeGlobals(MOD_TYPE_STM);
+	InitializeChannels();
 
 	m_songName = mpt::String::ReadBuf(mpt::String::maybeNullTerminated, fileHeader.songName);
 
@@ -479,13 +474,6 @@
 	m_nDefaultSpeed = initTempo >> 4;
 	m_nDefaultGlobalVolume = std::min(fileHeader.globalVolume, uint8(64)) * 4u;
 
-	// Setting up channels
-	for(CHANNELINDEX chn = 0; chn < 4; chn++)
-	{
-		ChnSettings[chn].Reset();
-		ChnSettings[chn].nPan = (chn & 1) ? 0x40 : 0xC0;
-	}
-
 	std::vector<uint16le> patternOffsets, sampleOffsets;
 	file.Seek(fileHeader.patTableOffset << 4);
 	file.ReadVector(patternOffsets, fileHeader.numPatterns);