diff --git a/Themes/_fallback/metrics.ini b/Themes/_fallback/metrics.ini index 45844acb01..b730e0ac1e 100644 --- a/Themes/_fallback/metrics.ini +++ b/Themes/_fallback/metrics.ini @@ -2100,6 +2100,7 @@ DefaultSort=GAMESTATE:IsCourseMode() and "Group" or "AllCourses" SampleMusicPreviewMode='SampleMusicPreviewMode_Normal' SampleMusicLoops=true SampleMusicFallbackFadeInSeconds=0 +SampleMusicFadeOutSeconds=1.5 # UseOptionsList=false OptionsListTimeout=0.25 diff --git a/src/ScreenSelectMusic.cpp b/src/ScreenSelectMusic.cpp index 5711bbf84c..8d8b75c455 100644 --- a/src/ScreenSelectMusic.cpp +++ b/src/ScreenSelectMusic.cpp @@ -85,6 +85,7 @@ void ScreenSelectMusic::Init() SAMPLE_MUSIC_LOOPS.Load( m_sName, "SampleMusicLoops" ); SAMPLE_MUSIC_PREVIEW_MODE.Load( m_sName, "SampleMusicPreviewMode" ); SAMPLE_MUSIC_FALLBACK_FADE_IN_SECONDS.Load( m_sName, "SampleMusicFallbackFadeInSeconds" ); + SAMPLE_MUSIC_FADE_OUT_SECONDS.Load( m_sName, "SampleMusicFadeOutSeconds" ); DO_ROULETTE_ON_MENU_TIMER.Load( m_sName, "DoRouletteOnMenuTimer" ); ROULETTE_TIMER_SECONDS.Load( m_sName, "RouletteTimerSeconds" ); ALIGN_MUSIC_BEATS.Load( m_sName, "AlignMusicBeat" ); @@ -383,7 +384,7 @@ void ScreenSelectMusic::CheckBackgroundRequests( bool bForce ) PlayParams.bForceLoop = SAMPLE_MUSIC_LOOPS; PlayParams.fStartSecond = m_fSampleStartSeconds; PlayParams.fLengthSeconds = m_fSampleLengthSeconds; - PlayParams.fFadeOutLengthSeconds = 1.5f; + PlayParams.fFadeOutLengthSeconds = SAMPLE_MUSIC_FADE_OUT_SECONDS; PlayParams.bAlignBeat = ALIGN_MUSIC_BEATS; PlayParams.bApplyMusicRate = true; diff --git a/src/ScreenSelectMusic.h b/src/ScreenSelectMusic.h index 280c16316d..2dddba6e64 100644 --- a/src/ScreenSelectMusic.h +++ b/src/ScreenSelectMusic.h @@ -78,6 +78,7 @@ protected: ThemeMetric SAMPLE_MUSIC_LOOPS; ThemeMetric SAMPLE_MUSIC_PREVIEW_MODE; ThemeMetric SAMPLE_MUSIC_FALLBACK_FADE_IN_SECONDS; + ThemeMetric SAMPLE_MUSIC_FADE_OUT_SECONDS; ThemeMetric DO_ROULETTE_ON_MENU_TIMER; ThemeMetric ROULETTE_TIMER_SECONDS; ThemeMetric ALIGN_MUSIC_BEATS;