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

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

Revision: 1690
          http://sourceforge.net/p/modplug/code/1690
Author:   manxorist
Date:     2013-03-25 20:55:55 +0000 (Mon, 25 Mar 2013)
Log Message:
-----------
[Ref] Remove unused CSoundFile::gnCPUUsage.

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

Modified: trunk/OpenMPT/soundlib/Sndfile.h
===================================================================
--- trunk/OpenMPT/soundlib/Sndfile.h	2013-03-25 20:31:52 UTC (rev 1689)
+++ trunk/OpenMPT/soundlib/Sndfile.h	2013-03-25 20:55:55 UTC (rev 1690)
@@ -247,7 +247,6 @@
 	static double gdWFIRCutoff;
 	static BYTE gbWFIRType;
 	static UINT gnVolumeRampUpSamples, gnVolumeRampUpSamplesTarget, gnVolumeRampDownSamples;
-	static UINT gnCPUUsage;
 	static LPSNDMIXHOOKPROC gpSndMixHook;
 	static PMIXPLUGINCREATEPROC gpMixPluginCreateProc;
 	static uint8 s_DefaultPlugVolumeHandling;

Modified: trunk/OpenMPT/soundlib/Sndmix.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Sndmix.cpp	2013-03-25 20:31:52 UTC (rev 1689)
+++ trunk/OpenMPT/soundlib/Sndmix.cpp	2013-03-25 20:55:55 UTC (rev 1690)
@@ -49,7 +49,6 @@
 UINT CSoundFile::gnVolumeRampUpSamples = 42;		//default value
 UINT CSoundFile::gnVolumeRampUpSamplesTarget = 42;		//default value
 UINT CSoundFile::gnVolumeRampDownSamples = 42;		//default value
-UINT CSoundFile::gnCPUUsage = 0;
 LPSNDMIXHOOKPROC CSoundFile::gpSndMixHook = NULL;
 PMIXPLUGINCREATEPROC CSoundFile::gpMixPluginCreateProc = NULL;
 LONG gnDryROfsVol = 0;
@@ -174,7 +173,6 @@
 #ifndef NO_REVERB
 	gnRvbROfsVol = gnRvbLOfsVol = 0;
 #endif
-	if (bReset) gnCPUUsage = 0;
 #ifndef NO_REVERB
 	InitializeReverb(bReset);
 #endif
@@ -377,8 +375,7 @@
 		// Noise Shaping
 		if (gnBitsPerSample <= 16)
 		{
-			if ((gdwSoundSetup & SNDMIX_HQRESAMPLER)
-			 && ((gnCPUUsage < 25) || (gdwSoundSetup & SNDMIX_DIRECTTODISK)))
+			if (gdwSoundSetup & SNDMIX_HQRESAMPLER)
 				X86_Dither(MixSoundBuffer, lTotalSampleCount, gnBitsPerSample);
 		}
 
@@ -1607,9 +1604,9 @@
 		LONG nLeftDelta = ((pChn->nNewLeftVol - pChn->nLeftVol) << VOLUMERAMPPRECISION);
 //		if ((gdwSoundSetup & SNDMIX_DIRECTTODISK)
 //			|| ((gdwSysInfo & (SYSMIX_ENABLEMMX|SYSMIX_FASTCPU))
-//			&& (gdwSoundSetup & SNDMIX_HQRESAMPLER) && (gnCPUUsage <= 50)))
+//			&& (gdwSoundSetup & SNDMIX_HQRESAMPLER)))
 		if((gdwSoundSetup & SNDMIX_DIRECTTODISK)
-			|| ((gdwSysInfo & (SYSMIX_ENABLEMMX | SYSMIX_FASTCPU)) && (gdwSoundSetup & SNDMIX_HQRESAMPLER) && (gnCPUUsage <= 50) && !enableCustomRamp))
+			|| ((gdwSysInfo & (SYSMIX_ENABLEMMX | SYSMIX_FASTCPU)) && (gdwSoundSetup & SNDMIX_HQRESAMPLER) && !enableCustomRamp))
 		{
 			if((pChn->nRightVol | pChn->nLeftVol) && (pChn->nNewRightVol | pChn->nNewLeftVol) && !pChn->dwFlags[CHN_FASTVOLRAMP])
 			{
@@ -2042,7 +2039,7 @@
 				{
 					pChn->dwFlags.set(CHN_NOIDO);
 				} else
-				if ((gdwSoundSetup & SNDMIX_HQRESAMPLER) && ((gnCPUUsage < 80) || (gdwSoundSetup & SNDMIX_DIRECTTODISK) || (m_nMixChannels < 8)))
+				if (gdwSoundSetup & SNDMIX_HQRESAMPLER)
 				{
 					if ((!(gdwSoundSetup & SNDMIX_DIRECTTODISK)) && (!(gdwSoundSetup & SNDMIX_ULTRAHQSRCMODE)))
 					{
@@ -2071,8 +2068,7 @@
 				} else
 				{
 					if ((pChn->nInc >= 0x14000)
-					|| ((pChn->nInc >= 0xFF00) && ((pChn->nInc < 0x10100) || (gdwSysInfo & SYSMIX_SLOWCPU)))
-					|| ((gnCPUUsage > 80) && (pChn->nNewLeftVol < 0x100) && (pChn->nNewRightVol < 0x100)))
+					|| ((pChn->nInc >= 0xFF00) && ((pChn->nInc < 0x10100) || (gdwSysInfo & SYSMIX_SLOWCPU))))
 						pChn->dwFlags.set(CHN_NOIDO);
 				}
 			}

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