diff options
| author | Léo Lam <leo@innovatetechnologi.es> | 2017-07-19 15:55:45 +0800 |
|---|---|---|
| committer | Léo Lam <leo@innovatetechnologi.es> | 2017-07-23 15:47:32 +0800 |
| commit | ee868e2362d09427d6416c52f37dff85bf25a6e1 (patch) | |
| tree | b19c3c92a6010b8542c601ec4704f2ed4ec2bce8 /Source/Core/DolphinNoGUI/MainNoGUI.cpp | |
| parent | 9237137c3a23938ab8c3fd98d1864a5cf8f0af5a (diff) | |
Move the Wiimote connect code out of Host
I don't know who thought it would be a good idea to put the Wiimote
connect code as part of the Host interface, and have that called
from both the UI code and the core. And then hack around it by having
"force connect" events whenever Host_ConnectWiimote is called
from the core...
Diffstat (limited to 'Source/Core/DolphinNoGUI/MainNoGUI.cpp')
| -rw-r--r-- | Source/Core/DolphinNoGUI/MainNoGUI.cpp | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/Source/Core/DolphinNoGUI/MainNoGUI.cpp b/Source/Core/DolphinNoGUI/MainNoGUI.cpp index 89a7cfe832..fc91ccac04 100644 --- a/Source/Core/DolphinNoGUI/MainNoGUI.cpp +++ b/Source/Core/DolphinNoGUI/MainNoGUI.cpp @@ -22,12 +22,9 @@ #include "Core/BootManager.h" #include "Core/ConfigManager.h" #include "Core/Core.h" -#include "Core/HW/Wiimote.h" #include "Core/Host.h" #include "Core/IOS/IOS.h" #include "Core/IOS/STM/STM.h" -#include "Core/IOS/USB/Bluetooth/BTEmu.h" -#include "Core/IOS/USB/Bluetooth/WiimoteDevice.h" #include "Core/State.h" #include "UICommon/CommandLineParse.h" @@ -131,22 +128,6 @@ bool Host_RendererIsFullscreen() return rendererIsFullscreen; } -void Host_ConnectWiimote(int wm_idx, bool connect) -{ - Core::QueueHostJob([=] { - const auto ios = IOS::HLE::GetIOS(); - if (!ios || SConfig::GetInstance().m_bt_passthrough_enabled) - return; - Core::RunAsCPUThread([&] { - const auto bt = std::static_pointer_cast<IOS::HLE::Device::BluetoothEmu>( - ios->GetDeviceByName("/dev/usb/oh1/57e/305")); - if (bt) - bt->AccessWiiMote(wm_idx | 0x100)->Activate(connect); - Host_UpdateMainFrame(); - }); - }); -} - void Host_ShowVideoConfig(void*, const std::string&) { } |
