diff options
| author | 2020-07-04 10:05:59 -0400 | |
|---|---|---|
| committer | 2020-07-04 10:05:59 -0400 | |
| commit | 9f8e17cb185d0d769ab81ef8de906cef37947ea5 (patch) | |
| tree | 0ae185ce3ef43ef9b085aae7b9ad5abb04e3d239 /src/input_common/main.cpp | |
| parent | Merge pull request #4218 from ogniK5377/opus-external (diff) | |
| parent | Fix merge conflicts? (diff) | |
| download | yuzu-9f8e17cb185d0d769ab81ef8de906cef37947ea5.tar.gz yuzu-9f8e17cb185d0d769ab81ef8de906cef37947ea5.tar.xz yuzu-9f8e17cb185d0d769ab81ef8de906cef37947ea5.zip | |
Merge pull request #4137 from ameerj/master
GC Adapter Implementation
Diffstat (limited to 'src/input_common/main.cpp')
| -rw-r--r-- | src/input_common/main.cpp | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/src/input_common/main.cpp b/src/input_common/main.cpp index 95e351e24..fd0af1019 100644 --- a/src/input_common/main.cpp +++ b/src/input_common/main.cpp | |||
| @@ -4,8 +4,11 @@ | |||
| 4 | 4 | ||
| 5 | #include <memory> | 5 | #include <memory> |
| 6 | #include <thread> | 6 | #include <thread> |
| 7 | #include <libusb.h> | ||
| 7 | #include "common/param_package.h" | 8 | #include "common/param_package.h" |
| 8 | #include "input_common/analog_from_button.h" | 9 | #include "input_common/analog_from_button.h" |
| 10 | #include "input_common/gcadapter/gc_adapter.h" | ||
| 11 | #include "input_common/gcadapter/gc_poller.h" | ||
| 9 | #include "input_common/keyboard.h" | 12 | #include "input_common/keyboard.h" |
| 10 | #include "input_common/main.h" | 13 | #include "input_common/main.h" |
| 11 | #include "input_common/motion_emu.h" | 14 | #include "input_common/motion_emu.h" |
| @@ -22,8 +25,16 @@ static std::shared_ptr<MotionEmu> motion_emu; | |||
| 22 | static std::unique_ptr<SDL::State> sdl; | 25 | static std::unique_ptr<SDL::State> sdl; |
| 23 | #endif | 26 | #endif |
| 24 | static std::unique_ptr<CemuhookUDP::State> udp; | 27 | static std::unique_ptr<CemuhookUDP::State> udp; |
| 28 | static std::shared_ptr<GCButtonFactory> gcbuttons; | ||
| 29 | static std::shared_ptr<GCAnalogFactory> gcanalog; | ||
| 25 | 30 | ||
| 26 | void Init() { | 31 | void Init() { |
| 32 | auto gcadapter = std::make_shared<GCAdapter::Adapter>(); | ||
| 33 | gcbuttons = std::make_shared<GCButtonFactory>(gcadapter); | ||
| 34 | Input::RegisterFactory<Input::ButtonDevice>("gcpad", gcbuttons); | ||
| 35 | gcanalog = std::make_shared<GCAnalogFactory>(gcadapter); | ||
| 36 | Input::RegisterFactory<Input::AnalogDevice>("gcpad", gcanalog); | ||
| 37 | |||
| 27 | keyboard = std::make_shared<Keyboard>(); | 38 | keyboard = std::make_shared<Keyboard>(); |
| 28 | Input::RegisterFactory<Input::ButtonDevice>("keyboard", keyboard); | 39 | Input::RegisterFactory<Input::ButtonDevice>("keyboard", keyboard); |
| 29 | Input::RegisterFactory<Input::AnalogDevice>("analog_from_button", | 40 | Input::RegisterFactory<Input::AnalogDevice>("analog_from_button", |
| @@ -48,6 +59,11 @@ void Shutdown() { | |||
| 48 | sdl.reset(); | 59 | sdl.reset(); |
| 49 | #endif | 60 | #endif |
| 50 | udp.reset(); | 61 | udp.reset(); |
| 62 | Input::UnregisterFactory<Input::ButtonDevice>("gcpad"); | ||
| 63 | Input::UnregisterFactory<Input::AnalogDevice>("gcpad"); | ||
| 64 | |||
| 65 | gcbuttons.reset(); | ||
| 66 | gcanalog.reset(); | ||
| 51 | } | 67 | } |
| 52 | 68 | ||
| 53 | Keyboard* GetKeyboard() { | 69 | Keyboard* GetKeyboard() { |
| @@ -58,6 +74,14 @@ MotionEmu* GetMotionEmu() { | |||
| 58 | return motion_emu.get(); | 74 | return motion_emu.get(); |
| 59 | } | 75 | } |
| 60 | 76 | ||
| 77 | GCButtonFactory* GetGCButtons() { | ||
| 78 | return gcbuttons.get(); | ||
| 79 | } | ||
| 80 | |||
| 81 | GCAnalogFactory* GetGCAnalogs() { | ||
| 82 | return gcanalog.get(); | ||
| 83 | } | ||
| 84 | |||
| 61 | std::string GenerateKeyboardParam(int key_code) { | 85 | std::string GenerateKeyboardParam(int key_code) { |
| 62 | Common::ParamPackage param{ | 86 | Common::ParamPackage param{ |
| 63 | {"engine", "keyboard"}, | 87 | {"engine", "keyboard"}, |