summaryrefslogtreecommitdiff
path: root/src/core/settings.h
diff options
context:
space:
mode:
authorGravatar wwylele2017-01-28 12:33:35 +0200
committerGravatar wwylele2017-03-01 23:30:57 +0200
commite02c4b71955021ecca294015aaf331add8d5c554 (patch)
tree9c3361df17c147453ba1e13c5a4f080b5e05c235 /src/core/settings.h
parentQt: rework input configuration for new input system (diff)
downloadyuzu-e02c4b71955021ecca294015aaf331add8d5c554.tar.gz
yuzu-e02c4b71955021ecca294015aaf331add8d5c554.tar.xz
yuzu-e02c4b71955021ecca294015aaf331add8d5c554.zip
Input: remove unused stuff & clean up
1. removed zl, zr and c-stick from HID::PadState. They are handled by IR, not HID 2. removed button handling in EmuWindow 3. removed key_map 4. cleanup #include
Diffstat (limited to 'src/core/settings.h')
-rw-r--r--src/core/settings.h54
1 files changed, 0 insertions, 54 deletions
diff --git a/src/core/settings.h b/src/core/settings.h
index 4f83d285c..d1a9f0da8 100644
--- a/src/core/settings.h
+++ b/src/core/settings.h
@@ -18,57 +18,6 @@ enum class LayoutOption {
18 Custom, 18 Custom,
19}; 19};
20 20
21namespace NativeInput {
22
23enum Values {
24 // directly mapped keys
25 A,
26 B,
27 X,
28 Y,
29 L,
30 R,
31 ZL,
32 ZR,
33 START,
34 SELECT,
35 HOME,
36 DUP,
37 DDOWN,
38 DLEFT,
39 DRIGHT,
40 CUP,
41 CDOWN,
42 CLEFT,
43 CRIGHT,
44
45 // indirectly mapped keys
46 CIRCLE_UP,
47 CIRCLE_DOWN,
48 CIRCLE_LEFT,
49 CIRCLE_RIGHT,
50 CIRCLE_MODIFIER,
51
52 NUM_INPUTS
53};
54
55static const std::array<const char*, NUM_INPUTS> Mapping = {{
56 // directly mapped keys
57 "pad_a", "pad_b", "pad_x", "pad_y", "pad_l", "pad_r", "pad_zl", "pad_zr", "pad_start",
58 "pad_select", "pad_home", "pad_dup", "pad_ddown", "pad_dleft", "pad_dright", "pad_cup",
59 "pad_cdown", "pad_cleft", "pad_cright",
60
61 // indirectly mapped keys
62 "pad_circle_up", "pad_circle_down", "pad_circle_left", "pad_circle_right",
63 "pad_circle_modifier",
64}};
65static const std::array<Values, NUM_INPUTS> All = {{
66 A, B, X, Y, L, R, ZL, ZR,
67 START, SELECT, HOME, DUP, DDOWN, DLEFT, DRIGHT, CUP,
68 CDOWN, CLEFT, CRIGHT, CIRCLE_UP, CIRCLE_DOWN, CIRCLE_LEFT, CIRCLE_RIGHT, CIRCLE_MODIFIER,
69}};
70}
71
72namespace NativeButton { 21namespace NativeButton {
73enum Values { 22enum Values {
74 A, 23 A,
@@ -129,9 +78,6 @@ struct Values {
129 bool is_new_3ds; 78 bool is_new_3ds;
130 79
131 // Controls 80 // Controls
132 std::array<int, NativeInput::NUM_INPUTS> input_mappings;
133 float pad_circle_modifier_scale;
134
135 std::array<std::string, NativeButton::NumButtons> buttons; 81 std::array<std::string, NativeButton::NumButtons> buttons;
136 std::array<std::string, NativeAnalog::NumAnalogs> analogs; 82 std::array<std::string, NativeAnalog::NumAnalogs> analogs;
137 83