diff options
| author | Frank Razenberg <frank@zzattack.org> | 2015-02-09 23:08:06 +0100 |
|---|---|---|
| committer | Frank Razenberg <frank@zzattack.org> | 2015-02-09 23:09:47 +0100 |
| commit | 246e95aae9c7970b1615ecb26edef852c0fa732d (patch) | |
| tree | 4903e44ac9ec5509b49136c1472c39af1efa4e22 | |
| parent | 2d74f06362bd46129d022b70402075f43b0fd20c (diff) | |
Remove no longer needed initialization call
| -rw-r--r-- | xbmc/Application.cpp | 3 | ||||
| -rw-r--r-- | xbmc/input/InputManager.cpp | 8 | ||||
| -rw-r--r-- | xbmc/input/InputManager.h | 5 |
3 files changed, 0 insertions, 16 deletions
diff --git a/xbmc/Application.cpp b/xbmc/Application.cpp index 14cd25b769..b66f739434 100644 --- a/xbmc/Application.cpp +++ b/xbmc/Application.cpp @@ -911,9 +911,6 @@ bool CApplication::CreateGUI() if (!CButtonTranslator::GetInstance().Load()) return false; - //Initialize sdl joystick if available - CInputManager::GetInstance().InitializeInputs(); - RESOLUTION_INFO info = g_graphicsContext.GetResInfo(); CLog::Log(LOGINFO, "GUI format %ix%i, Display %s", info.iWidth, diff --git a/xbmc/input/InputManager.cpp b/xbmc/input/InputManager.cpp index cbff1ce21e..0c5519a983 100644 --- a/xbmc/input/InputManager.cpp +++ b/xbmc/input/InputManager.cpp @@ -73,14 +73,6 @@ CInputManager& CInputManager::GetInstance() return inputManager; } -void CInputManager::InitializeInputs() -{ -#ifdef HAS_SDL_JOYSTICK - // Pass the mapping of axis to triggers to m_Joystick - m_Joystick.LoadAxesConfigs(CButtonTranslator::GetInstance().GetAxesConfigs()); -#endif -} - void CInputManager::ReInitializeJoystick() { #ifdef HAS_SDL_JOYSTICK diff --git a/xbmc/input/InputManager.h b/xbmc/input/InputManager.h index 887c6d171c..b157250f52 100644 --- a/xbmc/input/InputManager.h +++ b/xbmc/input/InputManager.h @@ -79,11 +79,6 @@ public: */ bool ProcessPeripherals(float frameTime); - /*! - * \brief Call once during application startup to initialize peripherals that need it - */ - void InitializeInputs(); - void SetEnabledJoystick(bool enabled = true); void ReInitializeJoystick(); |