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

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

Revision: 1948
          http://sourceforge.net/p/modplug/code/1948
Author:   manxorist
Date:     2013-04-22 22:16:20 +0000 (Mon, 22 Apr 2013)
Log Message:
-----------
[Ref] Make midi and .itp support #ifdef MODPLUG_TRACKER

Modified Paths:
--------------
    trunk/OpenMPT/soundlib/Dlsbank.cpp
    trunk/OpenMPT/soundlib/Dlsbank.h
    trunk/OpenMPT/soundlib/Load_itp.cpp
    trunk/OpenMPT/soundlib/Load_mid.cpp
    trunk/OpenMPT/soundlib/Tables.cpp

Modified: trunk/OpenMPT/soundlib/Dlsbank.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Dlsbank.cpp	2013-04-22 22:11:51 UTC (rev 1947)
+++ trunk/OpenMPT/soundlib/Dlsbank.cpp	2013-04-22 22:16:20 UTC (rev 1948)
@@ -11,13 +11,17 @@
 
 #include "stdafx.h"
 #include "sndfile.h"
+#ifdef MODPLUG_TRACKER
 #include "../mptrack/mptrack.h"
+#endif
 #include "dlsbank.h"
 #include "Wav.h"
 #include "../common/StringFixer.h"
 #include "../soundlib/FileReader.h"
 #include "SampleIO.h"
 
+#ifdef MODPLUG_TRACKER
+
 //#define DLSBANK_LOG
 //#define DLSINSTR_LOG
 
@@ -1974,4 +1978,7 @@
 		}
 	}
 	return nullptr;
-}
\ No newline at end of file
+}
+
+
+#endif // MODPLUG_TRACKER

Modified: trunk/OpenMPT/soundlib/Dlsbank.h
===================================================================
--- trunk/OpenMPT/soundlib/Dlsbank.h	2013-04-22 22:11:51 UTC (rev 1947)
+++ trunk/OpenMPT/soundlib/Dlsbank.h	2013-04-22 22:16:20 UTC (rev 1948)
@@ -88,6 +88,10 @@
 
 #pragma pack(pop)
 
+
+#ifdef MODPLUG_TRACKER
+
+
 #define SOUNDBANK_TYPE_INVALID	0
 #define SOUNDBANK_TYPE_DLS		0x01
 #define SOUNDBANK_TYPE_SF2		0x02
@@ -158,3 +162,7 @@
 	static LONG DLS32BitRelativeLinearToGain(LONG lGain);		// 0dB = 0x10000
 	static LONG DLSMidiVolumeToLinear(UINT nMidiVolume);		// [0-127] -> [0-0x10000]
 };
+
+
+#endif // MODPLUG_TRACKER
+

Modified: trunk/OpenMPT/soundlib/Load_itp.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Load_itp.cpp	2013-04-22 22:11:51 UTC (rev 1947)
+++ trunk/OpenMPT/soundlib/Load_itp.cpp	2013-04-22 22:16:20 UTC (rev 1948)
@@ -14,7 +14,9 @@
 
 
 #include "stdafx.h"
+#ifdef MODPLUG_TRACKER
 #include "../mptrack/mptrack.h"
+#endif
 #include "../common/version.h"
 #include "Loaders.h"
 #include "ITTools.h"
@@ -36,6 +38,11 @@
 bool CSoundFile::ReadITProject(FileReader &file)
 //----------------------------------------------
 {
+#ifndef MODPLUG_TRACKER
+	return false;
+#endif
+#ifdef MODPLUG_TRACKER
+	
 	uint32 version;
 	FileReader::off_t size;
 
@@ -252,6 +259,7 @@
 	UpgradeModFlags();
 
 	return true;
+#endif
 }
 
 

Modified: trunk/OpenMPT/soundlib/Load_mid.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Load_mid.cpp	2013-04-22 22:11:51 UTC (rev 1947)
+++ trunk/OpenMPT/soundlib/Load_mid.cpp	2013-04-22 22:16:20 UTC (rev 1948)
@@ -17,6 +17,7 @@
 #include "../mptrack/TrackerSettings.h"
 #endif // MODPLUG_TRACKER
 
+#ifdef MODPLUG_TRACKER
 
 #pragma warning(disable:4244)
 //#define MIDI_LOG
@@ -1207,4 +1208,11 @@
 	return true;
 }
 
+#else // !MODPLUG_TRACKER
 
+bool CSoundFile::ReadMID(const BYTE *lpStream, DWORD dwMemLength)
+{
+	return false;
+}
+
+#endif

Modified: trunk/OpenMPT/soundlib/Tables.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Tables.cpp	2013-04-22 22:11:51 UTC (rev 1947)
+++ trunk/OpenMPT/soundlib/Tables.cpp	2013-04-22 22:16:20 UTC (rev 1948)
@@ -36,7 +36,9 @@
 	{ MOD_TYPE_S3M,		"ScreamTracker III",		"s3m" },
 	{ MOD_TYPE_XM,		"FastTracker II",			"xm" },
 	{ MOD_TYPE_IT,		"Impulse Tracker",			"it" },
+#ifdef MODPLUG_TRACKER
 	{ MOD_TYPE_IT,		"Impulse Tracker Project",	"itp" },
+#endif
 	{ MOD_TYPE_MPT,		"OpenMPT",					"mptm" },
 	{ MOD_TYPE_STM,		"ScreamTracker II",			"stm" },
 	{ MOD_TYPE_MOD,		"NoiseTracker",				"nst" },
@@ -84,9 +86,11 @@
 {
 	// Other stuff
 	{ MOD_TYPE_WAV,		"Wave",						"wav" },
+#ifdef MODPLUG_TRACKER
 	{ MOD_TYPE_MID,		"MIDI",						"mid" },
 	{ MOD_TYPE_MID,		"MIDI",						"rmi" },
 	{ MOD_TYPE_MID,		"MIDI",						"smf" },
+#endif
 };
 
 

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