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.h | |
| 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.h')
| -rw-r--r-- | src/input_common/main.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/input_common/main.h b/src/input_common/main.h index 77a0ce90b..0e32856f6 100644 --- a/src/input_common/main.h +++ b/src/input_common/main.h | |||
| @@ -7,6 +7,7 @@ | |||
| 7 | #include <memory> | 7 | #include <memory> |
| 8 | #include <string> | 8 | #include <string> |
| 9 | #include <vector> | 9 | #include <vector> |
| 10 | #include "input_common/gcadapter/gc_poller.h" | ||
| 10 | 11 | ||
| 11 | namespace Common { | 12 | namespace Common { |
| 12 | class ParamPackage; | 13 | class ParamPackage; |
| @@ -30,6 +31,10 @@ class MotionEmu; | |||
| 30 | /// Gets the motion emulation factory. | 31 | /// Gets the motion emulation factory. |
| 31 | MotionEmu* GetMotionEmu(); | 32 | MotionEmu* GetMotionEmu(); |
| 32 | 33 | ||
| 34 | GCButtonFactory* GetGCButtons(); | ||
| 35 | |||
| 36 | GCAnalogFactory* GetGCAnalogs(); | ||
| 37 | |||
| 33 | /// Generates a serialized param package for creating a keyboard button device | 38 | /// Generates a serialized param package for creating a keyboard button device |
| 34 | std::string GenerateKeyboardParam(int key_code); | 39 | std::string GenerateKeyboardParam(int key_code); |
| 35 | 40 | ||