ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Spu2-x: A few quick changes to get it compiling in Linux again. 

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@2562 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
arcum42 2010-02-05 03:59:19 +00:00
parent 84194fb892
commit cc585042ce
11 changed files with 32 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/spu2-x/src/Dma.cpp
View File

@ -16,7 +16,7 @@
*/ */
#include "Global.h" #include "Global.h"
#include "dma.h" #include "Dma.h"
#include "PS2E-spu2.h" // temporary until I resolve cyclePtr/TimeUpdate dependencies. #include "PS2E-spu2.h" // temporary until I resolve cyclePtr/TimeUpdate dependencies.

1
plugins/spu2-x/src/Global.h
View File

@ -45,6 +45,7 @@ namespace soundtouch
using std::string; using std::string;
using std::wstring; using std::wstring;
#include "Pcsx2Defs.h"
#include "Pcsx2Types.h" #include "Pcsx2Types.h"
namespace VersionInfo namespace VersionInfo

1
plugins/spu2-x/src/Linux/Alsa.cpp
View File

@ -20,6 +20,7 @@
#include <alsa/asoundlib.h> #include <alsa/asoundlib.h>
#define ALSA_MEM_DEF #define ALSA_MEM_DEF
#include "Global.h"
#include "Alsa.h" #include "Alsa.h"
#include "SndOut.h" #include "SndOut.h"

3
plugins/spu2-x/src/Linux/Config.cpp
View File

@ -15,8 +15,9 @@
* along with SPU2-X. If not, see <http://www.gnu.org/licenses/>. * along with SPU2-X. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include "Spu2.h" #include "Global.h"
#include "Dialogs.h" #include "Dialogs.h"
#include "Config.h"
bool DebugEnabled=false; bool DebugEnabled=false;
bool _MsgToConsole=false; bool _MsgToConsole=false;

14
plugins/spu2-x/src/Linux/Config.h
View File

@ -38,7 +38,7 @@ extern bool _CoresDump;
extern bool _MemDump; extern bool _MemDump;
extern bool _RegDump; extern bool _RegDump;
static __forceinline bool MsgToConsole() { return _MsgToConsole & DebugEnabled; } /*static __forceinline bool MsgToConsole() { return _MsgToConsole & DebugEnabled; }
static __forceinline bool MsgKeyOnOff() { return _MsgKeyOnOff & MsgToConsole(); } static __forceinline bool MsgKeyOnOff() { return _MsgKeyOnOff & MsgToConsole(); }
static __forceinline bool MsgVoiceOff() { return _MsgVoiceOff & MsgToConsole(); } static __forceinline bool MsgVoiceOff() { return _MsgVoiceOff & MsgToConsole(); }
@ -53,7 +53,7 @@ static __forceinline bool WaveLog() { return _WaveLog & DebugEnabled; }
static __forceinline bool CoresDump() { return _CoresDump & DebugEnabled; } static __forceinline bool CoresDump() { return _CoresDump & DebugEnabled; }
static __forceinline bool MemDump() { return _MemDump & DebugEnabled; } static __forceinline bool MemDump() { return _MemDump & DebugEnabled; }
static __forceinline bool RegDump() { return _RegDump & DebugEnabled; } static __forceinline bool RegDump() { return _RegDump & DebugEnabled; }*/
extern wchar_t AccessLogFileName[255]; extern wchar_t AccessLogFileName[255];
@ -80,7 +80,7 @@ extern bool dspPluginEnabled;
extern bool timeStretchDisabled; extern bool timeStretchDisabled;
extern bool StereoExpansionEnabled; extern bool StereoExpansionEnabled;
class SoundtouchCfg namespace SoundtouchCfg
{ {
// Timestretch Slider Bounds, Min/Max // Timestretch Slider Bounds, Min/Max
static const int SequenceLen_Min = 30; static const int SequenceLen_Min = 30;
@ -92,16 +92,14 @@ class SoundtouchCfg
static const int Overlap_Min = 3; static const int Overlap_Min = 3;
static const int Overlap_Max = 15; static const int Overlap_Max = 15;
public: static int SequenceLenMS = 63;
static int SequenceLenMS; static int SeekWindowMS = 16;
static int SeekWindowMS; static int OverlapMS = 7;
static int OverlapMS;
static void ReadSettings(); static void ReadSettings();
static void WriteSettings(); static void WriteSettings();
static void OpenDialog( uptr hWnd ); static void OpenDialog( uptr hWnd );
protected:
static void ClampValues(); static void ClampValues();
}; };

17
plugins/spu2-x/src/Linux/ConfigSoundTouch.cpp
View File

@ -19,20 +19,20 @@
* *
*/ */
#include "Global.h"
#include "Dialogs.h" #include "Dialogs.h"
#include "Config.h"
int SoundtouchCfg::SequenceLenMS = 63; namespace SoundtouchCfg
int SoundtouchCfg::SeekWindowMS = 16; {
int SoundtouchCfg::OverlapMS = 7; void ClampValues()
void SoundtouchCfg::ClampValues()
{ {
Clampify( SequenceLenMS, SequenceLen_Min, SequenceLen_Max ); Clampify( SequenceLenMS, SequenceLen_Min, SequenceLen_Max );
Clampify( SeekWindowMS, SeekWindow_Min, SeekWindow_Max ); Clampify( SeekWindowMS, SeekWindow_Min, SeekWindow_Max );
Clampify( OverlapMS, Overlap_Min, Overlap_Max ); Clampify( OverlapMS, Overlap_Min, Overlap_Max );
} }
void SoundtouchCfg::ReadSettings() void ReadSettings()
{ {
//SequenceLenMS = CfgReadInt( L"SOUNDTOUCH", L"SequenceLengthMS", 63 ); //SequenceLenMS = CfgReadInt( L"SOUNDTOUCH", L"SequenceLengthMS", 63 );
//SeekWindowMS = CfgReadInt( L"SOUNDTOUCH", L"SeekWindowMS", 16 ); //SeekWindowMS = CfgReadInt( L"SOUNDTOUCH", L"SeekWindowMS", 16 );
@ -41,7 +41,7 @@ void SoundtouchCfg::ReadSettings()
ClampValues(); ClampValues();
} }
void SoundtouchCfg::WriteSettings() void WriteSettings()
{ {
//CfgWriteInt( L"SOUNDTOUCH", L"SequenceLengthMS", SequenceLenMS ); //CfgWriteInt( L"SOUNDTOUCH", L"SequenceLengthMS", SequenceLenMS );
//CfgWriteInt( L"SOUNDTOUCH", L"SeekWindowMS", SeekWindowMS ); //CfgWriteInt( L"SOUNDTOUCH", L"SeekWindowMS", SeekWindowMS );
@ -52,6 +52,7 @@ void SoundtouchCfg::WriteSettings()
{ {
}*/ }*/
void SoundtouchCfg::OpenDialog( uptr hWnd ) void OpenDialog( uptr hWnd )
{ {
} }
}

3
plugins/spu2-x/src/Linux/Dialogs.h
View File

@ -18,6 +18,7 @@
#ifndef DIALOG_H_INCLUDED #ifndef DIALOG_H_INCLUDED
#define DIALOG_H_INCLUDED #define DIALOG_H_INCLUDED
#include "../Spu2.h" #include "../Config.h"
#include "../Global.h"
#endif #endif

4
plugins/spu2-x/src/Linux/SPU2-X.cbp
View File

@ -36,7 +36,7 @@
</Build> </Build>
<Compiler> <Compiler>
<Add option="-Wall" /> <Add option="-Wall" />
<Add option="`pkg-config gtk+-2.0 --cflags`" /> <Add option="`wx-config --version=2.8 --static=no --unicode=yes --cflags`" />
<Add option="-fPIC" /> <Add option="-fPIC" />
<Add option="-m32" /> <Add option="-m32" />
<Add option="-liconv" /> <Add option="-liconv" />
@ -50,7 +50,7 @@
<Add directory="../../../../3rdparty" /> <Add directory="../../../../3rdparty" />
</Compiler> </Compiler>
<Linker> <Linker>
<Add option="`pkg-config gtk+-2.0 --libs`" /> <Add option="`wx-config --version=2.8 --static=no --unicode=yes --libs`" />
<Add option="-shared" /> <Add option="-shared" />
<Add library="asound" /> <Add library="asound" />
<Add library="stdc++" /> <Add library="stdc++" />

1
plugins/spu2-x/src/Lowpass.cpp
View File

@ -16,6 +16,7 @@
*/ */
#include "Lowpass.h" #include "Lowpass.h"
#include "Global.h"
#include <math.h> #include <math.h>
#include <float.h> #include <float.h>

2
plugins/spu2-x/src/Mixer.cpp
View File

@ -294,7 +294,7 @@ static s32 __forceinline GetNoiseValues()
"XOR %%eax,%%ebx\n" "XOR %%eax,%%ebx\n"
"ROR %%eax,3\n" "ROR %%eax,3\n"
"MOV %0,%%eax\n" "MOV %0,%%eax\n"
".att_syntax\n" : "m="(Seed) : "m"(Seed)); ".att_syntax\n" : "r="(Seed) :"r"(Seed));
#endif #endif
return retval; return retval;
} }

2
plugins/spu2-x/src/ReadInput.cpp
View File

@ -16,7 +16,7 @@
*/ */
#include "Global.h" #include "Global.h"
#include "dma.h" #include "Dma.h"
#include "PS2E-spu2.h" // required for ENABLE_NEW_IOPDMA_SPU2 define #include "PS2E-spu2.h" // required for ENABLE_NEW_IOPDMA_SPU2 define