mirror of https://github.com/PCSX2/pcsx2.git
spu2-x: Slap the Linux port back together a bit.
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3116 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
parent
bc11d59438
commit
b80f417943
|
@ -34,7 +34,6 @@ endif(CMAKE_BUILD_TYPE STREQUAL Release)
|
|||
# spu2x sources
|
||||
set(spu2xSources
|
||||
ADSR.cpp
|
||||
ConvertUTF.cpp
|
||||
Debug.cpp
|
||||
Decoder.cpp
|
||||
Dma.cpp
|
||||
|
@ -59,7 +58,6 @@ set(spu2xSources
|
|||
# spu2x headers
|
||||
set(spu2xHeaders
|
||||
Config.h
|
||||
ConvertUTF.h
|
||||
Debug.h
|
||||
defs.h
|
||||
Dma.h
|
||||
|
|
|
@ -84,16 +84,8 @@ void CfgReadStr(const wchar_t* Section, const wchar_t* Name, wchar_t* Data, int
|
|||
wcscpy(Data, spuConfig->Read(Name, Default));
|
||||
}
|
||||
|
||||
void CfgReadStr(const wchar_t* Section, const wchar_t* Name, wxString& Data, int DataSize, const wchar_t* Default)
|
||||
void CfgReadStr(const wchar_t* Section, const wchar_t* Name, wxString& Data, const wchar_t* Default)
|
||||
{
|
||||
setIni(Section);
|
||||
Data = spuConfig->Read(Name, Default);
|
||||
}
|
||||
|
||||
void CfgReadStr(const wchar_t* Section, const wchar_t* Name, wxString& Data, int DataSize, const wchar_t* Default)
|
||||
{
|
||||
wxString temp;
|
||||
CfgReadStr(Section, Name, temp, DataSize, Default);
|
||||
Data = temp.c_str();
|
||||
}
|
||||
|
||||
|
|
|
@ -58,13 +58,13 @@ static __forceinline bool MemDump() { return _MemDump & DebugEnabled; }
|
|||
static __forceinline bool RegDump() { return _RegDump & DebugEnabled; }*/
|
||||
|
||||
|
||||
extern wchar_t AccessLogFileName[255];
|
||||
extern wchar_t WaveLogFileName[255];
|
||||
extern wchar_t DMA4LogFileName[255];
|
||||
extern wchar_t DMA7LogFileName[255];
|
||||
extern wchar_t CoresDumpFileName[255];
|
||||
extern wchar_t MemDumpFileName[255];
|
||||
extern wchar_t RegDumpFileName[255];
|
||||
//extern wchar_t AccessLogFileName[255];
|
||||
//extern wchar_t WaveLogFileName[255];
|
||||
//extern wchar_t DMA4LogFileName[255];
|
||||
//extern wchar_t DMA7LogFileName[255];
|
||||
//extern wchar_t CoresDumpFileName[255];
|
||||
//extern wchar_t MemDumpFileName[255];
|
||||
//extern wchar_t RegDumpFileName[255];
|
||||
|
||||
extern int Interpolation;
|
||||
extern int ReverbBoost;
|
||||
|
|
|
@ -18,6 +18,7 @@
|
|||
#include "Global.h"
|
||||
#include "Dialogs.h"
|
||||
#include "Config.h"
|
||||
#include "Utilities/Path.h"
|
||||
|
||||
bool DebugEnabled=false;
|
||||
bool _MsgToConsole=false;
|
||||
|
@ -44,6 +45,7 @@ static wxDirName LogsFolder;
|
|||
static wxDirName DumpsFolder;
|
||||
|
||||
wxString AccessLogFileName;
|
||||
wxString WaveLogFileName;
|
||||
wxString DMA4LogFileName;
|
||||
wxString DMA7LogFileName;
|
||||
|
||||
|
@ -51,8 +53,6 @@ wxString CoresDumpFileName;
|
|||
wxString MemDumpFileName;
|
||||
wxString RegDumpFileName;
|
||||
|
||||
namespace DebugConfig {
|
||||
|
||||
void CfgSetLogDir( const char* dir )
|
||||
{
|
||||
LogsFolder = (dir==NULL) ? wxString(L"logs") : fromUTF8(dir);
|
||||
|
@ -75,6 +75,7 @@ FILE* OpenDump( const wxString& logfile )
|
|||
return wxFopen( Path::Combine(DumpsFolder, logfile), L"w" );
|
||||
}
|
||||
|
||||
namespace DebugConfig {
|
||||
static const wchar_t* Section = L"DEBUG";
|
||||
|
||||
static void set_default_filenames()
|
||||
|
|
|
@ -92,8 +92,6 @@
|
|||
<Unit filename="../3rdparty/liba52/tendra.h" />
|
||||
<Unit filename="../ADSR.cpp" />
|
||||
<Unit filename="../Config.h" />
|
||||
<Unit filename="../ConvertUTF.cpp" />
|
||||
<Unit filename="../ConvertUTF.h" />
|
||||
<Unit filename="../DPLII.h" />
|
||||
<Unit filename="../Debug.cpp" />
|
||||
<Unit filename="../Debug.h" />
|
||||
|
|
|
@ -58,7 +58,6 @@ extern void CfgWriteStr(const TCHAR* Section, const TCHAR* Name, const wxString
|
|||
|
||||
extern bool CfgReadBool(const TCHAR *Section,const TCHAR* Name, bool Default);
|
||||
extern void CfgReadStr(const TCHAR* Section, const TCHAR* Name, wxString& Data, const TCHAR* Default);
|
||||
extern void CfgReadStr(const TCHAR* Section, const TCHAR* Name, TCHAR* Data, int DataSize, const TCHAR* Default);
|
||||
extern int CfgReadInt(const TCHAR* Section, const TCHAR* Name,int Default);
|
||||
|
||||
// Items Specific to DirectSound
|
||||
|
|
Loading…
Reference in New Issue