From e9518eca6afe5cea1dddfcab703fa9b03516c755 Mon Sep 17 00:00:00 2001
From: Chris Danford <chrisdanford@users.sourceforge.net>
Date: Fri, 15 Feb 2008 09:32:40 +0000
Subject: [PATCH] change color metrics to commands

---
 stepmania/src/BPMDisplay.cpp | 19 ++++++++++---------
 stepmania/src/BPMDisplay.h   |  7 ++++---
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/stepmania/src/BPMDisplay.cpp b/stepmania/src/BPMDisplay.cpp
index fc9ed21a83..0d21faceee 100644
--- a/stepmania/src/BPMDisplay.cpp
+++ b/stepmania/src/BPMDisplay.cpp
@@ -24,14 +24,15 @@ BPMDisplay::BPMDisplay()
 
 void BPMDisplay::Load()
 {
-	NORMAL_COLOR.Load( m_sName, "NormalColor");
-	CHANGE_COLOR.Load( m_sName, "ChangeColor" );
-	EXTRA_COLOR.Load( m_sName, "ExtraColor" );
+	SET_NO_BPM_COMMAND.Load( m_sName, "SetNoBpmCommand");
+	SET_NORMAL_COMMAND.Load( m_sName, "SetNormalCommand");
+	SET_CHANGING_COMMAND.Load( m_sName, "SetChangeCommand" );
+	SET_EXTRA_COMMAND.Load( m_sName, "SetExtraCommand" );
 	CYCLE.Load( m_sName, "Cycle" );
 	SEPARATOR.Load( m_sName, "Separator" );
-	NO_BPM_TEXT.Load( m_sName, "NoBPMText" );
+	NO_BPM_TEXT.Load( m_sName, "NoBpmText" );
 
-	SetDiffuse( NORMAL_COLOR );
+	RunCommands( SET_NORMAL_COMMAND );
 }
 
 void BPMDisplay::LoadFromNode( const XNode *pNode )
@@ -135,11 +136,11 @@ void BPMDisplay::SetBPMRange( const DisplayBpms &bpms )
 	}
 
 	if( GAMESTATE->IsAnExtraStage() )
-		SetDiffuse( EXTRA_COLOR );
+		RunCommands( SET_EXTRA_COMMAND );
 	else if( !AllIdentical )
-		SetDiffuse( CHANGE_COLOR );
+		RunCommands( SET_CHANGING_COMMAND );
 	else
-		SetDiffuse( NORMAL_COLOR );
+		RunCommands( SET_NORMAL_COMMAND );
 }
 
 void BPMDisplay::CycleRandomly()
@@ -155,7 +156,7 @@ void BPMDisplay::NoBPM()
 {
 	m_BPMS.clear();
 	SetText( NO_BPM_TEXT ); 
-	SetDiffuse( NORMAL_COLOR );
+	RunCommands( SET_NO_BPM_COMMAND );
 }
 
 void BPMDisplay::SetBpmFromSong( const Song* pSong )
diff --git a/stepmania/src/BPMDisplay.h b/stepmania/src/BPMDisplay.h
index 49d312838e..c5cd7c57aa 100644
--- a/stepmania/src/BPMDisplay.h
+++ b/stepmania/src/BPMDisplay.h
@@ -35,9 +35,10 @@ protected:
 	float GetActiveBPM() const;
 	void SetBPMRange( const DisplayBpms &bpms );
 
-	ThemeMetric<RageColor> NORMAL_COLOR;
-	ThemeMetric<RageColor> CHANGE_COLOR;
-	ThemeMetric<RageColor> EXTRA_COLOR;
+	ThemeMetric<apActorCommands> SET_NO_BPM_COMMAND;
+	ThemeMetric<apActorCommands> SET_NORMAL_COMMAND;
+	ThemeMetric<apActorCommands> SET_CHANGING_COMMAND;
+	ThemeMetric<apActorCommands> SET_EXTRA_COMMAND;
 	ThemeMetric<bool> CYCLE;
 	ThemeMetric<RString> SEPARATOR;
 	ThemeMetric<RString> NO_BPM_TEXT;