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

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

Revision: 4061
          http://sourceforge.net/p/modplug/code/4061
Author:   manxorist
Date:     2014-05-24 07:59:34 +0000 (Sat, 24 May 2014)
Log Message:
-----------
[Ref] Tiny cleanups.

Modified Paths:
--------------
    trunk/OpenMPT/soundlib/Dither.cpp
    trunk/OpenMPT/soundlib/MixerLoops.h
    trunk/OpenMPT/soundlib/Mmcmp.cpp

Modified: trunk/OpenMPT/soundlib/Dither.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Dither.cpp	2014-05-23 16:56:27 UTC (rev 4060)
+++ trunk/OpenMPT/soundlib/Dither.cpp	2014-05-24 07:59:34 UTC (rev 4061)
@@ -41,8 +41,8 @@
 
 #ifdef ENABLE_X86
 
-void X86_Dither(int *pBuffer, UINT nSamples, UINT nBits, DitherModPlugState *state)
-//---------------------------------------------------------------------------------
+void X86_Dither(int *pBuffer, uint32 nSamples, uint32 nBits, DitherModPlugState *state)
+//-------------------------------------------------------------------------------------
 {
 	if(nBits + MIXING_ATTENUATION + 1 >= 32) //if(nBits>16)
 	{
@@ -99,11 +99,11 @@
 	a ^= 0x10204080u;
 	a += 0x78649E7Du + (b * 4);
 	b += ((a << 16 ) | (a >> 16)) * 5;
-	return (int32)b;
+	return static_cast<int32>(b);
 }
 
-static void C_Dither(int *pBuffer, std::size_t count, UINT nBits, DitherModPlugState *state)
-//------------------------------------------------------------------------------------------
+static void C_Dither(int *pBuffer, std::size_t count, uint32 nBits, DitherModPlugState *state)
+//--------------------------------------------------------------------------------------------
 {
 	if(nBits + MIXING_ATTENUATION + 1 >= 32) //if(nBits>16)
 	{
@@ -127,8 +127,8 @@
 
 }
 
-static void Dither_ModPlug(int *pBuffer, std::size_t count, std::size_t channels, UINT nBits, DitherModPlugState &state)
-//----------------------------------------------------------------------------------------------------------------------
+static void Dither_ModPlug(int *pBuffer, std::size_t count, std::size_t channels, uint32 nBits, DitherModPlugState &state)
+//------------------------------------------------------------------------------------------------------------------------
 {
 	#ifdef ENABLE_X86
 		X86_Dither(pBuffer, count * channels, nBits, &state);

Modified: trunk/OpenMPT/soundlib/MixerLoops.h
===================================================================
--- trunk/OpenMPT/soundlib/MixerLoops.h	2014-05-23 16:56:27 UTC (rev 4060)
+++ trunk/OpenMPT/soundlib/MixerLoops.h	2014-05-24 07:59:34 UTC (rev 4061)
@@ -27,7 +27,7 @@
 void ApplyGain(float *outputBuffer, float * const *outputBuffers, std::size_t offset, std::size_t channels, std::size_t countChunk, float gainFactor);
 #endif // !MODPLUG_TRACKER
 
-void InitMixBuffer(mixsample_t *pBuffer, UINT nSamples);
+void InitMixBuffer(mixsample_t *pBuffer, uint32 nSamples);
 void InterleaveFrontRear(mixsample_t *pFrontBuf, mixsample_t *pRearBuf, uint32 nFrames);
 void MonoFromStereo(mixsample_t *pMixBuf, uint32 nSamples);
 

Modified: trunk/OpenMPT/soundlib/Mmcmp.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Mmcmp.cpp	2014-05-23 16:56:27 UTC (rev 4060)
+++ trunk/OpenMPT/soundlib/Mmcmp.cpp	2014-05-24 07:59:34 UTC (rev 4061)
@@ -222,7 +222,7 @@
 		uint32 memPos = blkPos + sizeof(MMCMPBLOCK) + blk.sub_blk * sizeof(MMCMPSUBBLOCK);
 
 #ifdef MMCMP_LOG
-		Log("block %d: flags=%04X sub_blocks=%d", nBlock, (UINT)pblk->flags, (UINT)pblk->sub_blk);
+		Log("block %d: flags=%04X sub_blocks=%d", nBlock, (uint32)pblk->flags, (uint32)pblk->sub_blk);
 		Log(" pksize=%d unpksize=%d", pblk->pk_size, pblk->unpk_size);
 		Log(" tt_entries=%d num_bits=%d\n", pblk->tt_entries, pblk->num_bits);
 #endif

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