Remove no longer needed initialization call

mkortstiege · Feb 9, 2015 · 246e95a · 246e95a
1 parent 2d74f06
commit 246e95a
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 16 deletions.
diff --git 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
@@ -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
@@ -79,11 +79,6 @@ class CInputManager
   */
   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();