From 0248614add99c1df1bc7c9ff97091f678ff75aca Mon Sep 17 00:00:00 2001 From: Ameer Date: Sun, 21 Jun 2020 12:36:28 -0400 Subject: GC Adapter Implementation --- src/input_common/main.h | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'src/input_common/main.h') diff --git a/src/input_common/main.h b/src/input_common/main.h index 77a0ce90b..be2e7a6c4 100644 --- a/src/input_common/main.h +++ b/src/input_common/main.h @@ -7,6 +7,8 @@ #include #include #include +#include "input_common/gcadapter/gc_poller.h" +#include "input_common/gcadapter/gc_adapter.h" namespace Common { class ParamPackage; @@ -30,6 +32,13 @@ class MotionEmu; /// Gets the motion emulation factory. MotionEmu* GetMotionEmu(); +class GCButtonFactory; +class GCAnalogFactory; + +GCButtonFactory* GetGCButtons(); +GCAnalogFactory* GetGCAnalogs(); + + /// Generates a serialized param package for creating a keyboard button device std::string GenerateKeyboardParam(int key_code); -- cgit v1.2.3 From c94583d867fd909d8731ba50e085352aae0e6885 Mon Sep 17 00:00:00 2001 From: Ameer Date: Sun, 21 Jun 2020 15:31:57 -0400 Subject: Clang Formatting --- src/input_common/main.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'src/input_common/main.h') diff --git a/src/input_common/main.h b/src/input_common/main.h index be2e7a6c4..9e1528c88 100644 --- a/src/input_common/main.h +++ b/src/input_common/main.h @@ -7,8 +7,8 @@ #include #include #include -#include "input_common/gcadapter/gc_poller.h" #include "input_common/gcadapter/gc_adapter.h" +#include "input_common/gcadapter/gc_poller.h" namespace Common { class ParamPackage; @@ -38,7 +38,6 @@ class GCAnalogFactory; GCButtonFactory* GetGCButtons(); GCAnalogFactory* GetGCAnalogs(); - /// Generates a serialized param package for creating a keyboard button device std::string GenerateKeyboardParam(int key_code); -- cgit v1.2.3 From 121af3646dad0f80453d2ffffa688dd4435d3acc Mon Sep 17 00:00:00 2001 From: Ameer Date: Sun, 21 Jun 2020 18:43:01 -0400 Subject: Singleton GC Adapter class, remove globals, fix naming convention Fix clang formatting Manual fix for configure_input_player formatting Add missing lib usb cmake command --- src/input_common/main.h | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'src/input_common/main.h') diff --git a/src/input_common/main.h b/src/input_common/main.h index 9e1528c88..c26222f21 100644 --- a/src/input_common/main.h +++ b/src/input_common/main.h @@ -32,10 +32,8 @@ class MotionEmu; /// Gets the motion emulation factory. MotionEmu* GetMotionEmu(); -class GCButtonFactory; -class GCAnalogFactory; - GCButtonFactory* GetGCButtons(); + GCAnalogFactory* GetGCAnalogs(); /// Generates a serialized param package for creating a keyboard button device -- cgit v1.2.3 From 28046ae3a9cd5e32c7cae1cf64aa005502bf1749 Mon Sep 17 00:00:00 2001 From: Ameer Date: Sun, 21 Jun 2020 23:56:56 -0400 Subject: Tidy up the pointers, use pair over tuple where appropriate --- src/input_common/main.h | 1 - 1 file changed, 1 deletion(-) (limited to 'src/input_common/main.h') diff --git a/src/input_common/main.h b/src/input_common/main.h index c26222f21..0e32856f6 100644 --- a/src/input_common/main.h +++ b/src/input_common/main.h @@ -7,7 +7,6 @@ #include #include #include -#include "input_common/gcadapter/gc_adapter.h" #include "input_common/gcadapter/gc_poller.h" namespace Common { -- cgit v1.2.3