From c11213b098096b0b27c91e61ee6804e84f0b0b1a Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Fri, 6 Apr 2007 18:59:27 +0000 Subject: [PATCH] theme SampleMusicFallbackFadeInSeconds --- stepmania/src/ScreenSelectMusic.cpp | 3 ++- stepmania/src/ScreenSelectMusic.h | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/stepmania/src/ScreenSelectMusic.cpp b/stepmania/src/ScreenSelectMusic.cpp index 63a8b91724..da895078d9 100644 --- a/stepmania/src/ScreenSelectMusic.cpp +++ b/stepmania/src/ScreenSelectMusic.cpp @@ -64,6 +64,7 @@ void ScreenSelectMusic::Init() { SAMPLE_MUSIC_DELAY.Load( m_sName, "SampleMusicDelay" ); SAMPLE_MUSIC_LOOPS.Load( m_sName, "SampleMusicLoops" ); + SAMPLE_MUSIC_FALLBACK_FADE_IN_SECONDS.Load( m_sName, "SampleMusicFallbackFadeInSeconds" ); DO_ROULETTE_ON_MENU_TIMER.Load( m_sName, "DoRouletteOnMenuTimer" ); ALIGN_MUSIC_BEATS.Load( m_sName, "AlignMusicBeat" ); CODES.Load( m_sName, "Codes" ); @@ -300,7 +301,7 @@ void ScreenSelectMusic::CheckBackgroundRequests( bool bForce ) GameSoundManager::PlayMusicParams FallbackMusic; FallbackMusic.sFile = m_sLoopMusicPath; - FallbackMusic.fFadeInLengthSeconds = 1.5f; + FallbackMusic.fFadeInLengthSeconds = SAMPLE_MUSIC_FALLBACK_FADE_IN_SECONDS; FallbackMusic.bAlignBeat = ALIGN_MUSIC_BEATS; SOUND->PlayMusic( PlayParams, FallbackMusic ); diff --git a/stepmania/src/ScreenSelectMusic.h b/stepmania/src/ScreenSelectMusic.h index 4d8d619fac..d8adff3730 100644 --- a/stepmania/src/ScreenSelectMusic.h +++ b/stepmania/src/ScreenSelectMusic.h @@ -62,6 +62,7 @@ protected: ThemeMetric SAMPLE_MUSIC_DELAY; ThemeMetric SAMPLE_MUSIC_LOOPS; + ThemeMetric SAMPLE_MUSIC_FALLBACK_FADE_IN_SECONDS; ThemeMetric DO_ROULETTE_ON_MENU_TIMER; ThemeMetric ALIGN_MUSIC_BEATS; ThemeMetric CODES;