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

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

Revision: 1471
          http://sourceforge.net/p/modplug/code/1471
Author:   saga-games
Date:     2012-12-22 15:48:48 +0000 (Sat, 22 Dec 2012)
Log Message:
-----------
[Mod] Partly reverted Zxx behaviour changes from rev. 1465, so that we won't have 3 different Zxx behaviours in the end.

Modified Paths:
--------------
    trunk/OpenMPT/soundlib/Snd_fx.cpp
    trunk/OpenMPT/soundlib/Sndmix.cpp

Modified: trunk/OpenMPT/soundlib/Snd_fx.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Snd_fx.cpp	2012-12-21 23:28:12 UTC (rev 1470)
+++ trunk/OpenMPT/soundlib/Snd_fx.cpp	2012-12-22 15:48:48 UTC (rev 1471)
@@ -1951,15 +1951,6 @@
 		if((GetType() == MOD_TYPE_S3M) && ChnSettings[nChn].dwFlags[CHN_MUTE])	// not even effects are processed on muted S3M channels
 			continue;
 
-		if(cmd == CMD_MIDI && m_SongFlags[SONG_FIRSTTICK])
-		{
-			// MIDI macro (Smooth MIDI macros are processed later, when we know all the volumes, panning, etc.)
-			if(param < 0x80)
-				ProcessMIDIMacro(nChn, false, m_MidiCfg.szMidiSFXExt[pChn->nActiveMacro], param);
-			else
-				ProcessMIDIMacro(nChn, false, m_MidiCfg.szMidiZXXExt[(param & 0x7F)], 0);
-		}
-
 		// Volume Column Effect (except volume & panning)
 		/*	A few notes, paraphrased from ITTECH.TXT by Storlek (creator of schismtracker):
 			Ex/Fx/Gx are shared with Exx/Fxx/Gxx; Ex/Fx are 4x the 'normal' slide value

Modified: trunk/OpenMPT/soundlib/Sndmix.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Sndmix.cpp	2012-12-21 23:28:12 UTC (rev 1470)
+++ trunk/OpenMPT/soundlib/Sndmix.cpp	2012-12-22 15:48:48 UTC (rev 1471)
@@ -2406,12 +2406,12 @@
 		//ProcessMIDIMacro(nChn, false, m_MidiCfg.szMidiGlb[MIDIOUT_PAN]);
 		//ProcessMIDIMacro(nChn, false, m_MidiCfg.szMidiGlb[MIDIOUT_VOLUME]);
 
-		if(pChn->rowCommand.command == CMD_SMOOTHMIDI)
+		if((pChn->rowCommand.command == CMD_MIDI && m_SongFlags[SONG_FIRSTTICK]) || pChn->rowCommand.command == CMD_SMOOTHMIDI)
 		{
 			if(pChn->rowCommand.param < 0x80)
-				ProcessMIDIMacro(nChn, true, m_MidiCfg.szMidiSFXExt[pChn->nActiveMacro], pChn->rowCommand.param);
+				ProcessMIDIMacro(nChn, (pChn->rowCommand.command == CMD_SMOOTHMIDI), m_MidiCfg.szMidiSFXExt[pChn->nActiveMacro], pChn->rowCommand.param);
 			else
-				ProcessMIDIMacro(nChn, true, m_MidiCfg.szMidiZXXExt[(pChn->rowCommand.param & 0x7F)], 0);
+				ProcessMIDIMacro(nChn, (pChn->rowCommand.command == CMD_SMOOTHMIDI), m_MidiCfg.szMidiZXXExt[(pChn->rowCommand.param & 0x7F)], 0);
 		}
 	}
 }

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