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

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

Revision: 2129
          http://sourceforge.net/p/modplug/code/2129
Author:   manxorist
Date:     2013-05-19 15:46:40 +0000 (Sun, 19 May 2013)
Log Message:
-----------
[Ref] Put WriteTuningMap and WriteTuningCollection inside #ifndef MODPLUG_NO_FILESAVE.
[Ref] Trivial unused parameter warning fixes.

Modified Paths:
--------------
    trunk/OpenMPT/soundlib/Load_it.cpp
    trunk/OpenMPT/soundlib/Load_itp.cpp

Modified: trunk/OpenMPT/soundlib/Load_it.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Load_it.cpp	2013-05-19 15:40:19 UTC (rev 2128)
+++ trunk/OpenMPT/soundlib/Load_it.cpp	2013-05-19 15:46:40 UTC (rev 2129)
@@ -48,6 +48,8 @@
 */
 
 
+#ifndef MODPLUG_NO_FILESAVE
+
 static bool AreNonDefaultTuningsUsed(CSoundFile& sf)
 //--------------------------------------------------
 {
@@ -60,7 +62,6 @@
 	return false;
 }
 
-static void ReadTuningCollection(istream& iStrm, CTuningCollection& tc, const size_t) {tc.Deserialize(iStrm);}
 static void WriteTuningCollection(ostream& oStrm, const CTuningCollection& tc) {tc.Serialize(oStrm);}
 
 static void WriteTuningMap(ostream& oStrm, const CSoundFile& sf)
@@ -120,7 +121,11 @@
 	}
 }
 
+#endif // MODPLUG_NO_FILESAVE
 
+
+static void ReadTuningCollection(istream& iStrm, CTuningCollection& tc, const size_t) {tc.Deserialize(iStrm);}
+
 template<class TUNNUMTYPE, class STRSIZETYPE>
 static bool ReadTuningMapTemplate(istream& iStrm, map<uint16, string>& shortToTNameMap, const size_t maxNum = 500)
 //----------------------------------------------------------------------------------------------------------------

Modified: trunk/OpenMPT/soundlib/Load_itp.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Load_itp.cpp	2013-05-19 15:40:19 UTC (rev 2128)
+++ trunk/OpenMPT/soundlib/Load_itp.cpp	2013-05-19 15:46:40 UTC (rev 2129)
@@ -39,9 +39,10 @@
 //-------------------------------------------------------------------------
 {
 #ifndef MODPLUG_TRACKER
+	UNREFERENCED_PARAMETER(file);
+	UNREFERENCED_PARAMETER(loadFlags);
 	return false;
-#endif
-#ifdef MODPLUG_TRACKER
+#else // MODPLUG_TRACKER
 	
 	uint32 version;
 	FileReader::off_t size;

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