Add RouletteTimerSeconds metric to ScreenSelectMusic

Docs/Changelog_sm-ssc.txt

@@ -13,6 +13,12 @@ _____________________________________________________________________________
 sm-ssc v1.2.1 | 201102??
 --------------------------------------------------------------------------------
 
+20110209
+--------
+* [ScreenOptionsMemoryCard] Added three strings: "(no label)", "size ???", and
+  "%dMB". [AJ]
+* [ScreenSelectMusic] Added RouletteTimerSeconds metric. [AJ]
+
 20110208
 --------
 * [ScreenNetSelectMusic] Reworked the input on this screen. [AJ]

Themes/_fallback/metrics.ini

@@ -1876,6 +1876,7 @@ Codes=""
 #
 TimerSeconds=60
 DoRouletteOnMenuTimer=true
+RouletteTimerSeconds=15
 #
 DefaultSort=GAMESTATE:IsCourseMode() and "Group" or "AllCourses"
 #

src/ScreenSelectMusic.cpp

@@ -76,6 +76,7 @@ void ScreenSelectMusic::Init()
 	SAMPLE_MUSIC_PREVIEW_MODE.Load( m_sName, "SampleMusicPreviewMode" );
 	SAMPLE_MUSIC_FALLBACK_FADE_IN_SECONDS.Load( m_sName, "SampleMusicFallbackFadeInSeconds" );
 	DO_ROULETTE_ON_MENU_TIMER.Load( m_sName, "DoRouletteOnMenuTimer" );
+	ROULETTE_TIMER_SECONDS.Load( m_sName, "RouletteTimerSeconds" );
 	ALIGN_MUSIC_BEATS.Load( m_sName, "AlignMusicBeat" );
 	CODES.Load( m_sName, "Codes" );
 	MUSIC_WHEEL_TYPE.Load( m_sName, "MusicWheelType" );
@@ -1068,15 +1069,13 @@ void ScreenSelectMusic::HandleScreenMessage( const ScreenMessage SM )
 		if( m_MusicWheel.IsRouletting() )
 		{
 			MenuStart( InputEventPlus() );
-			// todo: make this value a metric -aj
+			m_MenuTimer->SetSeconds( ROULETTE_TIMER_SECONDS );
-			m_MenuTimer->SetSeconds( 15 );
 			m_MenuTimer->Start();
 		}
 		else if( DO_ROULETTE_ON_MENU_TIMER  &&  m_MusicWheel.GetSelectedSong() == NULL  &&  m_MusicWheel.GetSelectedCourse() == NULL )
 		{
 			m_MusicWheel.StartRoulette();
-			// todo: make this value a metric -aj
+			m_MenuTimer->SetSeconds( ROULETTE_TIMER_SECONDS );
-			m_MenuTimer->SetSeconds( 15 );
 			m_MenuTimer->Start();
 		}
 		else

src/ScreenSelectMusic.h

@@ -73,6 +73,7 @@ protected:
 	ThemeMetric<SampleMusicPreviewMode> SAMPLE_MUSIC_PREVIEW_MODE;
 	ThemeMetric<float>		SAMPLE_MUSIC_FALLBACK_FADE_IN_SECONDS;
 	ThemeMetric<bool>		DO_ROULETTE_ON_MENU_TIMER;
+	ThemeMetric<float>		ROULETTE_TIMER_SECONDS;
 	ThemeMetric<bool>		ALIGN_MUSIC_BEATS;
 	ThemeMetric<RString>	CODES;
 	ThemeMetric<RString>	MUSIC_WHEEL_TYPE;