summaryrefslogtreecommitdiff
path: root/src/input_common/main.cpp
diff options
context:
space:
mode:
authorGravatar Morph2020-09-28 10:27:29 -0400
committerGravatar Morph2020-11-15 23:33:20 -0500
commitceb7b11f166a4e59945a6296d364980c37ca681e (patch)
treecab0edaef1c2eb29b7ac09470d27aedc894410f3 /src/input_common/main.cpp
parentsettings: Preparation for per-game input settings (diff)
downloadyuzu-ceb7b11f166a4e59945a6296d364980c37ca681e.tar.gz
yuzu-ceb7b11f166a4e59945a6296d364980c37ca681e.tar.xz
yuzu-ceb7b11f166a4e59945a6296d364980c37ca681e.zip
configure_input_player: Change "Defaults" button behavior
RestoreDefaults() now restores the selected devices' mappings using UpdateMappingWithDefaults(). This allows us to move the keyboard mapping from RestoreDefaults() to UpdateMappingWithDefaults().
Diffstat (limited to 'src/input_common/main.cpp')
-rw-r--r--src/input_common/main.cpp8
1 files changed, 0 insertions, 8 deletions
diff --git a/src/input_common/main.cpp b/src/input_common/main.cpp
index 354c734fe..b438482cc 100644
--- a/src/input_common/main.cpp
+++ b/src/input_common/main.cpp
@@ -96,10 +96,6 @@ struct InputSubsystem::Impl {
96 if (!params.Has("class") || params.Get("class", "") == "any") { 96 if (!params.Has("class") || params.Get("class", "") == "any") {
97 return {}; 97 return {};
98 } 98 }
99 if (params.Get("class", "") == "keyboard") {
100 // TODO consider returning the SDL key codes for the default keybindings
101 return {};
102 }
103 if (params.Get("class", "") == "gcpad") { 99 if (params.Get("class", "") == "gcpad") {
104 return gcadapter->GetAnalogMappingForDevice(params); 100 return gcadapter->GetAnalogMappingForDevice(params);
105 } 101 }
@@ -116,10 +112,6 @@ struct InputSubsystem::Impl {
116 if (!params.Has("class") || params.Get("class", "") == "any") { 112 if (!params.Has("class") || params.Get("class", "") == "any") {
117 return {}; 113 return {};
118 } 114 }
119 if (params.Get("class", "") == "keyboard") {
120 // TODO consider returning the SDL key codes for the default keybindings
121 return {};
122 }
123 if (params.Get("class", "") == "gcpad") { 115 if (params.Get("class", "") == "gcpad") {
124 return gcadapter->GetButtonMappingForDevice(params); 116 return gcadapter->GetButtonMappingForDevice(params);
125 } 117 }