diff options
| author | LC <mathew1800@gmail.com> | 2020-08-28 20:10:33 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-28 20:10:33 -0400 |
| commit | 57d9ef5a899dd32be7bae5aaeb53bc7cd2766a78 (patch) | |
| tree | 32ad64a7368d1f7f0506e3a0308fc939accdd4e0 /src | |
| parent | 1c9a1de30dc7ba19b736f906b64dfd64c7aa9cf5 (diff) | |
| parent | 98f5d8a713966e960f0e4d4f520b67786ebad9d9 (diff) | |
Merge pull request #4600 from lioncash/prototype
input_common/main: Remove unimplemented prototype
Diffstat (limited to 'src')
| -rw-r--r-- | src/input_common/main.h | 13 | ||||
| -rw-r--r-- | src/input_common/sdl/sdl_impl.cpp | 2 | ||||
| -rw-r--r-- | src/input_common/settings.h | 4 |
3 files changed, 11 insertions, 8 deletions
diff --git a/src/input_common/main.h b/src/input_common/main.h index f66308163d..58e5dc2500 100644 --- a/src/input_common/main.h +++ b/src/input_common/main.h @@ -8,13 +8,19 @@ #include <string> #include <unordered_map> #include <vector> -#include "input_common/gcadapter/gc_poller.h" -#include "input_common/settings.h" namespace Common { class ParamPackage; } +namespace Settings::NativeAnalog { +enum Values : int; +} + +namespace Settings::NativeButton { +enum Values : int; +} + namespace InputCommon { namespace Polling { @@ -40,9 +46,6 @@ public: */ virtual Common::ParamPackage GetNextInput() = 0; }; - -// Get all DevicePoller from all backends for a specific device type -std::vector<std::unique_ptr<DevicePoller>> GetPollers(DeviceType type); } // namespace Polling class GCAnalogFactory; diff --git a/src/input_common/sdl/sdl_impl.cpp b/src/input_common/sdl/sdl_impl.cpp index 7605c884dc..c8d9eb2bca 100644 --- a/src/input_common/sdl/sdl_impl.cpp +++ b/src/input_common/sdl/sdl_impl.cpp @@ -17,11 +17,11 @@ #include <vector> #include <SDL.h> #include "common/logging/log.h" -#include "common/math_util.h" #include "common/param_package.h" #include "common/threadsafe_queue.h" #include "core/frontend/input.h" #include "input_common/sdl/sdl_impl.h" +#include "input_common/settings.h" namespace InputCommon::SDL { diff --git a/src/input_common/settings.h b/src/input_common/settings.h index 8e481a7fe5..2d258960b5 100644 --- a/src/input_common/settings.h +++ b/src/input_common/settings.h @@ -10,7 +10,7 @@ namespace Settings { namespace NativeButton { -enum Values { +enum Values : int { A, B, X, @@ -52,7 +52,7 @@ extern const std::array<const char*, NumButtons> mapping; } // namespace NativeButton namespace NativeAnalog { -enum Values { +enum Values : int { LStick, RStick, |