From 56d1f3cc0458cfc29fbcb2558f88ff58f526f799 Mon Sep 17 00:00:00 2001 From: Jason Felds Date: Sat, 15 Jan 2011 15:36:07 -0500 Subject: [PATCH] Another TODO done. Sorry, ??? != xxx. --- Themes/_fallback/metrics.ini | 1 + src/BPMDisplay.cpp | 6 ++---- src/BPMDisplay.h | 1 + 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Themes/_fallback/metrics.ini b/Themes/_fallback/metrics.ini index 43a0807150..e40641b4bb 100644 --- a/Themes/_fallback/metrics.ini +++ b/Themes/_fallback/metrics.ini @@ -185,6 +185,7 @@ RandomCycleSpeed=0.1 Separator="-" # ??? when it cycles. ShowQMarksInRandomCycle=true +QuestionMarksTest="???" RandomText="!!!" # xxx: localize me -aj VariousText="000" diff --git a/src/BPMDisplay.cpp b/src/BPMDisplay.cpp index 83d19aecd9..370e10197e 100644 --- a/src/BPMDisplay.cpp +++ b/src/BPMDisplay.cpp @@ -35,7 +35,7 @@ void BPMDisplay::Load() SEPARATOR.Load( m_sName, "Separator" ); SHOW_QMARKS.Load( m_sName, "ShowQMarksInRandomCycle" ); NO_BPM_TEXT.Load( m_sName, "NoBpmText" ); - //QUESTIONMARKS_TEXT.Load( m_sName, "QuestionMarksText" ); + QUESTIONMARKS_TEXT.Load( m_sName, "QuestionMarksText" ); RANDOM_TEXT.Load( m_sName, "RandomText" ); VARIOUS_TEXT.Load( m_sName, "VariousText" ); @@ -75,10 +75,8 @@ void BPMDisplay::Update( float fDeltaTime ) if(m_fBPMTo == -1) { m_fBPMFrom = -1; - - // todo: allow themer to customize "xxx" string -aj if( (bool)SHOW_QMARKS ) - SetText( (RandomFloat(0,1)>0.90f) ? RString("xxx") : ssprintf("%03.0f",RandomFloat(0,999)) ); + SetText( (RandomFloat(0,1)>0.90f) ? (RString)QUESTIONMARKS_TEXT : ssprintf("%03.0f",RandomFloat(0,999)) ); else SetText( ssprintf("%03.0f",RandomFloat(0,999)) ); } diff --git a/src/BPMDisplay.h b/src/BPMDisplay.h index 726101430b..3da9ae07e0 100644 --- a/src/BPMDisplay.h +++ b/src/BPMDisplay.h @@ -47,6 +47,7 @@ protected: ThemeMetric NO_BPM_TEXT; ThemeMetric VARIOUS_TEXT; ThemeMetric RANDOM_TEXT; + ThemeMetric QUESTIONMARKS_TEXT; float m_fBPMFrom, m_fBPMTo; int m_iCurrentBPM;