[OMPT-svn-commit] SF.net SVN: modplug:[629] trunk/OpenMPT/mptrack/Modedit.cpp

[<sag...@us...>]

Revision: 629
          http://modplug.svn.sourceforge.net/modplug/?rev=629&view=rev
Author:   saga-games
Date:     2010-06-21 07:13:54 +0000 (Mon, 21 Jun 2010)

Log Message:
-----------
[Fix] Mod Conversion: Channel settings were not reset properly for MOD/XM/S3M, only the first channel was fixed.

Modified Paths:
--------------
    trunk/OpenMPT/mptrack/Modedit.cpp

Modified: trunk/OpenMPT/mptrack/Modedit.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Modedit.cpp	2010-06-19 19:47:53 UTC (rev 628)
+++ trunk/OpenMPT/mptrack/Modedit.cpp	2010-06-21 07:13:54 UTC (rev 629)
@@ -344,12 +344,12 @@
 	{
 		if(newTypeIsMOD_XM || newTypeIsS3M)
 		{
-			m_SndFile.ChnSettings->nVolume = 64;
-			m_SndFile.ChnSettings->dwFlags &= ~CHN_SURROUND;
+			m_SndFile.ChnSettings[nChn].nVolume = 64;
+			m_SndFile.ChnSettings[nChn].dwFlags &= ~CHN_SURROUND;
 		}
 		if(newTypeIsXM)
 		{
-			m_SndFile.ChnSettings->nPan = 128;
+			m_SndFile.ChnSettings[nChn].nPan = 128;
 		}
 	}
 
@@ -369,11 +369,10 @@
 
 	//rewbs.cutomKeys: update effect key commands
 	CInputHandler *ih = CMainFrame::GetMainFrame()->GetInputHandler();
-	if	(newTypeIsMOD_XM) {
+	if	(newTypeIsMOD_XM)
 		ih->SetXMEffects();
-	} else {
+	else
 		ih->SetITEffects();
-	}
 	//end rewbs.cutomKeys
 
 	// Check mod specifications
@@ -555,6 +554,8 @@
 					m_SndFile.Chn[tmpchn] = m_SndFile.Chn[i];
 				}
 				tmpchn++;
+			} else
+			{
 				if (i >= nRemainingChannels)
 				{
 					m_SndFile.InitChannel(i);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.