N-archive/citra
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Let HID service choose between InputCommon and EmuWindow for input

Browse source
This commit is contained in:
Daniel Stuart Baxter 2015-05-30 01:37:49 -05:00
parent eeb785c9ff
commit ecb059daa9
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/core/hle/service/hid/hid.cpp
View file

@ -16,6 +16,8 @@
#include "video_core/video_core.h" #include "video_core/video_core.h"
#include "input_common/input_common.h"
namespace Service { namespace Service {
namespace HID { namespace HID {
@ -49,7 +51,7 @@ static u32 next_touch_index;
void Update() { void Update() {
SharedMem* mem = reinterpret_cast<SharedMem*>(shared_mem->GetPointer()); SharedMem* mem = reinterpret_cast<SharedMem*>(shared_mem->GetPointer());
const PadState state = VideoCore::g_emu_window->GetPadState(); const PadState state = (InputCommon::g_user_input == nullptr) ? VideoCore::g_emu_window->GetPadState() : InputCommon::g_user_input->GetPadState();
if (mem == nullptr) { if (mem == nullptr) {
LOG_DEBUG(Service_HID, "Cannot update HID prior to mapping shared memory!"); LOG_DEBUG(Service_HID, "Cannot update HID prior to mapping shared memory!");