diff options
| author | Matthew Parlane <parlane@gmail.com> | 2017-01-19 20:54:35 +1300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-19 20:54:35 +1300 |
| commit | 629fcb437a80f8059b9e2a705a1d32d7bd3286b5 (patch) | |
| tree | ecb743644f24a91d92e99a055833f007e3518dc2 /Source/Core/DolphinWX/ControllerConfigDiag.cpp | |
| parent | 01f2216e20dd8dc915f6c3ac613b5ae0af9f9ed9 (diff) | |
| parent | ef5a855b8e92836e172b49f34d113cfe287fbe46 (diff) | |
Merge pull request #4683 from leoetlino/rename-ipc-hle
Reorganise the IOS HLE source files (and drop WII_IPC_HLE)
Diffstat (limited to 'Source/Core/DolphinWX/ControllerConfigDiag.cpp')
| -rw-r--r-- | Source/Core/DolphinWX/ControllerConfigDiag.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/Source/Core/DolphinWX/ControllerConfigDiag.cpp b/Source/Core/DolphinWX/ControllerConfigDiag.cpp index 2c0a8646bd..a63a9cdff7 100644 --- a/Source/Core/DolphinWX/ControllerConfigDiag.cpp +++ b/Source/Core/DolphinWX/ControllerConfigDiag.cpp @@ -27,8 +27,8 @@ #include "Core/HW/Wiimote.h" #include "Core/HW/WiimoteReal/WiimoteReal.h" #include "Core/HotkeyManager.h" -#include "Core/IPC_HLE/WII_IPC_HLE.h" -#include "Core/IPC_HLE/WII_IPC_HLE_Device_usb_bt_real.h" +#include "Core/IOS/IPC.h" +#include "Core/IOS/USB/Bluetooth/BTReal.h" #include "Core/NetPlayProto.h" #include "DolphinWX/Config/GCAdapterConfigDiag.h" #include "DolphinWX/ControllerConfigDiag.h" @@ -529,7 +529,7 @@ void ControllerConfigDiag::OnPassthroughScanButton(wxCommandEvent& event) } auto device = IOS::HLE::GetDeviceByName("/dev/usb/oh1/57e/305"); if (device != nullptr) - std::static_pointer_cast<IOS::HLE::CWII_IPC_HLE_Device_usb_oh1_57e_305_base>(device) + std::static_pointer_cast<IOS::HLE::Device::BluetoothBase>(device) ->TriggerSyncButtonPressedEvent(); } @@ -543,8 +543,7 @@ void ControllerConfigDiag::OnPassthroughResetButton(wxCommandEvent& event) } auto device = IOS::HLE::GetDeviceByName("/dev/usb/oh1/57e/305"); if (device != nullptr) - std::static_pointer_cast<IOS::HLE::CWII_IPC_HLE_Device_usb_oh1_57e_305_base>(device) - ->TriggerSyncButtonHeldEvent(); + std::static_pointer_cast<IOS::HLE::Device::BluetoothBase>(device)->TriggerSyncButtonHeldEvent(); } void ControllerConfigDiag::OnBalanceBoardChanged(wxCommandEvent& event) |