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

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

Revision: 3826
          http://sourceforge.net/p/modplug/code/3826
Author:   manxorist
Date:     2014-03-04 19:14:01 +0000 (Tue, 04 Mar 2014)
Log Message:
-----------
[Ref] Add missing #ifndef MODPLUG_NO_FILESAVE in tuningCollection.* .

Modified Paths:
--------------
    trunk/OpenMPT/soundlib/tuningCollection.cpp
    trunk/OpenMPT/soundlib/tuningcollection.h

Modified: trunk/OpenMPT/soundlib/tuningCollection.cpp
===================================================================
--- trunk/OpenMPT/soundlib/tuningCollection.cpp	2014-03-04 16:20:21 UTC (rev 3825)
+++ trunk/OpenMPT/soundlib/tuningCollection.cpp	2014-03-04 19:14:01 UTC (rev 3826)
@@ -119,6 +119,8 @@
 }
 
 
+#ifndef MODPLUG_NO_FILESAVE
+
 CTuningCollection::SERIALIZATION_RETURN_TYPE CTuningCollection::Serialize() const
 //-------------------------------------------------------------------------------
 {
@@ -149,7 +151,9 @@
 	return SERIALIZATION_SUCCESS;
 }
 
+#endif // MODPLUG_NO_FILESAVE
 
+
 CTuningCollection::SERIALIZATION_RETURN_TYPE CTuningCollection::Deserialize(std::istream& iStrm)
 //----------------------------------------------------------------------------------------------
 {

Modified: trunk/OpenMPT/soundlib/tuningcollection.h
===================================================================
--- trunk/OpenMPT/soundlib/tuningcollection.h	2014-03-04 16:20:21 UTC (rev 3825)
+++ trunk/OpenMPT/soundlib/tuningcollection.h	2014-03-04 19:14:01 UTC (rev 3826)
@@ -95,8 +95,10 @@
 
 	std::string GetName() const {return m_Name;}
 
+#ifndef MODPLUG_NO_FILESAVE
 	void SetSavefilePath(const mpt::PathString &psz) {m_SavefilePath = psz;}
 	mpt::PathString GetSaveFilePath() const {return m_SavefilePath;}
+#endif // MODPLUG_NO_FILESAVE
 
 	std::string GetVersionString() const {return Stringify(static_cast<int>(s_SerializationVersion));}
 
@@ -104,9 +106,11 @@
 
 	//Serialization/unserialisation
 	bool Serialize(std::ostream&) const;
+	bool Deserialize(std::istream&);
+#ifndef MODPLUG_NO_FILESAVE
 	bool Serialize() const;
-	bool Deserialize(std::istream&);
 	bool Deserialize();
+#endif // MODPLUG_NO_FILESAVE
 
 	//Transfer tuning pT from pTCsrc to pTCdest
 	static bool TransferTuning(CTuningCollection* pTCsrc, CTuningCollection* pTCdest, CTuning* pT);
@@ -125,7 +129,9 @@
 
 	//BEGIN: NONSERIALIZABLE DATA MEMBERS
 	TUNINGVECTOR m_DeletedTunings; //See Remove()-method for explanation of this.
+#ifndef MODPLUG_NO_FILESAVE
 	mpt::PathString m_SavefilePath;
+#endif // MODPLUG_NO_FILESAVE
 	//END: NONSERIALIZABLE DATA MEMBERS
 	
 //END: DATA MEMBERS

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