From 246e95aae9c7970b1615ecb26edef852c0fa732d Mon Sep 17 00:00:00 2001
From: Frank Razenberg <frank@zzattack.org>
Date: Mon, 9 Feb 2015 23:08:06 +0100
Subject: [PATCH] Remove no longer needed initialization call

---
 xbmc/Application.cpp        | 3 ---
 xbmc/input/InputManager.cpp | 8 --------
 xbmc/input/InputManager.h   | 5 -----
 3 files changed, 16 deletions(-)

diff --git a/xbmc/Application.cpp b/xbmc/Application.cpp
index 14cd25b769e64..b66f739434f3f 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 cbff1ce21e917..0c5519a983b56 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 887c6d171ca70..b157250f5264c 100644
--- 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();