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/FrameTools.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/FrameTools.cpp')
| -rw-r--r-- | Source/Core/DolphinWX/FrameTools.cpp | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/Source/Core/DolphinWX/FrameTools.cpp b/Source/Core/DolphinWX/FrameTools.cpp index 243f217690..50dec10be5 100644 --- a/Source/Core/DolphinWX/FrameTools.cpp +++ b/Source/Core/DolphinWX/FrameTools.cpp @@ -42,10 +42,10 @@ #include "Core/HW/Wiimote.h" #include "Core/Host.h" #include "Core/HotkeyManager.h" -#include "Core/IPC_HLE/WII_IPC_HLE.h" -#include "Core/IPC_HLE/WII_IPC_HLE_Device_stm.h" -#include "Core/IPC_HLE/WII_IPC_HLE_Device_usb_bt_emu.h" -#include "Core/IPC_HLE/WII_IPC_HLE_WiiMote.h" +#include "Core/IOS/IPC.h" +#include "Core/IOS/STM/STM.h" +#include "Core/IOS/USB/Bluetooth/BTEmu.h" +#include "Core/IOS/USB/Bluetooth/WiimoteDevice.h" #include "Core/Movie.h" #include "Core/PowerPC/PPCSymbolDB.h" #include "Core/PowerPC/PowerPC.h" @@ -861,12 +861,8 @@ void CFrame::DoStop() bool CFrame::TriggerSTMPowerEvent() { const auto stm = IOS::HLE::GetDeviceByName("/dev/stm/eventhook"); - if (!stm || - !std::static_pointer_cast<IOS::HLE::CWII_IPC_HLE_Device_stm_eventhook>(stm) - ->HasHookInstalled()) - { + if (!stm || !std::static_pointer_cast<IOS::HLE::Device::STMEventHook>(stm)->HasHookInstalled()) return false; - } Core::DisplayMessage("Shutting down", 30000); // Unpause because gracefully shutting down needs the game to actually request a shutdown |