From 7200d88431b5ee4409fd17937f40190a749b53d0 Mon Sep 17 00:00:00 2001 From: "Jake.Stine" Date: Mon, 8 Dec 2008 18:54:25 +0000 Subject: [PATCH] Much to Guesseous distress, I have once again overlooked something small and obvious in my last commit. If I were using a table saw I'd be missing my arm at the elbow by now. git-svn-id: http://pcsx2-playground.googlecode.com/svn/trunk@404 a6443dda-0b58-4228-96e9-037be469359c --- plugins/spu2ghz/mixer.cpp | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/plugins/spu2ghz/mixer.cpp b/plugins/spu2ghz/mixer.cpp index beb6612af5..8cf815e6b1 100644 --- a/plugins/spu2ghz/mixer.cpp +++ b/plugins/spu2ghz/mixer.cpp @@ -813,10 +813,12 @@ static void __forceinline __fastcall ReadInputPV(V_Core& thiscore, s32& ValL,s32 #endif // Apply volumes: - ValL *= thiscore.InpL; - ValR *= thiscore.InpR; - ValL >>= 1; - ValR >>= 1; + ValL = ApplyVolume( ValL, thiscore.InpL ); + ValR = ApplyVolume( ValR, thiscore.InpR ); + + // These make XS2 intro too quiet. + //ValL >>= 1; + //ValR >>= 1; } @@ -1207,12 +1209,6 @@ void __fastcall Mix() Peak1 = max(Peak1,max(OutL,OutR)); #endif - // [Air] : Removed MulDiv here in favor of a more direct approach - // within the SndOut driver (which ends up having to apply its own - // master volume divisors anyway). - //ExtL=MulDiv(OutL,VolumeMultiplier,1<<6); - //ExtR=MulDiv(OutR,VolumeMultiplier,1<<6); - // Update spdif (called each sample) if(PlayMode&4) {