diff --git a/pcsx2/CMakeLists.txt b/pcsx2/CMakeLists.txt index 65697148b4..663ed2c6fb 100644 --- a/pcsx2/CMakeLists.txt +++ b/pcsx2/CMakeLists.txt @@ -350,6 +350,7 @@ set(pcsx2GuiHeaders gui/AdvancedDialog.h gui/App.h gui/ApplyState.h + gui/AppAccelerators.h gui/AppCommon.h gui/AppConfig.h gui/AppCorePlugins.h diff --git a/plugins/spu2-x/src/Linux/ConfigDebug.cpp b/plugins/spu2-x/src/Linux/ConfigDebug.cpp index d2ba14fb99..b1c73598bf 100644 --- a/plugins/spu2-x/src/Linux/ConfigDebug.cpp +++ b/plugins/spu2-x/src/Linux/ConfigDebug.cpp @@ -111,14 +111,14 @@ void ReadSettings() set_default_filenames(); - /*CfgReadStr(Section,L"Access_Log_Filename",AccessLogFileName,255,L"logs/SPU2Log.txt"); - CfgReadStr(Section,L"WaveLog_Filename", WaveLogFileName, 255,L"logs/SPU2log.wav"); - CfgReadStr(Section,L"DMA4Log_Filename", DMA4LogFileName, 255,L"logs/SPU2dma4.dat"); - CfgReadStr(Section,L"DMA7Log_Filename", DMA7LogFileName, 255,L"logs/SPU2dma7.dat"); + CfgReadStr(Section,L"Access_Log_Filename",AccessLogFileName, L"logs/SPU2Log.txt"); + CfgReadStr(Section,L"WaveLog_Filename", WaveLogFileName, L"logs/SPU2log.wav"); + CfgReadStr(Section,L"DMA4Log_Filename", DMA4LogFileName, L"logs/SPU2dma4.dat"); + CfgReadStr(Section,L"DMA7Log_Filename", DMA7LogFileName, L"logs/SPU2dma7.dat"); - CfgReadStr(Section,L"Info_Dump_Filename",CoresDumpFileName,255,L"logs/SPU2Cores.txt"); - CfgReadStr(Section,L"Mem_Dump_Filename", MemDumpFileName, 255,L"logs/SPU2mem.dat"); - CfgReadStr(Section,L"Reg_Dump_Filename", RegDumpFileName, 255,L"logs/SPU2regs.dat");*/ + CfgReadStr(Section,L"Info_Dump_Filename",CoresDumpFileName, L"logs/SPU2Cores.txt"); + CfgReadStr(Section,L"Mem_Dump_Filename", MemDumpFileName, L"logs/SPU2mem.dat"); + CfgReadStr(Section,L"Reg_Dump_Filename", RegDumpFileName, L"logs/SPU2regs.dat"); } @@ -143,14 +143,14 @@ void WriteSettings() CfgWriteBool(Section,L"Dump_Regs", _RegDump); set_default_filenames(); - /*CfgWriteStr(Section,L"Access_Log_Filename",AccessLogFileName); + CfgWriteStr(Section,L"Access_Log_Filename",AccessLogFileName); CfgWriteStr(Section,L"WaveLog_Filename", WaveLogFileName); CfgWriteStr(Section,L"DMA4Log_Filename", DMA4LogFileName); CfgWriteStr(Section,L"DMA7Log_Filename", DMA7LogFileName); CfgWriteStr(Section,L"Info_Dump_Filename",CoresDumpFileName); CfgWriteStr(Section,L"Mem_Dump_Filename", MemDumpFileName); - CfgWriteStr(Section,L"Reg_Dump_Filename", RegDumpFileName);*/ + CfgWriteStr(Section,L"Reg_Dump_Filename", RegDumpFileName); } diff --git a/plugins/spu2-x/src/Wavedump_wav.cpp b/plugins/spu2-x/src/Wavedump_wav.cpp index e668229d4a..e163ecea86 100644 --- a/plugins/spu2-x/src/Wavedump_wav.cpp +++ b/plugins/spu2-x/src/Wavedump_wav.cpp @@ -49,9 +49,13 @@ namespace WaveDump for( int srcidx=0; srcidx