diff --git a/Source/Android/jni/MainAndroid.cpp b/Source/Android/jni/MainAndroid.cpp index b2f6ca467f..f6c305efa0 100644 --- a/Source/Android/jni/MainAndroid.cpp +++ b/Source/Android/jni/MainAndroid.cpp @@ -144,10 +144,6 @@ void Host_ConnectWiimote(int wm_idx, bool connect) { } -void Host_SetWiiMoteConnectionState(int _State) -{ -} - void Host_ShowVideoConfig(void*, const std::string&) { } diff --git a/Source/Core/Core/Host.h b/Source/Core/Core/Host.h index 3fa68c9df9..c33fc47f06 100644 --- a/Source/Core/Core/Host.h +++ b/Source/Core/Core/Host.h @@ -31,7 +31,6 @@ void Host_Message(int Id); void Host_NotifyMapLoaded(); void Host_RefreshDSPDebuggerWindow(); void Host_RequestRenderWindowSize(int width, int height); -void Host_SetWiiMoteConnectionState(int _State); void Host_UpdateDisasmDialog(); void Host_UpdateMainFrame(); void Host_UpdateTitle(const std::string& title); diff --git a/Source/Core/Core/IOS/USB/Bluetooth/BTEmu.cpp b/Source/Core/Core/IOS/USB/Bluetooth/BTEmu.cpp index 00e290541e..6772a364ec 100644 --- a/Source/Core/Core/IOS/USB/Bluetooth/BTEmu.cpp +++ b/Source/Core/Core/IOS/USB/Bluetooth/BTEmu.cpp @@ -91,13 +91,10 @@ BluetoothEmu::BluetoothEmu(Kernel& ios, const std::string& device_name) m_ControllerBD.b[3] = 0x79; m_ControllerBD.b[4] = 0x00; m_ControllerBD.b[5] = 0xFF; - - Host_SetWiiMoteConnectionState(0); } BluetoothEmu::~BluetoothEmu() { - Host_SetWiiMoteConnectionState(0); m_WiiMotes.clear(); } @@ -355,10 +352,7 @@ void BluetoothEmu::Update() for (auto& wiimote : m_WiiMotes) { if (wiimote.EventPagingChanged(m_ScanEnable)) - { - Host_SetWiiMoteConnectionState(1); SendEventRequestConnection(wiimote); - } } } @@ -1203,7 +1197,6 @@ void BluetoothEmu::CommandDisconnect(const u8* input) DEBUG_LOG(IOS_WIIMOTE, " ConnectionHandle: 0x%04x", disconnect->con_handle); DEBUG_LOG(IOS_WIIMOTE, " Reason: 0x%02x", disconnect->reason); - Host_SetWiiMoteConnectionState(0); DisplayDisconnectMessage((disconnect->con_handle & 0xFF) + 1, disconnect->reason); SendEventCommandStatus(HCI_CMD_DISCONNECT); diff --git a/Source/Core/Core/IOS/USB/Bluetooth/WiimoteDevice.cpp b/Source/Core/Core/IOS/USB/Bluetooth/WiimoteDevice.cpp index c140161372..55d40b0ea6 100644 --- a/Source/Core/Core/IOS/USB/Bluetooth/WiimoteDevice.cpp +++ b/Source/Core/Core/IOS/USB/Bluetooth/WiimoteDevice.cpp @@ -910,9 +910,6 @@ void WiimoteDevice::ReceiveL2capData(u16 scid, const void* _pData, u32 _Size) // Update Offset to the final size of the report Offset += _Size; - // Update the status bar - Host_SetWiiMoteConnectionState(2); - // Send the report m_pHost->SendACLPacket(GetConnectionHandle(), DataFrame, Offset); } diff --git a/Source/Core/DolphinNoGUI/MainNoGUI.cpp b/Source/Core/DolphinNoGUI/MainNoGUI.cpp index b62cf0e22c..1cfb41c96a 100644 --- a/Source/Core/DolphinNoGUI/MainNoGUI.cpp +++ b/Source/Core/DolphinNoGUI/MainNoGUI.cpp @@ -147,10 +147,6 @@ void Host_ConnectWiimote(int wm_idx, bool connect) }); } -void Host_SetWiiMoteConnectionState(int _State) -{ -} - void Host_ShowVideoConfig(void*, const std::string&) { } diff --git a/Source/Core/DolphinQt2/Host.cpp b/Source/Core/DolphinQt2/Host.cpp index dc450c9e42..0f0c008b09 100644 --- a/Source/Core/DolphinQt2/Host.cpp +++ b/Source/Core/DolphinQt2/Host.cpp @@ -104,9 +104,6 @@ void Host_NotifyMapLoaded() void Host_UpdateDisasmDialog() { } -void Host_SetWiiMoteConnectionState(int state) -{ -} void Host_ConnectWiimote(int wm_idx, bool connect) { } diff --git a/Source/Core/DolphinWX/Main.cpp b/Source/Core/DolphinWX/Main.cpp index 19da6231e4..869bdfc74e 100644 --- a/Source/Core/DolphinWX/Main.cpp +++ b/Source/Core/DolphinWX/Main.cpp @@ -458,35 +458,6 @@ void Host_RequestRenderWindowSize(int width, int height) main_frame->GetEventHandler()->AddPendingEvent(event); } -void Host_SetWiiMoteConnectionState(int _State) -{ - static int currentState = -1; - if (_State == currentState) - return; - currentState = _State; - - wxCommandEvent event(wxEVT_HOST_COMMAND, IDM_UPDATE_STATUS_BAR); - - switch (_State) - { - case 0: - event.SetString(_("Not connected")); - break; - case 1: - event.SetString(_("Connecting...")); - break; - case 2: - event.SetString(_("Wii Remote Connected")); - break; - } - // The second field is used for auxiliary info such as this - event.SetInt(1); - - NOTICE_LOG(WIIMOTE, "%s", static_cast(event.GetString().c_str())); - - main_frame->GetEventHandler()->AddPendingEvent(event); -} - bool Host_UINeedsControllerState() { return wxGetApp().IsActiveThreadsafe() && GetUINeedsControllerState(); diff --git a/Source/UnitTests/StubHost.cpp b/Source/UnitTests/StubHost.cpp index 019833650c..eec3d99557 100644 --- a/Source/UnitTests/StubHost.cpp +++ b/Source/UnitTests/StubHost.cpp @@ -54,9 +54,6 @@ bool Host_RendererIsFullscreen() void Host_ConnectWiimote(int, bool) { } -void Host_SetWiiMoteConnectionState(int) -{ -} void Host_ShowVideoConfig(void*, const std::string&) { }