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

SPU2: initial merge complete

This commit is contained in:
Gauvain 'GovanifY' Roussel-Tarbouriech 2020-09-24 19:09:04 +02:00 committed by refractionpcsx2
parent fe8160f3ec
commit 0ece59b710
8 changed files with 19 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
common/include/PS2Edefs.h
View File

@ -455,36 +455,6 @@ extern _PADqueryMtap PADqueryMtap;
extern _PADWriteEvent PADWriteEvent;
#endif
// SPU2
#ifndef BUILTIN_SPU2_PLUGIN
extern _SPU2open SPU2open;
extern _SPU2reset SPU2reset;
extern _SPU2ps1reset SPU2ps1reset;
extern _SPU2write SPU2write;
extern _SPU2read SPU2read;
extern _SPU2readDMA4Mem SPU2readDMA4Mem;
extern _SPU2writeDMA4Mem SPU2writeDMA4Mem;
extern _SPU2interruptDMA4 SPU2interruptDMA4;
extern _SPU2readDMA7Mem SPU2readDMA7Mem;
extern _SPU2writeDMA7Mem SPU2writeDMA7Mem;
extern _SPU2setDMABaseAddr SPU2setDMABaseAddr;
extern _SPU2interruptDMA7 SPU2interruptDMA7;
extern _SPU2ReadMemAddr SPU2ReadMemAddr;
extern _SPU2setupRecording SPU2setupRecording;
extern _SPU2WriteMemAddr SPU2WriteMemAddr;
extern _SPU2irqCallback SPU2irqCallback;
extern _SPU2irqCallback SPU2irqCallback;
extern _SPU2setupRecording SPU2setupRecording;
extern _SPU2setClockPtr SPU2setClockPtr;
extern _SPU2setTimeStretcher SPU2setTimeStretcher;
extern _SPU2async SPU2async;
#endif
// DEV9
#ifndef BUILTIN_DEV9_PLUGIN
extern _DEV9open DEV9open;

5
pcsx2/CMakeLists.txt
View File

@ -249,6 +249,7 @@ set(pcsx2SPU2Sources
SPU2/Linux/ConfigDebug.cpp
SPU2/Linux/ConfigSoundTouch.cpp
SPU2/Linux/Dialogs.cpp
SPU2/wx/wxConfig.cpp
)
# SPU2 headers
@ -269,6 +270,7 @@ set(pcsx2SPU2Headers
SPU2/Linux/Alsa.h
SPU2/Linux/Config.h
SPU2/Linux/Dialogs.h
SPU2/wx/wxConfig.h
)
# DebugTools sources
@ -768,6 +770,9 @@ set(pcsx2FinalLibs
${ZLIB_LIBRARIES}
${AIO_LIBRARIES}
${GCOV_LIBRARIES}
${ALSA_LIBRARIES}
${SOUNDTOUCH_LIBRARIES}
${SDL2_LIBRARIES}
${Platform_Libs}
)

5
pcsx2/SPU2/Config.h
View File

@ -15,8 +15,11 @@
* along with SPU2-X. If not, see <http://www.gnu.org/licenses/>.
*/
#pragma once
#include "Global.h"
extern bool DebugEnabled;
extern bool _MsgToConsole;
@ -99,4 +102,4 @@ extern void ApplySettings(soundtouch::SoundTouch &sndtouch);
extern void ReadSettings();
extern void WriteSettings();
extern void configure();
extern void configure();

4
pcsx2/SPU2/Global.h
View File

@ -15,8 +15,7 @@
* along with SPU2-X. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef _SPU2X_GLOBAL_H_
#define _SPU2X_GLOBAL_H_
#pragma once
#define NOMINMAX
@ -104,4 +103,3 @@ extern void SysMessage(const wchar_t *fmt, ...);
#include "Debug.h"
#include "SndOut.h"
#endif

2
pcsx2/SPU2/spu2.cpp
View File

@ -26,6 +26,8 @@
using namespace Threading;
MutexRecursive mtx_SPU2Status;
#include "svnrev.h"
#ifdef _MSC_VER

2
pcsx2/SPU2/spu2.h
View File

@ -21,7 +21,7 @@
#include "Utilities/Threading.h"
#include "SaveState.h"
Threading::MutexRecursive mtx_SPU2Status;
extern Threading::MutexRecursive mtx_SPU2Status;
s32 SPU2init();
s32 SPU2reset();

6
pcsx2/SPU2/wx/wxConfig.cpp
View File

@ -15,7 +15,11 @@
* along with SPU2-X. If not, see <http://www.gnu.org/licenses/>.
*/
#include "Global.h"
#include "../Config.h"
#ifdef __linux__
#include "../Linux/Config.h"
#endif
#include "../Global.h"
#include "wxConfig.h"
MixerTab::MixerTab(wxWindow* parent)

1
pcsx2/SPU2/wx/wxConfig.h
View File

@ -14,6 +14,7 @@
* You should have received a copy of the GNU Lesser General Public License
* along with SPU2-X. If not, see <http://www.gnu.org/licenses/>.
*/
#pragma once
#include <wx/wx.h>
#include <wx/panel.h>