From d1809eb9c0a40b3faae055b35e56b330d1590ea3 Mon Sep 17 00:00:00 2001 From: Vincent-FK Date: Sun, 15 Nov 2020 15:52:36 +0100 Subject: [PATCH] remove joystick Signed-off-by: Vincent-FK --- RetroFE/Source/Control/JoyAxisHandler.cpp | 3 ++- RetroFE/Source/Control/JoyAxisHandler.h | 4 ++-- RetroFE/Source/Control/JoyButtonHandler.cpp | 4 ++-- RetroFE/Source/Control/JoyButtonHandler.h | 3 ++- RetroFE/Source/Control/JoyHatHandler.cpp | 3 ++- RetroFE/Source/Control/JoyHatHandler.h | 3 ++- RetroFE/Source/Control/UserInput.cpp | 19 ++++++++++--------- RetroFE/Source/Control/UserInput.h | 4 ++-- RetroFE/Source/RetroFE.cpp | 6 +++--- 9 files changed, 27 insertions(+), 22 deletions(-) diff --git a/RetroFE/Source/Control/JoyAxisHandler.cpp b/RetroFE/Source/Control/JoyAxisHandler.cpp index 533fbe7..ce2b62c 100644 --- a/RetroFE/Source/Control/JoyAxisHandler.cpp +++ b/RetroFE/Source/Control/JoyAxisHandler.cpp @@ -1,5 +1,6 @@ #include "JoyAxisHandler.h" +/* JoyAxisHandler::JoyAxisHandler(SDL_JoystickID joyid, Uint8 axis, Sint16 min, Sint16 max) : joyid_(joyid) , axis_(axis) @@ -26,4 +27,4 @@ bool JoyAxisHandler::pressed() { return pressed_; } - +*/ diff --git a/RetroFE/Source/Control/JoyAxisHandler.h b/RetroFE/Source/Control/JoyAxisHandler.h index 55bee04..82b5def 100644 --- a/RetroFE/Source/Control/JoyAxisHandler.h +++ b/RetroFE/Source/Control/JoyAxisHandler.h @@ -1,7 +1,7 @@ #pragma once #include "InputHandler.h" - +/* class JoyAxisHandler : public InputHandler { public: @@ -18,4 +18,4 @@ private: bool pressed_; }; - +*/ diff --git a/RetroFE/Source/Control/JoyButtonHandler.cpp b/RetroFE/Source/Control/JoyButtonHandler.cpp index 370d461..6220dcd 100644 --- a/RetroFE/Source/Control/JoyButtonHandler.cpp +++ b/RetroFE/Source/Control/JoyButtonHandler.cpp @@ -1,5 +1,5 @@ #include "JoyButtonHandler.h" - +/* JoyButtonHandler::JoyButtonHandler(SDL_JoystickID joynum, Uint8 button) : joynum_(joynum) , button_(button) @@ -28,5 +28,5 @@ bool JoyButtonHandler::update(SDL_Event &e) bool JoyButtonHandler::pressed() { return pressed_; -} +}*/ diff --git a/RetroFE/Source/Control/JoyButtonHandler.h b/RetroFE/Source/Control/JoyButtonHandler.h index adee958..5e5f29e 100644 --- a/RetroFE/Source/Control/JoyButtonHandler.h +++ b/RetroFE/Source/Control/JoyButtonHandler.h @@ -1,7 +1,7 @@ #pragma once #include "InputHandler.h" - +/* class JoyButtonHandler : public InputHandler { public: @@ -16,3 +16,4 @@ private: bool pressed_; }; +*/ diff --git a/RetroFE/Source/Control/JoyHatHandler.cpp b/RetroFE/Source/Control/JoyHatHandler.cpp index be38df4..7f7d833 100644 --- a/RetroFE/Source/Control/JoyHatHandler.cpp +++ b/RetroFE/Source/Control/JoyHatHandler.cpp @@ -1,5 +1,5 @@ #include "JoyHatHandler.h" - +/* JoyHatHandler::JoyHatHandler(SDL_JoystickID joynum, Uint8 hatnum, Uint8 direction) : joynum_(joynum) , hatnum_(hatnum) @@ -26,3 +26,4 @@ bool JoyHatHandler::pressed() return pressed_; } +*/ diff --git a/RetroFE/Source/Control/JoyHatHandler.h b/RetroFE/Source/Control/JoyHatHandler.h index ad249db..5c90338 100644 --- a/RetroFE/Source/Control/JoyHatHandler.h +++ b/RetroFE/Source/Control/JoyHatHandler.h @@ -1,7 +1,7 @@ #pragma once #include "InputHandler.h" - +/* class JoyHatHandler : public InputHandler { public: @@ -17,3 +17,4 @@ private: bool pressed_; }; +*/ diff --git a/RetroFE/Source/Control/UserInput.cpp b/RetroFE/Source/Control/UserInput.cpp index 09728e8..9adbfe6 100644 --- a/RetroFE/Source/Control/UserInput.cpp +++ b/RetroFE/Source/Control/UserInput.cpp @@ -124,10 +124,10 @@ UserInput::UserInput(Configuration &c) currentKeyState_[i] = false; lastKeyState_[i] = false; } - for ( unsigned int i = 0; i < cMaxJoy; i++ ) + /*for ( unsigned int i = 0; i < cMaxJoy; i++ ) { joysticks_[i] = -1; - } + }*/ } UserInput::~UserInput() @@ -267,7 +267,7 @@ bool UserInput::MapKey(std::string keyDescription, KeyCode_E key, bool required) } else if (token.find("joy") == 0) { - std::string joydesc = Utils::replace(Utils::toLower(token), "joy", ""); + /*std::string joydesc = Utils::replace(Utils::toLower(token), "joy", ""); int joynum; if ( isdigit( joydesc.at( 0 ) ) ) { @@ -352,7 +352,8 @@ bool UserInput::MapKey(std::string keyDescription, KeyCode_E key, bool required) Logger::write(Logger::ZONE_INFO, "Input", "Binding joypad axis " + ss.str()); keyHandlers_.push_back(std::pair(new JoyAxisHandler(joynum, axis, min, max), key)); found = true; - } + }*/ + found = true; } if (!found) @@ -387,7 +388,7 @@ bool UserInput::update( SDL_Event &e ) memset( currentKeyState_, 0, sizeof( currentKeyState_ ) ); // Handle adding a joystick - if ( e.type == SDL_JOYDEVICEADDED ) + /*if ( e.type == SDL_JOYDEVICEADDED ) { SDL_JoystickID id = SDL_JoystickInstanceID( SDL_JoystickOpen( e.jdevice.which ) ); for ( unsigned int i = 0; i < cMaxJoy; i++ ) @@ -431,7 +432,7 @@ bool UserInput::update( SDL_Event &e ) break; } } - } + }*/ for ( unsigned int i = 0; i < keyHandlers_.size( ); ++i ) { @@ -443,7 +444,7 @@ bool UserInput::update( SDL_Event &e ) currentKeyState_[keyHandlers_[i].second] |= h->pressed( ); } } - + return updated; } @@ -458,11 +459,11 @@ bool UserInput::newKeyPressed(KeyCode_E code) return currentKeyState_[code] && !lastKeyState_[code]; } - +/* void UserInput::clearJoysticks( ) { for ( unsigned int i = 0; i < cMaxJoy; i++ ) { joysticks_[i] = -1; } -} \ No newline at end of file +}*/ diff --git a/RetroFE/Source/Control/UserInput.h b/RetroFE/Source/Control/UserInput.h index 0a93988..ed73e49 100644 --- a/RetroFE/Source/Control/UserInput.h +++ b/RetroFE/Source/Control/UserInput.h @@ -15,7 +15,7 @@ */ #pragma once #include -#include +//#include #include #include #include @@ -75,7 +75,7 @@ private: bool MapKey(std::string keyDescription, KeyCode_E key); bool MapKey(std::string keyDescription, KeyCode_E key, bool required); Configuration &config_; - SDL_JoystickID joysticks_[cMaxJoy]; + //SDL_JoystickID joysticks_[cMaxJoy]; std::vector > keyHandlers_; bool lastKeyState_[KeyCodeMax]; bool currentKeyState_[KeyCodeMax]; diff --git a/RetroFE/Source/RetroFE.cpp b/RetroFE/Source/RetroFE.cpp index 720e7c5..85bcdd5 100644 --- a/RetroFE/Source/RetroFE.cpp +++ b/RetroFE/Source/RetroFE.cpp @@ -176,10 +176,10 @@ void RetroFE::launchExit( ) SDL_Event e; while ( SDL_PollEvent( &e ) ) { - if ( e.type == SDL_JOYDEVICEADDED || e.type == SDL_JOYDEVICEREMOVED ) + /*if ( e.type == SDL_JOYDEVICEADDED || e.type == SDL_JOYDEVICEREMOVED ) { input_.update( e ); - } + }*/ } input_.resetStates( ); attract_.reset( ); @@ -208,7 +208,7 @@ void RetroFE::freeGraphicsMemory( ) { currentPage_->deInitializeFonts( ); SDL::deInitialize( ); - input_.clearJoysticks( ); + //input_.clearJoysticks( ); } }