N-archive/citra
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Review Changes 11

Browse source
This commit is contained in:
Daniel Stuart Baxter 2015-05-31 11:28:09 -05:00
parent a8f3b1739d
commit 5dbd3c53f7
3 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/core/system.cpp
View file

@ -24,7 +24,7 @@ void Init(EmuWindow* emu_window) {
Kernel::Init(); Kernel::Init();
HLE::Init(); HLE::Init();
VideoCore::Init(emu_window); VideoCore::Init(emu_window);
InputCommon::Init(InputCommon::ControllerBackends::SDL2); InputCommon::Init(InputCommon::InputBackends::SDL2);
} }
void Shutdown() { void Shutdown() {

6
src/input_common/input_common.cpp
View file

@ -40,17 +40,17 @@ Service::HID::PadState InputBase::GetPadState() const {
return controller.pad_state; return controller.pad_state;
} }
void Init(ControllerBackends backend) { void Init(InputBackends backend) {
switch (backend) { switch (backend) {
#ifdef HAS_SDL #ifdef HAS_SDL
// SDL2 backend selected // SDL2 backend selected
case ControllerBackends::SDL2: case InputBackends::SDL2:
g_user_input = new SDLController(); g_user_input = new SDLController();
break; break;
#endif #endif
// No backend selected // No backend selected
case ControllerBackends::NONE: case InputBackends::NONE:
break; break;
// If no backend whatsoever inits, launch a critical log // If no backend whatsoever inits, launch a critical log

6
src/input_common/input_common.h
View file

@ -10,12 +10,12 @@
namespace InputCommon { namespace InputCommon {
/// Enum defining available backends /// Enum defining available backends
enum class ControllerBackends { enum InputBackends {
NONE, NONE,
SDL2 SDL2
}; };
class InputBase { class InputBase : NonCopyable {
public: public:
InputBase() {} InputBase() {}
virtual ~InputBase() {} virtual ~InputBase() {}
@ -49,7 +49,7 @@ protected:
}; };
/// Initialize the user input system /// Initialize the user input system
void Init(ControllerBackends backend); void Init(InputBackends backend);
/// Deactive the user input system /// Deactive the user input system
void Shutdown(); void Shutdown();