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

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

Revision: 3611
          http://sourceforge.net/p/modplug/code/3611
Author:   manxorist
Date:     2014-02-01 15:05:58 +0000 (Sat, 01 Feb 2014)
Log Message:
-----------
[Ref] m_bChannelMuteTogglePending is not and will not be used in libopenmpt. Guard it with #ifdef MODPLUG_TRACKER.

Modified Paths:
--------------
    trunk/OpenMPT/soundlib/Sndfile.cpp
    trunk/OpenMPT/soundlib/Sndfile.h

Modified: trunk/OpenMPT/soundlib/Sndfile.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Sndfile.cpp	2014-02-01 14:56:59 UTC (rev 3610)
+++ trunk/OpenMPT/soundlib/Sndfile.cpp	2014-02-01 15:05:58 UTC (rev 3611)
@@ -615,7 +615,9 @@
 
 	m_dwLastSavedWithVersion=0;
 	m_dwCreatedWithVersion=0;
+#ifdef MODPLUG_TRACKER
 	m_bChannelMuteTogglePending.reset();
+#endif // MODPLUG_TRACKER
 
 	MemsetZero(ChnMix);
 	MemsetZero(Instruments);
@@ -1309,6 +1311,8 @@
 }
 
 
+#ifdef MODPLUG_TRACKER
+
 void CSoundFile::PatternTranstionChnSolo(const CHANNELINDEX chnIndex)
 //-------------------------------------------------------------------
 {
@@ -1332,7 +1336,9 @@
 	}
 }
 
+#endif // MODPLUG_TRACKER
 
+
 void CSoundFile::LoopPattern(PATTERNINDEX nPat, ROWINDEX nRow)
 //------------------------------------------------------------
 {
@@ -1462,7 +1468,10 @@
 		GetpModDoc()->Record2Channel(nChn, false);
 	}
 #endif // MODPLUG_TRACKER
+
+#ifdef MODPLUG_TRACKER
 	m_bChannelMuteTogglePending[nChn] = false;
+#endif // MODPLUG_TRACKER
 
 	return false;
 }

Modified: trunk/OpenMPT/soundlib/Sndfile.h
===================================================================
--- trunk/OpenMPT/soundlib/Sndfile.h	2014-02-01 14:56:59 UTC (rev 3610)
+++ trunk/OpenMPT/soundlib/Sndfile.h	2014-02-01 15:05:58 UTC (rev 3611)
@@ -425,7 +425,9 @@
 	MIDIMacroConfig m_MidiCfg;							// MIDI Macro config table
 	SNDMIXPLUGIN m_MixPlugins[MAX_MIXPLUGINS];			// Mix plugins
 	char m_szNames[MAX_SAMPLES][MAX_SAMPLENAME];		// Song and sample names
+#ifdef MODPLUG_TRACKER
 	std::bitset<MAX_BASECHANNELS> m_bChannelMuteTogglePending;
+#endif // MODPLUG_TRACKER
 
 	uint32 m_dwCreatedWithVersion;
 	uint32 m_dwLastSavedWithVersion;
@@ -533,8 +535,11 @@
 	const CModSpecifications& GetModSpecifications() const {return *m_pModSpecs;}
 	static const CModSpecifications& GetModSpecifications(const MODTYPE type);
 
+#ifdef MODPLUG_TRACKER
 	void PatternTranstionChnSolo(const CHANNELINDEX chnIndex);
 	void PatternTransitionChnUnmuteAll();
+#endif // MODPLUG_TRACKER
+
 	double GetCurrentBPM() const;
 	void DontLoopPattern(PATTERNINDEX nPat, ROWINDEX nRow = 0);		//rewbs.playSongFromCursor
 	CHANNELINDEX GetMixStat() const { return m_nMixStat; }

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