summaryrefslogtreecommitdiffstats
path: root/src/common
diff options
context:
space:
mode:
authorarchshift <admin@archshift.com>2015-01-19 00:07:48 +0100
committerarchshift <admin@archshift.com>2015-01-21 22:31:10 +0100
commit1f109c6b497565afe99b9c9cfbb61de5a87e7374 (patch)
tree9eaedc4e6d764f3436a45ba05e79f16fec1ff299 /src/common
parentMerge pull request #429 from Kingcom/titlebar (diff)
downloadyuzu-1f109c6b497565afe99b9c9cfbb61de5a87e7374.tar
yuzu-1f109c6b497565afe99b9c9cfbb61de5a87e7374.tar.gz
yuzu-1f109c6b497565afe99b9c9cfbb61de5a87e7374.tar.bz2
yuzu-1f109c6b497565afe99b9c9cfbb61de5a87e7374.tar.lz
yuzu-1f109c6b497565afe99b9c9cfbb61de5a87e7374.tar.xz
yuzu-1f109c6b497565afe99b9c9cfbb61de5a87e7374.tar.zst
yuzu-1f109c6b497565afe99b9c9cfbb61de5a87e7374.zip
Diffstat (limited to '')
-rw-r--r--src/common/emu_window.cpp8
-rw-r--r--src/common/key_map.cpp6
-rw-r--r--src/common/key_map.h6
3 files changed, 10 insertions, 10 deletions
diff --git a/src/common/emu_window.cpp b/src/common/emu_window.cpp
index 4ec7b263a..48bb35db5 100644
--- a/src/common/emu_window.cpp
+++ b/src/common/emu_window.cpp
@@ -5,13 +5,13 @@
#include "emu_window.h"
void EmuWindow::KeyPressed(KeyMap::HostDeviceKey key) {
- HID_User::PadState mapped_key = KeyMap::GetPadKey(key);
+ Service::HID::PadState mapped_key = KeyMap::GetPadKey(key);
- HID_User::PadButtonPress(mapped_key);
+ Service::HID::PadButtonPress(mapped_key);
}
void EmuWindow::KeyReleased(KeyMap::HostDeviceKey key) {
- HID_User::PadState mapped_key = KeyMap::GetPadKey(key);
+ Service::HID::PadState mapped_key = KeyMap::GetPadKey(key);
- HID_User::PadButtonRelease(mapped_key);
+ Service::HID::PadButtonRelease(mapped_key);
}
diff --git a/src/common/key_map.cpp b/src/common/key_map.cpp
index d8945bb13..844d5df68 100644
--- a/src/common/key_map.cpp
+++ b/src/common/key_map.cpp
@@ -7,18 +7,18 @@
namespace KeyMap {
-static std::map<HostDeviceKey, HID_User::PadState> key_map;
+static std::map<HostDeviceKey, Service::HID::PadState> key_map;
static int next_device_id = 0;
int NewDeviceId() {
return next_device_id++;
}
-void SetKeyMapping(HostDeviceKey key, HID_User::PadState padState) {
+void SetKeyMapping(HostDeviceKey key, Service::HID::PadState padState) {
key_map[key].hex = padState.hex;
}
-HID_User::PadState GetPadKey(HostDeviceKey key) {
+Service::HID::PadState GetPadKey(HostDeviceKey key) {
return key_map[key];
}
diff --git a/src/common/key_map.h b/src/common/key_map.h
index 8d949b852..0ecec714f 100644
--- a/src/common/key_map.h
+++ b/src/common/key_map.h
@@ -4,7 +4,7 @@
#pragma once
-#include "core/hle/service/hid_user.h"
+#include "core/hle/service/hid/hid.h"
namespace KeyMap {
@@ -35,11 +35,11 @@ int NewDeviceId();
/**
* Maps a device-specific key to a PadState.
*/
-void SetKeyMapping(HostDeviceKey key, HID_User::PadState padState);
+void SetKeyMapping(HostDeviceKey key, Service::HID::PadState padState);
/**
* Gets the PadState that's mapped to the provided device-specific key.
*/
-HID_User::PadState GetPadKey(HostDeviceKey key);
+Service::HID::PadState GetPadKey(HostDeviceKey key);
}