From b14881769a42ec074137cf518f591b08ccecabb2 Mon Sep 17 00:00:00 2001
From: ramapcsx2 <ramapcsx2@96395faa-99c1-11dd-bbfe-3dabce05a288>
Date: Mon, 13 Apr 2009 09:48:28 +0000
Subject: [PATCH] SPU2-X: Small cleanup and made it a bit faster.

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@968 96395faa-99c1-11dd-bbfe-3dabce05a288
---
 plugins/spu2-x/src/Mixer.cpp | 2 +-
 plugins/spu2-x/src/Spu2.cpp  | 5 +----
 plugins/spu2-x/src/Spu2.h    | 4 +++-
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/plugins/spu2-x/src/Mixer.cpp b/plugins/spu2-x/src/Mixer.cpp
index b02282827c..61598816c3 100644
--- a/plugins/spu2-x/src/Mixer.cpp
+++ b/plugins/spu2-x/src/Mixer.cpp
@@ -579,7 +579,7 @@ struct VoiceMixSet
 
 const VoiceMixSet VoiceMixSet::Empty( StereoOut32::Empty, StereoOut32::Empty );
 
-static void __fastcall MixCoreVoices( VoiceMixSet& dest, const uint coreidx )
+static __forceinline void MixCoreVoices( VoiceMixSet& dest, const uint coreidx )
 {
 	V_Core& thiscore( Cores[coreidx] );
 
diff --git a/plugins/spu2-x/src/Spu2.cpp b/plugins/spu2-x/src/Spu2.cpp
index 563179752e..cccd18f8ce 100644
--- a/plugins/spu2-x/src/Spu2.cpp
+++ b/plugins/spu2-x/src/Spu2.cpp
@@ -42,7 +42,6 @@ void (* dma7callback)();
 
 short *spu2regs;
 short *_spu2mem;
-s32 uTicks;
 
 u8 callirq;
 
@@ -61,8 +60,6 @@ bool hasPtr=false;
 
 int PlayMode;
 
-s16 attrhack[2]={0,0};
-
 #ifdef _MSC_VER
 HINSTANCE hInstance;
 CRITICAL_SECTION threadSync;
@@ -376,7 +373,7 @@ static __forceinline void RestoreMMXRegs()
 #endif
 }
 
-void __fastcall TimeUpdate(u32 cClocks)
+__forceinline void TimeUpdate(u32 cClocks)
 {
 	u32 dClocks = cClocks-lClocks;
 
diff --git a/plugins/spu2-x/src/Spu2.h b/plugins/spu2-x/src/Spu2.h
index 374ff59d37..9d3bcaf70c 100644
--- a/plugins/spu2-x/src/Spu2.h
+++ b/plugins/spu2-x/src/Spu2.h
@@ -97,7 +97,9 @@ EXPORT_C_(s32)  SPU2test();
 
 #include "Spu2replay.h"
 
+#ifdef SPU2X_DEVBUILD
 #define SPU2_LOG
+#endif
 
 #include "Debug.h"
 
@@ -177,7 +179,7 @@ extern bool hasPtr;
 
 extern void SPU2writeLog( const char* action, u32 rmem, u16 value );
 
-extern void __fastcall TimeUpdate(u32 cClocks);
+extern void TimeUpdate(u32 cClocks);
 extern u16 SPU_ps1_read(u32 mem);
 extern void SPU_ps1_write(u32 mem, u16 value);
 extern void SPU2_FastWrite( u32 rmem, u16 value );