From f97d2a93c4167a4b6aec0ae69536395380d427e3 Mon Sep 17 00:00:00 2001
From: Jordan Woyak <jordan.woyak@gmail.com>
Date: Thu, 17 Jan 2013 15:41:18 -0600
Subject: [PATCH] Add "full analog surface" support in DInput,OSX,SDL backends.
 (should not be needed for XInput)

---
 .../Src/ControllerInterface/DInput/DInputJoystick.cpp         | 4 ++--
 .../InputCommon/Src/ControllerInterface/OSX/OSXJoystick.mm    | 4 ++--
 Source/Core/InputCommon/Src/ControllerInterface/SDL/SDL.cpp   | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Source/Core/InputCommon/Src/ControllerInterface/DInput/DInputJoystick.cpp b/Source/Core/InputCommon/Src/ControllerInterface/DInput/DInputJoystick.cpp
index af6ee7e77c..9bc5364e76 100644
--- a/Source/Core/InputCommon/Src/ControllerInterface/DInput/DInputJoystick.cpp
+++ b/Source/Core/InputCommon/Src/ControllerInterface/DInput/DInputJoystick.cpp
@@ -267,8 +267,8 @@ Joystick::Joystick( /*const LPCDIDEVICEINSTANCE lpddi, */const LPDIRECTINPUTDEVI
 			const LONG& ax = (&m_state_in.lX)[offset];
 
 			// each axis gets a negative and a positive input instance associated with it
-			AddInput(new Axis(offset, ax, base, range.lMin-base));
-			AddInput(new Axis(offset, ax, base, range.lMax-base));
+			AddAnalogInputs(new Axis(offset, ax, base, range.lMin-base),
+				new Axis(offset, ax, base, range.lMax-base));
 		}
 	}
 
diff --git a/Source/Core/InputCommon/Src/ControllerInterface/OSX/OSXJoystick.mm b/Source/Core/InputCommon/Src/ControllerInterface/OSX/OSXJoystick.mm
index 129a5f38e0..60c0cc8c50 100644
--- a/Source/Core/InputCommon/Src/ControllerInterface/OSX/OSXJoystick.mm
+++ b/Source/Core/InputCommon/Src/ControllerInterface/OSX/OSXJoystick.mm
@@ -64,8 +64,8 @@ Joystick::Joystick(IOHIDDeviceRef device, std::string name, int index)
 				AddInput(new Hat(e, m_device, Hat::down));
 				AddInput(new Hat(e, m_device, Hat::left));
 			} else {
-				AddInput(new Axis(e, m_device, Axis::negative));
-				AddInput(new Axis(e, m_device, Axis::positive));
+				AddAnalogInputs(new Axis(e, m_device, Axis::negative),
+					new Axis(e, m_device, Axis::positive));
 			}
 		}
 		CFRelease(axes);
diff --git a/Source/Core/InputCommon/Src/ControllerInterface/SDL/SDL.cpp b/Source/Core/InputCommon/Src/ControllerInterface/SDL/SDL.cpp
index c7c6898ecd..5473f7bcb3 100644
--- a/Source/Core/InputCommon/Src/ControllerInterface/SDL/SDL.cpp
+++ b/Source/Core/InputCommon/Src/ControllerInterface/SDL/SDL.cpp
@@ -86,8 +86,8 @@ Joystick::Joystick(SDL_Joystick* const joystick, const int sdl_index, const unsi
 	for (u8 i = 0; i != SDL_JoystickNumAxes(m_joystick); ++i)
 	{
 		// each axis gets a negative and a positive input instance associated with it
-		AddInput(new Axis(i, m_joystick, -32768));
-		AddInput(new Axis(i, m_joystick, 32767));
+		AddAnalogInputs(new Axis(i, m_joystick, -32768),
+			new Axis(i, m_joystick, 32767));
 	}
 
 #ifdef USE_SDL_HAPTIC