From f89680bf06c6ea7dec36272c1fd04be02309d27f Mon Sep 17 00:00:00 2001
From: Steve Checkoway <stevecheckoway@users.sourceforge.net>
Date: Fri, 8 Sep 2006 05:05:42 +0000
Subject: [PATCH] Simplify.

---
 stepmania/src/InputFilter.cpp | 25 +++++++------------------
 stepmania/src/InputFilter.h   |  1 -
 2 files changed, 7 insertions(+), 19 deletions(-)

diff --git a/stepmania/src/InputFilter.cpp b/stepmania/src/InputFilter.cpp
index 7f47584f3b..580a4c3665 100644
--- a/stepmania/src/InputFilter.cpp
+++ b/stepmania/src/InputFilter.cpp
@@ -90,8 +90,13 @@ InputFilter::~InputFilter()
 
 void InputFilter::Reset()
 {
-	for( int i=0; i<NUM_INPUT_DEVICES; i++ )
-		ResetDevice( InputDevice(i) );
+	LockMut(*queuemutex);
+	RageTimer now;
+	DeviceInputList vDeviceInputs;
+	
+	GetPressedButtons( vDeviceInputs );
+	FOREACH_CONST( DeviceInput, vDeviceInputs, di )
+		ButtonPressed( DeviceInput(di->device, di->button, -1, now), false );
 }
 
 void InputFilter::SetRepeatRate( float fSlowDelay, float fFastDelay, float fRepeatRate )
@@ -150,22 +155,6 @@ void InputFilter::SetButtonComment( const DeviceInput &di, const RString &sComme
 	bs.m_sComment = sComment;
 }
 
-/* Release all buttons on the given device. */
-void InputFilter::ResetDevice( InputDevice device )
-{
-	LockMut(*queuemutex);
-	RageTimer now;
-	
-	vector<DeviceInput> DeviceInputs;
-	GetPressedButtons( DeviceInputs );
-	
-	FOREACH( DeviceInput, DeviceInputs, di )
-	{
-		if( di->device == device )
-			ButtonPressed( DeviceInput(device, di->button, -1, now), false );
-	}
-}
-
 /* Check for reportable presses. */
 void InputFilter::CheckButtonChange( ButtonState &bs, DeviceInput di, const RageTimer &now )
 {
diff --git a/stepmania/src/InputFilter.h b/stepmania/src/InputFilter.h
index 7f3f640d4f..12e157b432 100644
--- a/stepmania/src/InputFilter.h
+++ b/stepmania/src/InputFilter.h
@@ -44,7 +44,6 @@ class InputFilter
 public:
 	void ButtonPressed( const DeviceInput &di, bool Down );
 	void SetButtonComment( const DeviceInput &di, const RString &sComment = "" );
-	void ResetDevice( InputDevice dev );
 
 	InputFilter();
 	~InputFilter();