Merge pull request #1560 from magcius/pad-cleanup-1

Pad cleanup 1

4 files changed, 8 insertions, 99 deletions

diff --git a/Source/Core/InputCommon/ControllerInterface/DInput/DInputJoystick.cpp b/Source/Core/InputCommon/ControllerInterface/DInput/DInputJoystick.cpp
index ecd5db838c..bc8638293e 100644
--- a/Source/Core/InputCommon/ControllerInterface/DInput/DInputJoystick.cpp
+++ b/Source/Core/InputCommon/ControllerInterface/DInput/DInputJoystick.cpp
@@ -149,7 +149,9 @@ Joystick::Joystick( /*const LPCDIDEVICEINSTANCE lpddi, */const LPDIRECTINPUTDEVI
 		InitForceFeedback(m_device, (int)objects.size());
 	}
 
-	ClearInputState();
+	ZeroMemory(&m_state_in, sizeof(m_state_in));
+	// set hats to center
+	memset(m_state_in.rgdwPOV, 0xFF, sizeof(m_state_in.rgdwPOV));
 }
 
 Joystick::~Joystick()
@@ -158,13 +160,6 @@ Joystick::~Joystick()
 	m_device->Release();
 }
 
-void Joystick::ClearInputState()
-{
-	ZeroMemory(&m_state_in, sizeof(m_state_in));
-	// set hats to center
-	memset(m_state_in.rgdwPOV, 0xFF, sizeof(m_state_in.rgdwPOV));
-}
-
 std::string Joystick::GetName() const
 {
 	return GetDeviceName(m_device);
@@ -182,7 +177,7 @@ std::string Joystick::GetSource() const
 
 // update IO
 
-bool Joystick::UpdateInput()
+void Joystick::UpdateInput()
 {
 	HRESULT hr = 0;
 
@@ -220,9 +215,7 @@ bool Joystick::UpdateInput()
 
 	// try reacquire if input lost
 	if (DIERR_INPUTLOST == hr || DIERR_NOTACQUIRED == hr)
-		hr = m_device->Acquire();
-
-	return SUCCEEDED(hr);
+		m_device->Acquire();
 }
 
 // get name
diff --git a/Source/Core/InputCommon/ControllerInterface/DInput/DInputJoystick.h b/Source/Core/InputCommon/ControllerInterface/DInput/DInputJoystick.h
index 0ac535cdfe..f1af8102cd 100644
--- a/Source/Core/InputCommon/ControllerInterface/DInput/DInputJoystick.h
+++ b/Source/Core/InputCommon/ControllerInterface/DInput/DInputJoystick.h
@@ -52,9 +52,7 @@ private:
 	};
 
 public:
-	bool UpdateInput();
-
-	void ClearInputState();
+	void UpdateInput() override;
 
 	Joystick(const LPDIRECTINPUTDEVICE8 device, const unsigned int index);
 	~Joystick();
diff --git a/Source/Core/InputCommon/ControllerInterface/DInput/DInputKeyboardMouse.cpp b/Source/Core/InputCommon/ControllerInterface/DInput/DInputKeyboardMouse.cpp
index 05f28c79ae..c96e51a830 100644
--- a/Source/Core/InputCommon/ControllerInterface/DInput/DInputKeyboardMouse.cpp
+++ b/Source/Core/InputCommon/ControllerInterface/DInput/DInputKeyboardMouse.cpp
@@ -30,17 +30,6 @@ static const struct
 #include "InputCommon/ControllerInterface/DInput/NamedKeys.h" // NOLINT
 };
 
-static const struct
-{
-	const BYTE        code;
-	const char* const name;
-} named_lights[] =
-{
-	{ VK_NUMLOCK, "NUM LOCK" },
-	{ VK_CAPITAL, "CAPS LOCK" },
-	{ VK_SCROLL, "SCROLL LOCK" }
-};
-
 // lil silly
 static HWND hwnd;
 
@@ -102,16 +91,11 @@ KeyboardMouse::KeyboardMouse(const LPDIRECTINPUTDEVICE8 kb_device, const LPDIREC
 	m_last_update = GetTickCount();
 
 	ZeroMemory(&m_state_in, sizeof(m_state_in));
-	ZeroMemory(m_state_out, sizeof(m_state_out));
-	ZeroMemory(&m_current_state_out, sizeof(m_current_state_out));
 
 	// KEYBOARD
 	// add keys
 	for (u8 i = 0; i < sizeof(named_keys)/sizeof(*named_keys); ++i)
 		AddInput(new Key(i, m_state_in.keyboard[named_keys[i].code]));
-	// add lights
-	for (u8 i = 0; i < sizeof(named_lights)/sizeof(*named_lights); ++i)
-		AddOutput(new Light(i));
 
 	// MOUSE
 	// get caps
@@ -155,7 +139,7 @@ void GetMousePos(ControlState* const x, ControlState* const y)
 	*y = (ControlState)point.y / (ControlState)win_height * 2 - 1;
 }
 
-bool KeyboardMouse::UpdateInput()
+void KeyboardMouse::UpdateInput()
 {
 	DIMOUSESTATE2 tmp_mouse;
 
@@ -191,50 +175,7 @@ bool KeyboardMouse::UpdateInput()
 
 		// update mouse cursor
 		GetMousePos(&m_state_in.cursor.x, &m_state_in.cursor.y);
-
-		return true;
-	}
-
-	return false;
-}
-
-bool KeyboardMouse::UpdateOutput()
-{
-	class KInput : public INPUT
-	{
-	public:
-		KInput( const unsigned char key, const bool up = false )
-		{
-			memset( this, 0, sizeof(*this) );
-			type = INPUT_KEYBOARD;
-			ki.wVk = key;
-
-			if (up)
-				ki.dwFlags = KEYEVENTF_KEYUP;
-		}
-	};
-
-	std::vector< KInput > kbinputs;
-	for (unsigned int i = 0; i < sizeof(m_state_out)/sizeof(*m_state_out); ++i)
-	{
-		bool want_on = false;
-		if (m_state_out[i])
-			want_on = m_state_out[i] > GetTickCount() % 255 ; // light should flash when output is 0.5
-
-		// lights are set to their original state when output is zero
-		if (want_on ^ m_current_state_out[i])
-		{
-			kbinputs.push_back(KInput(named_lights[i].code));       // press
-			kbinputs.push_back(KInput(named_lights[i].code, true)); // release
-
-			m_current_state_out[i] ^= 1;
-		}
 	}
-
-	if (kbinputs.size())
-		return ( kbinputs.size() == SendInput( (UINT)kbinputs.size(), &kbinputs[0], sizeof( kbinputs[0] ) ) );
-	else
-		return true;
 }
 
 std::string KeyboardMouse::GetName() const
@@ -280,11 +221,6 @@ std::string KeyboardMouse::Cursor::GetName() const
 	return tmpstr;
 }
 
-std::string KeyboardMouse::Light::GetName() const
-{
-	return named_lights[m_index].name;
-}
-
 // get/set state
 ControlState KeyboardMouse::Key::GetState() const
 {
@@ -306,10 +242,5 @@ ControlState KeyboardMouse::Cursor::GetState() const
 	return std::max(0.0, ControlState(m_axis) / (m_positive ? 1.0 : -1.0));
 }
 
-void KeyboardMouse::Light::SetState(const ControlState state)
-{
-	//state_out[m_index] = (unsigned char)(state * 255);
-}
-
 }
 }
diff --git a/Source/Core/InputCommon/ControllerInterface/DInput/DInputKeyboardMouse.h b/Source/Core/InputCommon/ControllerInterface/DInput/DInputKeyboardMouse.h
index f4ad99db2d..704635057e 100644
--- a/Source/Core/InputCommon/ControllerInterface/DInput/DInputKeyboardMouse.h
+++ b/Source/Core/InputCommon/ControllerInterface/DInput/DInputKeyboardMouse.h
@@ -76,19 +76,8 @@ private:
 		const bool m_positive;
 	};
 
-	class Light : public Output
-	{
-	public:
-		std::string GetName() const;
-		Light(u8 index) : m_index(index) {}
-		void SetState(ControlState state);
-	private:
-		const u8 m_index;
-	};
-
 public:
-	bool UpdateInput();
-	bool UpdateOutput();
+	void UpdateInput() override;
 
 	KeyboardMouse(const LPDIRECTINPUTDEVICE8 kb_device, const LPDIRECTINPUTDEVICE8 mo_device);
 	~KeyboardMouse();
@@ -103,8 +92,6 @@ private:
 
 	DWORD         m_last_update;
 	State         m_state_in;
-	unsigned char m_state_out[3];         // NUM CAPS SCROLL
-	bool          m_current_state_out[3]; // NUM CAPS SCROLL
 };
 
 }