diff options
| author | german77 <juangerman-13@hotmail.com> | 2021-09-02 01:48:01 +0200 |
|---|---|---|
| committer | german77 <juangerman-13@hotmail.com> | 2021-09-10 07:58:12 +0200 |
| commit | 5798537ce431481f44e3335a1a291b733bd719ad (patch) | |
| tree | 16aa3dcf2c0f76b74ac47b22feb7b23ac10b3280 /src/input_common | |
| parent | Merge pull request #6965 from bunnei/cpu_manager_jthread (diff) | |
| download | yuzu-5798537ce431481f44e3335a1a291b733bd719ad.tar yuzu-5798537ce431481f44e3335a1a291b733bd719ad.tar.gz yuzu-5798537ce431481f44e3335a1a291b733bd719ad.tar.bz2 yuzu-5798537ce431481f44e3335a1a291b733bd719ad.tar.lz yuzu-5798537ce431481f44e3335a1a291b733bd719ad.tar.xz yuzu-5798537ce431481f44e3335a1a291b733bd719ad.tar.zst yuzu-5798537ce431481f44e3335a1a291b733bd719ad.zip | |
Diffstat (limited to 'src/input_common')
| -rw-r--r-- | src/input_common/sdl/sdl_impl.cpp | 12 | ||||
| -rw-r--r-- | src/input_common/udp/client.h | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/input_common/sdl/sdl_impl.cpp b/src/input_common/sdl/sdl_impl.cpp index f102410d1..03888b7cb 100644 --- a/src/input_common/sdl/sdl_impl.cpp +++ b/src/input_common/sdl/sdl_impl.cpp @@ -21,7 +21,7 @@ #include "common/logging/log.h" #include "common/math_util.h" #include "common/param_package.h" -#include "common/settings_input.h" +#include "common/settings.h" #include "common/threadsafe_queue.h" #include "core/frontend/input.h" #include "input_common/motion_input.h" @@ -889,8 +889,10 @@ SDLState::SDLState() { RegisterFactory<VibrationDevice>("sdl", vibration_factory); RegisterFactory<MotionDevice>("sdl", motion_factory); - // Disable raw input. When enabled this setting causes SDL to die when a web applet opens - SDL_SetHint(SDL_HINT_JOYSTICK_RAWINPUT, "0"); + if (!Settings::values.enable_raw_input) { + // Disable raw input. When enabled this setting causes SDL to die when a web applet opens + SDL_SetHint(SDL_HINT_JOYSTICK_RAWINPUT, "0"); + } // Enable HIDAPI rumble. This prevents SDL from disabling motion on PS4 and PS5 controllers SDL_SetHint(SDL_HINT_JOYSTICK_HIDAPI_PS4_RUMBLE, "1"); @@ -898,10 +900,10 @@ SDLState::SDLState() { // Tell SDL2 to use the hidapi driver. This will allow joycons to be detected as a // GameController and not a generic one - SDL_SetHint("SDL_JOYSTICK_HIDAPI_JOY_CONS", "1"); + SDL_SetHint(SDL_HINT_JOYSTICK_HIDAPI_JOY_CONS, "1"); // Turn off Pro controller home led - SDL_SetHint("SDL_JOYSTICK_HIDAPI_SWITCH_HOME_LED", "0"); + SDL_SetHint(SDL_HINT_JOYSTICK_HIDAPI_SWITCH_HOME_LED, "0"); // If the frontend is going to manage the event loop, then we don't start one here start_thread = SDL_WasInit(SDL_INIT_JOYSTICK) == 0; diff --git a/src/input_common/udp/client.h b/src/input_common/udp/client.h index a11ea3068..380f9bb76 100644 --- a/src/input_common/udp/client.h +++ b/src/input_common/udp/client.h @@ -21,8 +21,6 @@ namespace InputCommon::CemuhookUDP { -constexpr char DEFAULT_SRV[] = "127.0.0.1:26760"; - class Socket; namespace Response { |