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

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

Revision: 3838
          http://sourceforge.net/p/modplug/code/3838
Author:   manxorist
Date:     2014-03-07 11:54:51 +0000 (Fri, 07 Mar 2014)
Log Message:
-----------
[Ref] Kill ULONG and SHORT win32 types in soundlib/ .

Modified Paths:
--------------
    trunk/OpenMPT/common/typedefs.h
    trunk/OpenMPT/soundlib/Dlsbank.cpp
    trunk/OpenMPT/soundlib/Dlsbank.h
    trunk/OpenMPT/soundlib/Load_med.cpp
    trunk/OpenMPT/soundlib/SampleFormats.cpp
    trunk/OpenMPT/soundlib/plugins/DmoToVst.cpp

Modified: trunk/OpenMPT/common/typedefs.h
===================================================================
--- trunk/OpenMPT/common/typedefs.h	2014-03-07 11:43:17 UTC (rev 3837)
+++ trunk/OpenMPT/common/typedefs.h	2014-03-07 11:54:51 UTC (rev 3838)
@@ -411,10 +411,8 @@
 typedef std::uint16_t WORD;
 typedef std::uint32_t DWORD;
 typedef std::int8_t   CHAR;
-typedef std::int16_t  SHORT;
 typedef std::int32_t  LONG;
 typedef std::uint32_t UINT;
-typedef std::uint32_t ULONG;
 typedef BYTE *        LPBYTE;
 
 // for BOOL

Modified: trunk/OpenMPT/soundlib/Dlsbank.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Dlsbank.cpp	2014-03-07 11:43:17 UTC (rev 3837)
+++ trunk/OpenMPT/soundlib/Dlsbank.cpp	2014-03-07 11:54:51 UTC (rev 3838)
@@ -263,7 +263,7 @@
 	DWORD len;
 	DWORD cbSize;
 	WORD usUnityNote;
-	SHORT sFineTune;
+	int16 sFineTune;
 	LONG lAttenuation;
 	DWORD fulOptions;
 	DWORD cSampleLoops;
@@ -1488,8 +1488,8 @@
 
 
 // returns 12*128*(log2(freq/8363)+midiftune/100)
-static int DlsFreqToTranspose(ULONG freq, int nMidiFTune)
-//-------------------------------------------------------
+static int DlsFreqToTranspose(uint32 freq, int nMidiFTune)
+//--------------------------------------------------------
 {
 #ifdef ENABLE_X86
 	const float _f1_8363 = 1.0f / 8363.0f;

Modified: trunk/OpenMPT/soundlib/Dlsbank.h
===================================================================
--- trunk/OpenMPT/soundlib/Dlsbank.h	2014-03-07 11:43:17 UTC (rev 3837)
+++ trunk/OpenMPT/soundlib/Dlsbank.h	2014-03-07 11:54:51 UTC (rev 3838)
@@ -37,7 +37,7 @@
 	WORD uPercEnv;
 	WORD usVolume;		// 0..256
 	WORD fuOptions;	// flags + key group
-	SHORT sFineTune;	// 1..100
+	int16 sFineTune;	// 1..100
 	BYTE uKeyMin;
 	BYTE uKeyMax;
 	BYTE uUnityNote;

Modified: trunk/OpenMPT/soundlib/Load_med.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Load_med.cpp	2014-03-07 11:43:17 UTC (rev 3837)
+++ trunk/OpenMPT/soundlib/Load_med.cpp	2014-03-07 11:54:51 UTC (rev 3838)
@@ -121,8 +121,8 @@
 		// 3: g723_24
 	BYTE commonflags;	// flags common to all packtypes (none defined so far)
 	BYTE packerflags;	// flags for the specific packtype
-	ULONG leftchlen;	// packed length of left channel in bytes
-	ULONG rightchlen;	// packed length of right channel in bytes (ONLY PRESENT IN STEREO SAMPLES)
+	uint32 leftchlen;	// packed length of left channel in bytes
+	uint32 rightchlen;	// packed length of right channel in bytes (ONLY PRESENT IN STEREO SAMPLES)
 	BYTE SampleData[1];	// Sample Data
 } MMDSAMPLEHEADER;
 
@@ -228,7 +228,7 @@
 STATIC_ASSERT(sizeof(MMD1BLOCKINFO) == 36);
 
 
-// A set of play sequences is stored as an array of ULONG files offsets
+// A set of play sequences is stored as an array of uint32 files offsets
 // Each offset points to the play sequence itself.
 typedef struct PACKED tagMMD2PLAYSEQ
 {

Modified: trunk/OpenMPT/soundlib/SampleFormats.cpp
===================================================================
--- trunk/OpenMPT/soundlib/SampleFormats.cpp	2014-03-07 11:43:17 UTC (rev 3837)
+++ trunk/OpenMPT/soundlib/SampleFormats.cpp	2014-03-07 11:54:51 UTC (rev 3838)
@@ -549,14 +549,14 @@
 	DWORD loopend;			// end loop position in the wavesample
 	WORD freq;				// Rate at which the wavesample has been sampled
 	DWORD low_freq, high_freq, root_freq;	// check note.h for the correspondance.
-	SHORT finetune;			// fine tune. -512 to +512, EXCLUDING 0 cause it is a multiplier. 512 is one octave off, and 1 is a neutral value
+	int16 finetune;			// fine tune. -512 to +512, EXCLUDING 0 cause it is a multiplier. 512 is one octave off, and 1 is a neutral value
 	BYTE balance;			// Balance: 0-15. 0=full left, 15 = full right
 	BYTE env_rate[6];		// attack rates
 	BYTE env_volume[6];		// attack volumes
 	BYTE tremolo_sweep, tremolo_rate, tremolo_depth;
 	BYTE vibrato_sweep, vibrato_rate, vibrato_depth;
 	BYTE flags;
-	SHORT scale_frequency;
+	int16 scale_frequency;
 	WORD scale_factor;
 	BYTE reserved[36];
 } GF1SAMPLEHEADER;

Modified: trunk/OpenMPT/soundlib/plugins/DmoToVst.cpp
===================================================================
--- trunk/OpenMPT/soundlib/plugins/DmoToVst.cpp	2014-03-07 11:43:17 UTC (rev 3837)
+++ trunk/OpenMPT/soundlib/plugins/DmoToVst.cpp	2014-03-07 11:54:51 UTC (rev 3838)
@@ -30,7 +30,7 @@
 	IMediaObjectInPlace *m_pMediaProcess;
 	IMediaParamInfo *m_pParamInfo;
 	IMediaParams *m_pMediaParams;
-	ULONG m_nSamplesPerSec;
+	uint32 m_nSamplesPerSec;
 	AEffect m_Effect;
 	REFERENCE_TIME m_DataTime;
 	int16 *m_pMixBuffer;

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