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

[<man...@us...>]

Revision: 2187
          http://sourceforge.net/p/modplug/code/2187
Author:   manxorist
Date:     2013-05-25 10:40:31 +0000 (Sat, 25 May 2013)
Log Message:
-----------
[Ref] CMIDIMapper should be inside #ifdef MODPLUG_TRACKER.

Modified Paths:
--------------
    trunk/OpenMPT/mptrack/test/test.cpp
    trunk/OpenMPT/soundlib/Load_it.cpp

Modified: trunk/OpenMPT/mptrack/test/test.cpp
===================================================================
--- trunk/OpenMPT/mptrack/test/test.cpp	2013-05-25 09:20:49 UTC (rev 2186)
+++ trunk/OpenMPT/mptrack/test/test.cpp	2013-05-25 10:40:31 UTC (rev 2187)
@@ -786,6 +786,7 @@
 	VERIFY_EQUAL_NONCONT(plug.IsMasterEffect(), true);
 	VERIFY_EQUAL_NONCONT(plug.GetGain(), 11);
 
+#ifdef MODPLUG_TRACKER
 	// MIDI Mapping
 	VERIFY_EQUAL_NONCONT(sndFile.GetMIDIMapper().GetCount(), 1);
 	const CMIDIMappingDirective &mapping = sndFile.GetMIDIMapper().GetDirective(0);
@@ -798,6 +799,7 @@
 	VERIFY_EQUAL_NONCONT(mapping.GetParamIndex(), 0);
 	VERIFY_EQUAL_NONCONT(mapping.GetEvent(), MIDIEvents::evControllerChange);
 	VERIFY_EQUAL_NONCONT(mapping.GetController(), MIDIEvents::MIDICC_ModulationWheel_Coarse);
+#endif
 
 }
 

Modified: trunk/OpenMPT/soundlib/Load_it.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Load_it.cpp	2013-05-25 09:20:49 UTC (rev 2186)
+++ trunk/OpenMPT/soundlib/Load_it.cpp	2013-05-25 10:40:31 UTC (rev 2187)
@@ -2039,6 +2039,7 @@
 		fwrite(&m_ModFlags, 1, size, f);
 	}
 
+#ifdef MODPLUG_TRACKER
 	//MIMA, MIDI mapping directives
 	if(GetMIDIMapper().GetCount() > 0)
 	{
@@ -2056,6 +2057,7 @@
 			GetMIDIMapper().Serialize(f);
 		}
 	}
+#endif
 
 
 	return;

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