diff --git a/Themes/_fallback/metrics.ini b/Themes/_fallback/metrics.ini index e98c1152ab..9ba22ad476 100644 --- a/Themes/_fallback/metrics.ini +++ b/Themes/_fallback/metrics.ini @@ -1881,6 +1881,7 @@ Codes="" TimerSeconds=60 DoRouletteOnMenuTimer=true RouletteTimerSeconds=15 +IdleCommentSeconds=20 # DefaultSort=GAMESTATE:IsCourseMode() and "Group" or "AllCourses" # diff --git a/src/ScreenSelectMusic.cpp b/src/ScreenSelectMusic.cpp index 40c387634f..404f06a882 100644 --- a/src/ScreenSelectMusic.cpp +++ b/src/ScreenSelectMusic.cpp @@ -71,6 +71,7 @@ void ScreenSelectMusic::Init() GAMESTATE->SetMasterPlayerNumber(PLAYER_1); } + IDLE_COMMENT_SECONDS.Load( m_sName, "IdleCommentSeconds" ); SAMPLE_MUSIC_DELAY_INIT.Load( m_sName, "SampleMusicDelayInit" ); SAMPLE_MUSIC_DELAY.Load( m_sName, "SampleMusicDelay" ); SAMPLE_MUSIC_LOOPS.Load( m_sName, "SampleMusicLoops" ); @@ -226,6 +227,7 @@ void ScreenSelectMusic::Init() void ScreenSelectMusic::BeginScreen() { g_ScreenStartedLoadingAt.Touch(); + m_timerIdleComment.GetDeltaTime(); if( CommonMetrics::AUTO_SET_STYLE ) { @@ -376,6 +378,15 @@ void ScreenSelectMusic::CheckBackgroundRequests( bool bForce ) void ScreenSelectMusic::Update( float fDeltaTime ) { + if( !IsTransitioning() ) + { + if( IDLE_COMMENT_SECONDS > 0 && m_timerIdleComment.PeekDeltaTime() >= IDLE_COMMENT_SECONDS ) + { + SOUND->PlayOnceFromAnnouncer( m_sName+" IdleComment" ); + m_timerIdleComment.GetDeltaTime(); + } + } + ScreenWithMenuElements::Update( fDeltaTime ); CheckBackgroundRequests( false ); @@ -384,6 +395,9 @@ void ScreenSelectMusic::Input( const InputEventPlus &input ) { // LOG->Trace( "ScreenSelectMusic::Input()" ); + // reset announcer timer + m_timerIdleComment.GetDeltaTime(); + // debugging? // I just like being able to see untransliterated titles occasionally. if( input.DeviceI.device == DEVICE_KEYBOARD && input.DeviceI.button == KEY_F9 ) diff --git a/src/ScreenSelectMusic.h b/src/ScreenSelectMusic.h index d1c22c4ebf..3f64ecc505 100644 --- a/src/ScreenSelectMusic.h +++ b/src/ScreenSelectMusic.h @@ -69,6 +69,9 @@ protected: vector m_vpTrails; int m_iSelection[NUM_PLAYERS]; + RageTimer m_timerIdleComment; + ThemeMetric IDLE_COMMENT_SECONDS; + ThemeMetric SAMPLE_MUSIC_DELAY_INIT; ThemeMetric SAMPLE_MUSIC_DELAY; ThemeMetric SAMPLE_MUSIC_LOOPS;