summaryrefslogtreecommitdiff
path: root/src/input_common/main.cpp
diff options
context:
space:
mode:
authorGravatar Morph2020-08-15 15:26:29 -0400
committerGravatar Morph2020-08-26 02:32:32 -0400
commitefa0b7a056b73dffb8789c95ebf8a9c09e55f539 (patch)
tree52d74b2708105c14c086cddafed83b6f4eb98f7c /src/input_common/main.cpp
parentqt_themes: Fix Midnight Blue theme (diff)
downloadyuzu-efa0b7a056b73dffb8789c95ebf8a9c09e55f539.tar.gz
yuzu-efa0b7a056b73dffb8789c95ebf8a9c09e55f539.tar.xz
yuzu-efa0b7a056b73dffb8789c95ebf8a9c09e55f539.zip
Address feedback
Diffstat (limited to 'src/input_common/main.cpp')
-rw-r--r--src/input_common/main.cpp15
1 files changed, 8 insertions, 7 deletions
diff --git a/src/input_common/main.cpp b/src/input_common/main.cpp
index b8725e9af..7bad2c45b 100644
--- a/src/input_common/main.cpp
+++ b/src/input_common/main.cpp
@@ -118,37 +118,38 @@ std::vector<Common::ParamPackage> GetInputDevices() {
118 118
119std::unordered_map<Settings::NativeButton::Values, Common::ParamPackage> GetButtonMappingForDevice( 119std::unordered_map<Settings::NativeButton::Values, Common::ParamPackage> GetButtonMappingForDevice(
120 const Common::ParamPackage& params) { 120 const Common::ParamPackage& params) {
121 std::unordered_map<Settings::NativeButton::Values, Common::ParamPackage> mappings{}; 121 std::unordered_map<Settings::NativeButton::Values, Common::ParamPackage> mappings;
122 if (!params.Has("class") || params.Get("class", "") == "any") { 122 if (!params.Has("class") || params.Get("class", "") == "any") {
123 return mappings; 123 return {};
124 } 124 }
125 if (params.Get("class", "") == "key") { 125 if (params.Get("class", "") == "key") {
126 // TODO consider returning the SDL key codes for the default keybindings 126 // TODO consider returning the SDL key codes for the default keybindings
127 return {};
127 } 128 }
128#ifdef HAVE_SDL2 129#ifdef HAVE_SDL2
129 if (params.Get("class", "") == "sdl") { 130 if (params.Get("class", "") == "sdl") {
130 return sdl->GetButtonMappingForDevice(params); 131 return sdl->GetButtonMappingForDevice(params);
131 } 132 }
132#endif 133#endif
133 return mappings; 134 return {};
134} 135}
135 136
136std::unordered_map<Settings::NativeAnalog::Values, Common::ParamPackage> GetAnalogMappingForDevice( 137std::unordered_map<Settings::NativeAnalog::Values, Common::ParamPackage> GetAnalogMappingForDevice(
137 const Common::ParamPackage& params) { 138 const Common::ParamPackage& params) {
138 std::unordered_map<Settings::NativeAnalog::Values, Common::ParamPackage> mappings{}; 139 std::unordered_map<Settings::NativeAnalog::Values, Common::ParamPackage> mappings;
139 if (!params.Has("class") || params.Get("class", "") == "any") { 140 if (!params.Has("class") || params.Get("class", "") == "any") {
140 return mappings; 141 return {};
141 } 142 }
142 if (params.Get("class", "") == "key") { 143 if (params.Get("class", "") == "key") {
143 // TODO consider returning the SDL key codes for the default keybindings 144 // TODO consider returning the SDL key codes for the default keybindings
144 return mappings; 145 return {};
145 } 146 }
146#ifdef HAVE_SDL2 147#ifdef HAVE_SDL2
147 if (params.Get("class", "") == "sdl") { 148 if (params.Get("class", "") == "sdl") {
148 return sdl->GetAnalogMappingForDevice(params); 149 return sdl->GetAnalogMappingForDevice(params);
149 } 150 }
150#endif 151#endif
151 return mappings; 152 return {};
152} 153}
153 154
154namespace Polling { 155namespace Polling {