diff --git a/src/core/system.cpp b/src/core/system.cpp index 1b4cca42f..50ef00e84 100644 --- a/src/core/system.cpp +++ b/src/core/system.cpp @@ -24,7 +24,7 @@ void Init(EmuWindow* emu_window) { Kernel::Init(); HLE::Init(); VideoCore::Init(emu_window); - InputCommon::Init(InputCommon::ControllerBackends::SDL2); + InputCommon::Init(InputCommon::InputBackends::SDL2); } void Shutdown() { diff --git a/src/input_common/input_common.cpp b/src/input_common/input_common.cpp index 03bead9a4..263c6919e 100644 --- a/src/input_common/input_common.cpp +++ b/src/input_common/input_common.cpp @@ -40,17 +40,17 @@ Service::HID::PadState InputBase::GetPadState() const { return controller.pad_state; } -void Init(ControllerBackends backend) { +void Init(InputBackends backend) { switch (backend) { #ifdef HAS_SDL // SDL2 backend selected - case ControllerBackends::SDL2: + case InputBackends::SDL2: g_user_input = new SDLController(); break; #endif // No backend selected - case ControllerBackends::NONE: + case InputBackends::NONE: break; // If no backend whatsoever inits, launch a critical log diff --git a/src/input_common/input_common.h b/src/input_common/input_common.h index 503a34a60..4952ea9b5 100644 --- a/src/input_common/input_common.h +++ b/src/input_common/input_common.h @@ -10,12 +10,12 @@ namespace InputCommon { /// Enum defining available backends -enum class ControllerBackends { +enum InputBackends { NONE, SDL2 }; -class InputBase { +class InputBase : NonCopyable { public: InputBase() {} virtual ~InputBase() {} @@ -49,7 +49,7 @@ protected: }; /// Initialize the user input system -void Init(ControllerBackends backend); +void Init(InputBackends backend); /// Deactive the user input system void Shutdown();