summaryrefslogtreecommitdiff
path: root/src/input_common/main.cpp
diff options
context:
space:
mode:
authorGravatar german772021-06-19 14:38:49 -0500
committerGravatar MonsterDruide12021-09-18 23:22:30 +0200
commitc01a872c8efa90065b6ba1a74079ddf6ec12058f (patch)
treed441117b0d133bff32b39f5060b31db57bc0413f /src/input_common/main.cpp
parentcore: Hacky TAS syncing & load pausing (diff)
downloadyuzu-c01a872c8efa90065b6ba1a74079ddf6ec12058f.tar.gz
yuzu-c01a872c8efa90065b6ba1a74079ddf6ec12058f.tar.xz
yuzu-c01a872c8efa90065b6ba1a74079ddf6ec12058f.zip
config: Move TAS options to it's own menu
Diffstat (limited to '')
-rw-r--r--src/input_common/main.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/input_common/main.cpp b/src/input_common/main.cpp
index 4f170493e..3b9906b53 100644
--- a/src/input_common/main.cpp
+++ b/src/input_common/main.cpp
@@ -5,6 +5,7 @@
5#include <memory> 5#include <memory>
6#include <thread> 6#include <thread>
7#include "common/param_package.h" 7#include "common/param_package.h"
8#include "common/settings.h"
8#include "input_common/analog_from_button.h" 9#include "input_common/analog_from_button.h"
9#include "input_common/gcadapter/gc_adapter.h" 10#include "input_common/gcadapter/gc_adapter.h"
10#include "input_common/gcadapter/gc_poller.h" 11#include "input_common/gcadapter/gc_poller.h"
@@ -114,8 +115,11 @@ struct InputSubsystem::Impl {
114 std::vector<Common::ParamPackage> devices = { 115 std::vector<Common::ParamPackage> devices = {
115 Common::ParamPackage{{"display", "Any"}, {"class", "any"}}, 116 Common::ParamPackage{{"display", "Any"}, {"class", "any"}},
116 Common::ParamPackage{{"display", "Keyboard/Mouse"}, {"class", "keyboard"}}, 117 Common::ParamPackage{{"display", "Keyboard/Mouse"}, {"class", "keyboard"}},
117 Common::ParamPackage{{"display", "TAS"}, {"class", "tas"}},
118 }; 118 };
119 if (Settings::values.tas_enable) {
120 devices.push_back(
121 Common::ParamPackage{{"display", "TAS Controller"}, {"class", "tas"}});
122 }
119#ifdef HAVE_SDL2 123#ifdef HAVE_SDL2
120 auto sdl_devices = sdl->GetInputDevices(); 124 auto sdl_devices = sdl->GetInputDevices();
121 devices.insert(devices.end(), sdl_devices.begin(), sdl_devices.end()); 125 devices.insert(devices.end(), sdl_devices.begin(), sdl_devices.end());