From 8a1df8dbb183d5e6cff79f96e576c0b49b42f3c1 Mon Sep 17 00:00:00 2001 From: arcum42 Date: Fri, 18 Sep 2009 07:37:21 +0000 Subject: [PATCH] Same changes to ZeroSPU2 & spu2-x's projects. ifdeffed out a few things in spu2-x. git-svn-id: http://pcsx2.googlecode.com/svn/trunk@1851 96395faa-99c1-11dd-bbfe-3dabce05a288 --- pcsx2-codeblocks.workspace | 9 +++++++-- pcsx2/gui/ConsoleLogger.cpp | 15 ++++++++++++--- plugins/spu2-x/src/DllInterface.cpp | 2 ++ plugins/spu2-x/src/Linux/Config.cpp | 2 +- plugins/spu2-x/src/Linux/SPU2-X.cbp | 25 ++++--------------------- plugins/spu2-x/src/SndOut.cpp | 2 ++ plugins/spu2-x/src/Spu2.cpp | 19 ++++++++++++++++++- plugins/zerospu2/Linux/ZeroSPU2.cbp | 25 ++++--------------------- 8 files changed, 50 insertions(+), 49 deletions(-) diff --git a/pcsx2-codeblocks.workspace b/pcsx2-codeblocks.workspace index 6aa305ae6e..f5e96284a8 100644 --- a/pcsx2-codeblocks.workspace +++ b/pcsx2-codeblocks.workspace @@ -1,7 +1,7 @@ - + @@ -22,6 +22,11 @@ - + + + + + + diff --git a/pcsx2/gui/ConsoleLogger.cpp b/pcsx2/gui/ConsoleLogger.cpp index 996a45532a..5e39cf656f 100644 --- a/pcsx2/gui/ConsoleLogger.cpp +++ b/pcsx2/gui/ConsoleLogger.cpp @@ -565,6 +565,7 @@ namespace Console // they are implemented here using a mutex lock for maximum safety. static void _immediate_logger( const char* src ) { + ScopedLock locker( immediate_log_lock ); if( emuLog != NULL ) @@ -574,8 +575,16 @@ namespace Console // [TODO] make this a configurable option? Do we care? :) #ifdef __LINUX__ // puts does automatic newlines, which we don't want here - //fputs( "PCSX2 > ", stdout ); - fputs( src, stdout ); + + /*if (strchr(src, '\n')) + { + fputs( "PCSX2 > ", stdout ); + fputs( src , stdout); + } + else + {*/ + fputs( src, stdout ); + //} #endif } @@ -635,7 +644,7 @@ namespace Console bool __fastcall WriteLn( const wxString& fmt ) { const wxString fmtline( fmt + L"\n" ); - _immediate_logger( "PCSX2 > "); + //_immediate_logger( "PCSX2 > "); _immediate_logger( fmtline ); if( emuLog != NULL ) diff --git a/plugins/spu2-x/src/DllInterface.cpp b/plugins/spu2-x/src/DllInterface.cpp index e6d39bb691..11fce3a26d 100644 --- a/plugins/spu2-x/src/DllInterface.cpp +++ b/plugins/spu2-x/src/DllInterface.cpp @@ -250,7 +250,9 @@ EXPORT_C_(void) SPU2close() if( !spu2open ) return; FileLog("[%10d] SPU2 Close\n",Cycles); +#ifndef __LINUX__ DspCloseLibrary(); +#endif spdif_shutdown(); SndBuffer::Cleanup(); diff --git a/plugins/spu2-x/src/Linux/Config.cpp b/plugins/spu2-x/src/Linux/Config.cpp index bdb995b36f..848ce31b27 100644 --- a/plugins/spu2-x/src/Linux/Config.cpp +++ b/plugins/spu2-x/src/Linux/Config.cpp @@ -103,6 +103,6 @@ void configure() ReadSettings(); } -void SysMessage(char const*, ...) +void MessageBox(char const*, ...) { } diff --git a/plugins/spu2-x/src/Linux/SPU2-X.cbp b/plugins/spu2-x/src/Linux/SPU2-X.cbp index f127945b60..45edff99f2 100644 --- a/plugins/spu2-x/src/Linux/SPU2-X.cbp +++ b/plugins/spu2-x/src/Linux/SPU2-X.cbp @@ -15,6 +15,9 @@ + + + @@ -51,27 +55,6 @@ - - - - - - - - - - - - - - - - - - - - - diff --git a/plugins/spu2-x/src/SndOut.cpp b/plugins/spu2-x/src/SndOut.cpp index 33ada97d10..29588ccf43 100644 --- a/plugins/spu2-x/src/SndOut.cpp +++ b/plugins/spu2-x/src/SndOut.cpp @@ -328,6 +328,7 @@ void SndBuffer::Write( const StereoOut32& Sample ) ssFreeze--; return; } +#ifndef __LINUX__ else if( dspPluginEnabled ) { // Convert in, send to winamp DSP, and convert out. @@ -357,6 +358,7 @@ void SndBuffer::Write( const StereoOut32& Sample ) ); } } +#endif else { if( !timeStretchDisabled ) diff --git a/plugins/spu2-x/src/Spu2.cpp b/plugins/spu2-x/src/Spu2.cpp index 0a4fb62713..ffe65eae89 100644 --- a/plugins/spu2-x/src/Spu2.cpp +++ b/plugins/spu2-x/src/Spu2.cpp @@ -67,6 +67,7 @@ void SetIrqCall() has_to_call_irq=true; } +#ifndef __LINUX__ void SysMessage(const char *fmt, ...) { va_list list; @@ -79,6 +80,19 @@ void SysMessage(const char *fmt, ...) swprintf_s(wtmp, L"%S", tmp); MessageBox(0, wtmp, L"SPU2-X System Message", 0); } +#else +void SysMessage(const char *fmt, ...) +{ + va_list list; + char tmp[512]; + wchar_t wtmp[512]; + + va_start(list,fmt); + sprintf(tmp,fmt,list); + va_end(list); + printf("%s", tmp); +} +#endif __forceinline s16 * __fastcall GetMemPtr(u32 addr) { @@ -791,7 +805,10 @@ static __forceinline u16 GetLoWord( s32& src ) return ((u16*)&src)[0]; } -__forceinline void SPU2_FastWrite( u32 rmem, u16 value ) +#ifndef __LINUX__ +__forceinline +#endif +void SPU2_FastWrite( u32 rmem, u16 value ) { u32 vx=0, vc=0, core=0, omem, mem; omem=mem=rmem & 0x7FF; //FFFF; diff --git a/plugins/zerospu2/Linux/ZeroSPU2.cbp b/plugins/zerospu2/Linux/ZeroSPU2.cbp index a80e65769d..84c03b361a 100644 --- a/plugins/zerospu2/Linux/ZeroSPU2.cbp +++ b/plugins/zerospu2/Linux/ZeroSPU2.cbp @@ -16,6 +16,9 @@ + + + @@ -53,27 +57,6 @@ - - - - - - - - - - - - - - - - - - - - -