diff options
author | bunnei <bunneidev@gmail.com> | 2020-01-24 02:18:47 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-01-24 02:18:47 +0100 |
commit | deb97f6a8e48c17f8e16efadc24872a860d529a7 (patch) | |
tree | 79ca6164fcb03783bc19f1ec557cacdf0b3fc539 /src/input_common/main.cpp | |
parent | Merge pull request #3341 from bunnei/time-posix-myrule (diff) | |
parent | Replace GetString with Get function (diff) | |
download | yuzu-deb97f6a8e48c17f8e16efadc24872a860d529a7.tar yuzu-deb97f6a8e48c17f8e16efadc24872a860d529a7.tar.gz yuzu-deb97f6a8e48c17f8e16efadc24872a860d529a7.tar.bz2 yuzu-deb97f6a8e48c17f8e16efadc24872a860d529a7.tar.lz yuzu-deb97f6a8e48c17f8e16efadc24872a860d529a7.tar.xz yuzu-deb97f6a8e48c17f8e16efadc24872a860d529a7.tar.zst yuzu-deb97f6a8e48c17f8e16efadc24872a860d529a7.zip |
Diffstat (limited to '')
-rw-r--r-- | src/input_common/main.cpp | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/src/input_common/main.cpp b/src/input_common/main.cpp index 8e66c1b15..9e028da89 100644 --- a/src/input_common/main.cpp +++ b/src/input_common/main.cpp @@ -9,6 +9,7 @@ #include "input_common/keyboard.h" #include "input_common/main.h" #include "input_common/motion_emu.h" +#include "input_common/udp/udp.h" #ifdef HAVE_SDL2 #include "input_common/sdl/sdl.h" #endif @@ -18,6 +19,7 @@ namespace InputCommon { static std::shared_ptr<Keyboard> keyboard; static std::shared_ptr<MotionEmu> motion_emu; static std::unique_ptr<SDL::State> sdl; +static std::unique_ptr<CemuhookUDP::State> udp; void Init() { keyboard = std::make_shared<Keyboard>(); @@ -28,6 +30,8 @@ void Init() { Input::RegisterFactory<Input::MotionDevice>("motion_emu", motion_emu); sdl = SDL::Init(); + + udp = CemuhookUDP::Init(); } void Shutdown() { @@ -72,11 +76,13 @@ std::string GenerateAnalogParamFromKeys(int key_up, int key_down, int key_left, namespace Polling { std::vector<std::unique_ptr<DevicePoller>> GetPollers(DeviceType type) { + std::vector<std::unique_ptr<DevicePoller>> pollers; + #ifdef HAVE_SDL2 - return sdl->GetPollers(type); -#else - return {}; + pollers = sdl->GetPollers(type); #endif + + return pollers; } } // namespace Polling |