From 70bc8167f8af6aa053b9335209c80f554d8fb597 Mon Sep 17 00:00:00 2001 From: hrydgard Date: Fri, 23 Jan 2009 21:28:55 +0000 Subject: Warp back to 1983!!! (rev 1983, that is, not the year :P) git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1997 8ced0084-cf51-0410-be5f-012b33b47a6e --- Source/Core/InputCommon/InputCommon.vcproj | 22 +++---- Source/Core/InputCommon/Src/InputManager.cpp | 94 ---------------------------- Source/Core/InputCommon/Src/InputManager.h | 43 ------------- Source/Core/InputCommon/Src/SConscript | 1 - 4 files changed, 7 insertions(+), 153 deletions(-) delete mode 100644 Source/Core/InputCommon/Src/InputManager.cpp delete mode 100644 Source/Core/InputCommon/Src/InputManager.h (limited to 'Source/Core/InputCommon') diff --git a/Source/Core/InputCommon/InputCommon.vcproj b/Source/Core/InputCommon/InputCommon.vcproj index 932f84b920..7176f2bdd3 100644 --- a/Source/Core/InputCommon/InputCommon.vcproj +++ b/Source/Core/InputCommon/InputCommon.vcproj @@ -1,7 +1,7 @@ - - - - diff --git a/Source/Core/InputCommon/Src/InputManager.cpp b/Source/Core/InputCommon/Src/InputManager.cpp deleted file mode 100644 index e9fc976251..0000000000 --- a/Source/Core/InputCommon/Src/InputManager.cpp +++ /dev/null @@ -1,94 +0,0 @@ -#include "InputManager.h" - -bool InputManager::Init() { - - if (! SDLInit()) - return false; - - ScanDevices(); - return true; -} - -bool InputManager::Shutdown() { - SDLShutdown(); - sdlInit = false; - - return true; -} - -bool InputManager::SDLInit() { -#ifdef HAVE_SDL - // Move also joystick opening code here. - if (! sdlInit) { - /* SDL 1.3 use DirectInput instead of the old Microsoft Multimeda API, - and with this we need the SDL_INIT_VIDEO flag as well */ - if (SDL_Init(SDL_INIT_VIDEO | SDL_INIT_JOYSTICK) < 0) { - PanicAlert("Could not initialize SDL! (%s)\n", SDL_GetError()); - } else { - sdlInit = true; - } - } - return sdlInit; -#endif - - return true; -} -void InputManager::SDLShutdown() { - for(int i = 0; i < numjoy; i++ ) { - if (SDL_JoystickOpened(m_joyinfo[i].ID)) - SDL_JoystickClose(m_joyinfo[i].joy); - } - SDL_Quit(); -} - -int InputManager::ScanDevices() { - - int res = SDLScanDevices(); - return res; -} - -int InputManager::SDLScanDevices() { -#if defined HAVE_SDL && HAVE_SDL - numjoy = SDL_NumJoysticks(); - - if(numjoy == 0) { - PanicAlert("No Joystick detected!\n"); - return 0; - } - - if(m_joyinfo) - delete [] m_joyinfo; - - m_joyinfo = new ControllerInfo[numjoy]; - -#ifdef _DEBUG - fprintf(pFile, "Scanning for devices\n"); - fprintf(pFile, "¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯\n"); -#endif - - for(int i = 0; i < numjoy; i++ ) { - m_joyinfo[i].joy = SDL_JoystickOpen(i); - m_joyinfo[i].ID = i; - m_joyinfo[i].NumAxes = SDL_JoystickNumAxes(m_joyinfo[i].joy); - m_joyinfo[i].NumButtons = SDL_JoystickNumButtons(m_joyinfo[i].joy); - m_joyinfo[i].NumBalls = SDL_JoystickNumBalls(m_joyinfo[i].joy); - m_joyinfo[i].NumHats = SDL_JoystickNumHats(m_joyinfo[i].joy); - m_joyinfo[i].Name = SDL_JoystickName(i); - - printf("ID: %d\n", i); - printf("Name: %s\n", m_joyinfo[i].Name); - printf("Buttons: %d\n", m_joyinfo[i].NumButtons); - printf("Axises: %d\n", m_joyinfo[i].NumAxes); - printf("Hats: %d\n", m_joyinfo[i].NumHats); - printf("Balls: %d\n\n", m_joyinfo[i].NumBalls); - - // Close if opened - if(SDL_JoystickOpened(i)) - SDL_JoystickClose(m_joyinfo[i].joy); - } - - return numjoy; -#else - return 0; -#endif -} diff --git a/Source/Core/InputCommon/Src/InputManager.h b/Source/Core/InputCommon/Src/InputManager.h deleted file mode 100644 index 88ec46dec4..0000000000 --- a/Source/Core/InputCommon/Src/InputManager.h +++ /dev/null @@ -1,43 +0,0 @@ -#ifndef INPUTMANAGER_H -#define INPUTMANAGER_H -#include "Common.h" - -#if defined HAVE_SDL && HAVE_SDL -#include - - -struct ControllerInfo { // CONNECTED WINDOWS DEVICES INFO - int NumAxes; // Amount of Axes - int NumButtons; // Amount of Buttons - int NumBalls; // Amount of Balls - int NumHats; // Amount of Hats (POV) - const char *Name; // Joypad/stickname - int ID; // SDL joystick device ID - SDL_Joystick *joy; // SDL joystick device -}; -#endif - -class InputManager { - -public: - bool Init(); - bool Shutdown(); - - InputManager(): sdlInit(false) {} - ~InputManager() { - if(m_joyinfo) - delete [] m_joyinfo; - } - -private: - bool sdlInit; - int ScanDevices(); - - // sdl specific - bool SDLInit(); - void SDLShutdown(); - int SDLScanDevices(); - ControllerInfo *m_joyinfo; - int numjoy; -}; -#endif diff --git a/Source/Core/InputCommon/Src/SConscript b/Source/Core/InputCommon/Src/SConscript index e5eeff99b5..e5fe35e802 100644 --- a/Source/Core/InputCommon/Src/SConscript +++ b/Source/Core/InputCommon/Src/SConscript @@ -5,7 +5,6 @@ Import('env') files = [ 'EventHandler.cpp', 'InputCommon.cpp', - "InputManager.cpp", ] env_inputcommon = env.Clone() -- cgit v1.2.3