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

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

Revision: 5212
          http://sourceforge.net/p/modplug/code/5212
Author:   manxorist
Date:     2015-05-30 12:29:40 +0000 (Sat, 30 May 2015)
Log Message:
-----------
[Ref] There are only 5 remaining places which still use type LONG in libopenmpt. Convert them to int32 and remove the typedef.

Modified Paths:
--------------
    trunk/OpenMPT/common/typedefs.h
    trunk/OpenMPT/soundlib/Load_med.cpp
    trunk/OpenMPT/soundlib/Snd_fx.cpp
    trunk/OpenMPT/soundlib/Sndfile.h
    trunk/OpenMPT/soundlib/Sndmix.cpp

Modified: trunk/OpenMPT/common/typedefs.h
===================================================================
--- trunk/OpenMPT/common/typedefs.h	2015-05-30 12:19:49 UTC (rev 5211)
+++ trunk/OpenMPT/common/typedefs.h	2015-05-30 12:29:40 UTC (rev 5212)
@@ -540,7 +540,6 @@
 typedef uint8  BYTE;
 typedef uint16 WORD;
 typedef uint32 DWORD;
-typedef int32  LONG;
 typedef uint32 UINT;
 } } // namespace mpt::Legacy
 using namespace mpt::Legacy;

Modified: trunk/OpenMPT/soundlib/Load_med.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Load_med.cpp	2015-05-30 12:19:49 UTC (rev 5211)
+++ trunk/OpenMPT/soundlib/Load_med.cpp	2015-05-30 12:29:40 UTC (rev 5212)
@@ -163,7 +163,7 @@
 	WORD numtracks;		// # of tracks (max 64)
 	WORD numpseqs;		// # of play sequences
 	DWORD trackpans;	// filepos of tracks pan values (BYTE array)
-	LONG flags3;		// 0x1:stereo_mix, 0x2:free_panning, 0x4:GM/XG compatibility
+	int32 flags3;		// 0x1:stereo_mix, 0x2:free_panning, 0x4:GM/XG compatibility
 	WORD voladj;		// vol_adjust (set to 100 if 0)
 	WORD channels;		// # of channels (4 if =0)
 	BYTE mix_echotype;	// 1:normal,2:xecho

Modified: trunk/OpenMPT/soundlib/Snd_fx.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Snd_fx.cpp	2015-05-30 12:19:49 UTC (rev 5211)
+++ trunk/OpenMPT/soundlib/Snd_fx.cpp	2015-05-30 12:29:40 UTC (rev 5212)
@@ -3931,7 +3931,7 @@
 void CSoundFile::ChannelVolSlide(ModChannel *pChn, ModCommand::PARAM param) const
 //-------------------------------------------------------------------------------
 {
-	LONG nChnSlide = 0;
+	int32 nChnSlide = 0;
 	if (param) pChn->nOldChnVolSlide = param; else param = pChn->nOldChnVolSlide;
 
 	if (((param & 0x0F) == 0x0F) && (param & 0xF0))
@@ -4863,8 +4863,8 @@
 }
 
 
-void CSoundFile::DoFreqSlide(ModChannel *pChn, LONG nFreqSlide) const
-//-------------------------------------------------------------------
+void CSoundFile::DoFreqSlide(ModChannel *pChn, int32 nFreqSlide) const
+//--------------------------------------------------------------------
 {
 	if(!pChn->nPeriod) return;
 	if(m_SongFlags[SONG_LINEARSLIDES] && GetType() != MOD_TYPE_XM)

Modified: trunk/OpenMPT/soundlib/Sndfile.h
===================================================================
--- trunk/OpenMPT/soundlib/Sndfile.h	2015-05-30 12:19:49 UTC (rev 5211)
+++ trunk/OpenMPT/soundlib/Sndfile.h	2015-05-30 12:29:40 UTC (rev 5212)
@@ -870,7 +870,7 @@
 
 	void SetupChannelFilter(ModChannel *pChn, bool bReset, int flt_modifier = 256) const;
 	// Low-Level effect processing
-	void DoFreqSlide(ModChannel *pChn, LONG nFreqSlide) const;
+	void DoFreqSlide(ModChannel *pChn, int32 nFreqSlide) const;
 	void UpdateTimeSignature();
 
 	uint32 GetNumTicksOnCurrentRow() const

Modified: trunk/OpenMPT/soundlib/Sndmix.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Sndmix.cpp	2015-05-30 12:19:49 UTC (rev 5211)
+++ trunk/OpenMPT/soundlib/Sndmix.cpp	2015-05-30 12:29:40 UTC (rev 5212)
@@ -2063,7 +2063,7 @@
 				int32 pan = pChn->nRealPan;
 				Limit(pan, 0, 256);
 
-				LONG realvol;
+				int32 realvol;
 				if (m_PlayConfig.getUseGlobalPreAmp())
 				{
 					realvol = (pChn->nRealVolume * kChnMasterVol) >> 7;

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