From f6677b20a3a608a78e0739279924e95882064907 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Fri, 6 Apr 2007 18:09:46 +0000 Subject: [PATCH] p.m_FadeLength -> p.m_fFadeOutSeconds --- stepmania/src/GameSoundManager.cpp | 2 +- stepmania/src/RageSound.cpp | 4 ++-- stepmania/src/RageSound.h | 2 +- stepmania/src/RageSoundReader_Extend.cpp | 2 +- stepmania/src/ScreenGameplay.cpp | 4 ++-- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/stepmania/src/GameSoundManager.cpp b/stepmania/src/GameSoundManager.cpp index e33bcc52da..e83db96b14 100644 --- a/stepmania/src/GameSoundManager.cpp +++ b/stepmania/src/GameSoundManager.cpp @@ -235,7 +235,7 @@ static void StartMusic( MusicToPlay &ToPlay ) RageSoundParams p; p.m_StartSecond = ToPlay.fStartSecond; p.m_LengthSeconds = ToPlay.fLengthSeconds; - p.m_FadeLength = ToPlay.fFadeOutLengthSeconds; + p.m_fFadeOutSeconds = ToPlay.fFadeOutLengthSeconds; p.m_StartTime = when; if( ToPlay.bForceLoop ) p.StopMode = RageSoundParams::M_LOOP; diff --git a/stepmania/src/RageSound.cpp b/stepmania/src/RageSound.cpp index fedb9dc601..7d6b37c99d 100644 --- a/stepmania/src/RageSound.cpp +++ b/stepmania/src/RageSound.cpp @@ -44,7 +44,7 @@ RageSoundParams::RageSoundParams(): { m_StartSecond = 0; m_LengthSeconds = -1; - m_FadeLength = 0; + m_fFadeOutSeconds = 0; m_Volume = 1.0f; m_fPitch = 1.0f; m_fSpeed = 1.0f; @@ -581,7 +581,7 @@ void RageSound::ApplyParams() m_pSource->SetProperty( "Speed", m_Param.m_fSpeed ); m_pSource->SetProperty( "StartSecond", m_Param.m_StartSecond ); m_pSource->SetProperty( "LengthSeconds", m_Param.m_LengthSeconds ); - m_pSource->SetProperty( "FadeSeconds", m_Param.m_FadeLength ); + m_pSource->SetProperty( "FadeSeconds", m_Param.m_fFadeOutSeconds ); float fVolume = m_Param.m_Volume * SOUNDMAN->GetMixVolume(); m_pSource->SetProperty( "Volume", fVolume ); diff --git a/stepmania/src/RageSound.h b/stepmania/src/RageSound.h index 4a85bec85d..352dcaf9ef 100644 --- a/stepmania/src/RageSound.h +++ b/stepmania/src/RageSound.h @@ -33,7 +33,7 @@ struct RageSoundParams float m_LengthSeconds; /* Number of seconds to spend fading out. */ - float m_FadeLength; + float m_fFadeOutSeconds; float m_Volume; // multiplies with SOUNDMAN->GetMixVolume() diff --git a/stepmania/src/RageSoundReader_Extend.cpp b/stepmania/src/RageSoundReader_Extend.cpp index 72f90ee452..8a31ea1727 100644 --- a/stepmania/src/RageSoundReader_Extend.cpp +++ b/stepmania/src/RageSoundReader_Extend.cpp @@ -95,7 +95,7 @@ int RageSoundReader_Extend::Read( float *pBuffer, int iFrames ) if( iFramesRead > 0 ) { - /* We want to fade when there's m_FadeLength seconds left, but if + /* We want to fade when there's m_iFadeFrames frames left, but if * m_LengthFrames is -1, we don't know the length we're playing. * (m_LengthFrames is the length to play, not the length of the * source.) If we don't know the length, don't fade. */ diff --git a/stepmania/src/ScreenGameplay.cpp b/stepmania/src/ScreenGameplay.cpp index 72eefc10cd..f09ece9720 100644 --- a/stepmania/src/ScreenGameplay.cpp +++ b/stepmania/src/ScreenGameplay.cpp @@ -2312,9 +2312,9 @@ void ScreenGameplay::HandleScreenMessage( const ScreenMessage SM ) else { /* Load the next song in the course. First, fade out and stop the music. */ - float fFadeLengthSeconds = MUSIC_FADE_OUT_SECONDS; + float fFadeOutSeconds = MUSIC_FADE_OUT_SECONDS; RageSoundParams p = m_pSoundMusic->GetParams(); - p.m_FadeLength = fFadeLengthSeconds; + p.m_fFadeOutSeconds = fFadeOutSeconds; p.m_LengthSeconds = GAMESTATE->m_fMusicSeconds + fFadeLengthSeconds; m_pSoundMusic->SetParams(p); SCREENMAN->PostMessageToTopScreen( SM_StartLoadingNextSong, fFadeLengthSeconds );