From f96ab66d31ed27c21d2379252c1f665de60e1282 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Lam?= Date: Tue, 16 May 2017 19:21:21 +0200 Subject: [PATCH] Drop remnants of the plugin system --- Source/Core/Common/Common.h | 8 -------- Source/Core/Core/HW/Wiimote.cpp | 6 ------ Source/Core/Core/HW/Wiimote.h | 1 - Source/Core/Core/HW/WiimoteReal/WiimoteReal.cpp | 5 ----- Source/Core/Core/HW/WiimoteReal/WiimoteReal.h | 1 - 5 files changed, 21 deletions(-) diff --git a/Source/Core/Common/Common.h b/Source/Core/Common/Common.h index ff9cea5104..1d3fb2b33e 100644 --- a/Source/Core/Common/Common.h +++ b/Source/Core/Common/Common.h @@ -87,11 +87,3 @@ enum HOST_COMM WM_USER_SETCURSOR, WM_USER_JOB_DISPATCH, }; - -// Used for notification on emulation state -enum EMUSTATE_CHANGE -{ - EMUSTATE_CHANGE_PLAY = 1, - EMUSTATE_CHANGE_PAUSE, - EMUSTATE_CHANGE_STOP -}; diff --git a/Source/Core/Core/HW/Wiimote.cpp b/Source/Core/Core/HW/Wiimote.cpp index c1f067fe42..e3e9b244f4 100644 --- a/Source/Core/Core/HW/Wiimote.cpp +++ b/Source/Core/Core/HW/Wiimote.cpp @@ -154,10 +154,4 @@ void DoState(PointerWrap& p) for (int i = 0; i < MAX_BBMOTES; ++i) static_cast(s_config.GetController(i))->DoState(p); } - -// Notifies the plugin of a change in emulation state -void EmuStateChange(EMUSTATE_CHANGE newState) -{ - WiimoteReal::StateChange(newState); -} } diff --git a/Source/Core/Core/HW/Wiimote.h b/Source/Core/Core/HW/Wiimote.h index 5e6ccb7896..e08510aec5 100644 --- a/Source/Core/Core/HW/Wiimote.h +++ b/Source/Core/Core/HW/Wiimote.h @@ -65,7 +65,6 @@ void Pause(); unsigned int GetAttached(); void DoState(PointerWrap& p); -void EmuStateChange(EMUSTATE_CHANGE newState); InputConfig* GetConfig(); ControllerEmu::ControlGroup* GetWiimoteGroup(int number, WiimoteEmu::WiimoteGroup group); ControllerEmu::ControlGroup* GetNunchukGroup(int number, WiimoteEmu::NunchukGroup group); diff --git a/Source/Core/Core/HW/WiimoteReal/WiimoteReal.cpp b/Source/Core/Core/HW/WiimoteReal/WiimoteReal.cpp index f1dc008845..392dfe9caf 100644 --- a/Source/Core/Core/HW/WiimoteReal/WiimoteReal.cpp +++ b/Source/Core/Core/HW/WiimoteReal/WiimoteReal.cpp @@ -903,11 +903,6 @@ void ConnectOnInput(int wiimote_number) g_wiimotes_mutex.unlock(); } -void StateChange(EMUSTATE_CHANGE newState) -{ - // TODO: disable/enable auto reporting, maybe -} - bool IsValidDeviceName(const std::string& name) { return "Nintendo RVL-CNT-01" == name || "Nintendo RVL-CNT-01-TR" == name || diff --git a/Source/Core/Core/HW/WiimoteReal/WiimoteReal.h b/Source/Core/Core/HW/WiimoteReal/WiimoteReal.h index 110bcb16e1..09bcf8c279 100644 --- a/Source/Core/Core/HW/WiimoteReal/WiimoteReal.h +++ b/Source/Core/Core/HW/WiimoteReal/WiimoteReal.h @@ -161,7 +161,6 @@ void ControlChannel(int wiimote_number, u16 channel_id, const void* data, u32 si void Update(int wiimote_number); void ConnectOnInput(int wiimote_number); -void StateChange(EMUSTATE_CHANGE newState); void ChangeWiimoteSource(unsigned int index, int source); bool IsValidDeviceName(const std::string& name);