[OMPT-svn-commit] SF.net SVN: modplug:[539] trunk/OpenMPT/soundlib

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

Revision: 539
          http://modplug.svn.sourceforge.net/modplug/?rev=539&view=rev
Author:   saga-games
Date:     2010-03-20 22:00:26 +0000 (Sat, 20 Mar 2010)

Log Message:
-----------
[Fix] XM compatibility: New instrument + tone portamento = ignore new instrument (fixes partytime.xm by cancer)
[Ref] Minor code cleanup.

Modified Paths:
--------------
    trunk/OpenMPT/soundlib/Snd_fx.cpp
    trunk/OpenMPT/soundlib/Sndfile.h

Modified: trunk/OpenMPT/soundlib/Snd_fx.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Snd_fx.cpp	2010-03-20 17:26:29 UTC (rev 538)
+++ trunk/OpenMPT/soundlib/Snd_fx.cpp	2010-03-20 22:00:26 UTC (rev 539)
@@ -400,7 +400,8 @@
 			}
 		}
 		nSpeedCount += nMusicSpeed;
-		switch(m_nTempoMode) {
+		switch(m_nTempoMode)
+		{
 			case tempo_mode_alternative: 
 				dElapsedTime +=  60000.0 / (1.65625 * (double)(nMusicSpeed * nMusicTempo)); break;
 			case tempo_mode_modern: 
@@ -435,10 +436,10 @@
 //////////////////////////////////////////////////////////////////////////////////////////////////
 // Effects
 
-void CSoundFile::InstrumentChange(MODCHANNEL *pChn, UINT instr, BOOL bPorta, BOOL bUpdVol, BOOL bResetEnv)
+void CSoundFile::InstrumentChange(MODCHANNEL *pChn, UINT instr, bool bPorta, bool bUpdVol, bool bResetEnv)
 //--------------------------------------------------------------------------------------------------------
 {
-	BOOL bInstrumentChanged = FALSE;
+	bool bInstrumentChanged = false;
 
 	if (instr >= MAX_INSTRUMENTS) return;
 	MODINSTRUMENT *pIns = Instruments[instr];
@@ -469,8 +470,8 @@
 	// bInstrumentChanged is used for IT carry-on env option
 	if (pIns != pChn->pModInstrument)
 	{
-		bInstrumentChanged = TRUE;
-		pChn->pModInstrument = pIns;
+		bInstrumentChanged = true;
+		// we will set the new instrument later.
 	} 
 	else 
 	{	
@@ -483,6 +484,15 @@
 			returnAfterVolumeAdjust = true;
 		}
 	}
+
+	// XM compatibility: new instrument + portamento = forget it!
+	if(bInstrumentChanged && bPorta && IsCompatibleMode(TRK_FASTTRACKER2))
+	{
+		return;
+	} else
+	{
+		pChn->pModInstrument = pIns;
+	}
 	
 	// Update Volume
 	if (bUpdVol)
@@ -1152,7 +1162,7 @@
 		UINT vol = pChn->nRowVolume;
 		UINT cmd = pChn->nRowCommand;
 		UINT param = pChn->nRowParam;
-		bool bPorta = ((cmd != CMD_TONEPORTAMENTO) && (cmd != CMD_TONEPORTAVOL) && (volcmd != VOLCMD_TONEPORTAMENTO)) ? FALSE : TRUE;
+		bool bPorta = ((cmd != CMD_TONEPORTAMENTO) && (cmd != CMD_TONEPORTAVOL) && (volcmd != VOLCMD_TONEPORTAMENTO)) ? false : true;
 
 		UINT nStartTick = 0;
 
@@ -1380,13 +1390,13 @@
 			if (instr)
 			{
 				MODSAMPLE *psmp = pChn->pModSample;
-				InstrumentChange(pChn, instr, bPorta, TRUE);
+				InstrumentChange(pChn, instr, bPorta, true);
 				pChn->nNewIns = 0;
 				// Special IT case: portamento+note causes sample change -> ignore portamento
 				if ((m_nType & (MOD_TYPE_S3M|MOD_TYPE_IT|MOD_TYPE_MPT))
 				 && (psmp != pChn->pModSample) && (note) && (note < 0x80))
 				{
-					bPorta = FALSE;
+					bPorta = false;
 				}
 			}
 			// New Note ?
@@ -1394,7 +1404,7 @@
 			{
 				if ((!instr) && (pChn->nNewIns) && (note < 0x80))
 				{
-					InstrumentChange(pChn, pChn->nNewIns, bPorta, FALSE, (m_nType & (MOD_TYPE_XM|MOD_TYPE_MT2)) ? FALSE : TRUE);
+					InstrumentChange(pChn, pChn->nNewIns, bPorta, false, (m_nType & (MOD_TYPE_XM|MOD_TYPE_MT2)) ? false : true);
 					pChn->nNewIns = 0;
 				}
 				NoteChange(nChn, note, bPorta, (m_nType & (MOD_TYPE_XM|MOD_TYPE_MT2)) ? false : true);
@@ -3330,7 +3340,7 @@
 		{
 			int vol = pChn->nVolume;
 
-			// FT2 compatibility: Retrig + volume will not change volume of retrigged notes
+			// XM compatibility: Retrig + volume will not change volume of retrigged notes
 			if(!IsCompatibleMode(TRK_FASTTRACKER2) || !(pChn->nRowVolCmd == VOLCMD_VOLUME))
 			{
 				if (retrigTable1[dv])
@@ -3352,7 +3362,7 @@
 		{
 			if ((pChn->nRowInstr) && (param < 0x100))
 			{
-				InstrumentChange(pChn, pChn->nRowInstr, FALSE, FALSE);
+				InstrumentChange(pChn, pChn->nRowInstr, false, false);
 				bResetEnv = true;
 			}
 			if (param < 0x100) bResetEnv = true;
@@ -3872,7 +3882,8 @@
 UINT  CSoundFile::GetBestPlugin(UINT nChn, UINT priority, bool respectMutes)
 //-------------------------------------------------------------------------
 {
-	if (nChn > MAX_CHANNELS) {		//Check valid channel number
+	if (nChn > MAX_CHANNELS)		//Check valid channel number
+	{
 		return 0;
 	}
 	

Modified: trunk/OpenMPT/soundlib/Sndfile.h
===================================================================
--- trunk/OpenMPT/soundlib/Sndfile.h	2010-03-20 17:26:29 UTC (rev 538)
+++ trunk/OpenMPT/soundlib/Sndfile.h	2010-03-20 22:00:26 UTC (rev 539)
@@ -821,7 +821,7 @@
 	UINT GetNNAChannel(UINT nChn) const;
 	void CheckNNA(UINT nChn, UINT instr, int note, BOOL bForceCut);
 	void NoteChange(UINT nChn, int note, bool bPorta = false, bool bResetEnv = true, bool bManual = false);
-	void InstrumentChange(MODCHANNEL *pChn, UINT instr, BOOL bPorta=FALSE,BOOL bUpdVol=TRUE,BOOL bResetEnv=TRUE);
+	void InstrumentChange(MODCHANNEL *pChn, UINT instr, bool bPorta = false, bool bUpdVol = true, bool bResetEnv = true);
 
 	// Channel Effects
 	void KeyOff(UINT nChn);


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