From 02fd19b2f60f4db8a683734e4300d7498c861309 Mon Sep 17 00:00:00 2001
From: Kevin Hartman <kevin@hart.mn>
Date: Mon, 8 Sep 2014 21:46:02 -0700
Subject: Added support for multiple input device types for KeyMap and
connected Qt.
---
src/common/key_map.cpp | 18 +++++++++++-------
1 file changed, 11 insertions(+), 7 deletions(-)
(limited to 'src/common/key_map.cpp')
diff --git a/src/common/key_map.cpp b/src/common/key_map.cpp
index 5941a105b8..309caab986 100644
--- a/src/common/key_map.cpp
+++ b/src/common/key_map.cpp
@@ -1,21 +1,25 @@
-// Copyright 2013 Dolphin Emulator Project
+// Copyright 2014 Citra Emulator Project
// Licensed under GPLv2
// Refer to the license.txt file included.
#include "key_map.h"
#include <map>
-
namespace KeyMap {
-std::map<CitraKey, HID_User::PADState> g_key_map;
+static std::map<HostDeviceKey, HID_User::PadState> key_map;
+static int next_device_id = 0;
+
+int NewDeviceId() {
+ return next_device_id++;
+}
-void SetKeyMapping(CitraKey key, HID_User::PADState padState) {
- g_key_map[key].hex = padState.hex;
+void SetKeyMapping(HostDeviceKey key, HID_User::PadState padState) {
+ key_map[key].hex = padState.hex;
}
-HID_User::PADState Get3DSKey(CitraKey key) {
- return g_key_map[key];
+HID_User::PadState GetPadKey(HostDeviceKey key) {
+ return key_map[key];
}
}
--
cgit v1.2.3-70-g09d2