From 82158244f2859bdaa1305d20126d01bc0b38cc75 Mon Sep 17 00:00:00 2001
From: Glenn Maynard <gmaynard@users.sourceforge.net>
Date: Tue, 8 May 2007 00:49:30 +0000
Subject: [PATCH] simplify: use GameInput

---
 stepmania/src/LightsManager.cpp    | 11 +++--------
 stepmania/src/LightsManager.h      |  2 +-
 stepmania/src/ScreenTestLights.cpp | 12 +++++-------
 3 files changed, 9 insertions(+), 16 deletions(-)

diff --git a/stepmania/src/LightsManager.cpp b/stepmania/src/LightsManager.cpp
index 09bc1ea3cb..1b47ffe6b9 100644
--- a/stepmania/src/LightsManager.cpp
+++ b/stepmania/src/LightsManager.cpp
@@ -486,22 +486,17 @@ CabinetLight LightsManager::GetFirstLitCabinetLight()
 	return CabinetLight_Invalid;
 }
 
-void LightsManager::GetFirstLitGameButtonLight( GameController &gcOut, GameButton &gbOut )
+GameInput LightsManager::GetFirstLitGameButtonLight()
 {
 	FOREACH_GameController( gc )
 	{
 		FOREACH_GameButton( gb )
 		{
 			if( m_LightsState.m_bGameButtonLights[gc][gb] )
-			{
-				gcOut = gc;
-				gbOut = gb;
-				return;
-			}
+				return GameInput( gc, gb );
 		}
 	}
-	gcOut = GameController_Invalid;
-	gbOut = GameButton_Invalid;
+	return GameInput();
 }
 
 bool LightsManager::IsEnabled() const
diff --git a/stepmania/src/LightsManager.h b/stepmania/src/LightsManager.h
index 4a58c1379a..236c2b2608 100644
--- a/stepmania/src/LightsManager.h
+++ b/stepmania/src/LightsManager.h
@@ -80,7 +80,7 @@ public:
 	void NextTestGameButtonLight()	{ ChangeTestGameButtonLight(+1); }
 
 	CabinetLight	GetFirstLitCabinetLight();
-	void			GetFirstLitGameButtonLight( GameController &gcOut, GameButton &gbOut );
+	GameInput	GetFirstLitGameButtonLight();
 
 private:
 	void ChangeTestCabinetLight( int iDir );
diff --git a/stepmania/src/ScreenTestLights.cpp b/stepmania/src/ScreenTestLights.cpp
index 244a799b47..e6ea493488 100644
--- a/stepmania/src/ScreenTestLights.cpp
+++ b/stepmania/src/ScreenTestLights.cpp
@@ -50,9 +50,7 @@ void ScreenTestLights::Update( float fDeltaTime )
 
 
 	CabinetLight cl = LIGHTSMAN->GetFirstLitCabinetLight();
-	GameController gc;
-	GameButton gb;
-	LIGHTSMAN->GetFirstLitGameButtonLight( gc, gb );
+	GameInput gi = LIGHTSMAN->GetFirstLitGameButtonLight();
 
 	RString s;
 
@@ -71,15 +69,15 @@ void ScreenTestLights::Update( float fDeltaTime )
 	else
 		s += ssprintf( CABINET_LIGHT.GetValue()+": %d %s\n", cl, CabinetLightToString(cl).c_str() );
 
-	if( gc == GameController_Invalid )
+	if( !gi.IsValid() )
 	{
 		s += ssprintf( CONTROLLER_LIGHT.GetValue()+": -----\n" );
 	}
 	else
 	{
-		RString sGameButton = GameButtonToLocalizedString( INPUTMAPPER->GetInputScheme(), gb );
-		PlayerNumber pn = (PlayerNumber)(gc);
-		s += ssprintf( CONTROLLER_LIGHT.GetValue()+": %s %d %s\n", PlayerNumberToString(pn).c_str(), gb, sGameButton.c_str() );
+		RString sGameButton = GameButtonToLocalizedString( INPUTMAPPER->GetInputScheme(), gi.button );
+		PlayerNumber pn = (PlayerNumber)(gi.controller);
+		s += ssprintf( CONTROLLER_LIGHT.GetValue()+": %s %d %s\n", PlayerNumberToString(pn).c_str(), gi.button, sGameButton.c_str() );
 	}
 
 	m_textInputs.SetText( s );