From 9dbfc3ace148b925f55fea2bdcc6005c3e63c5a9 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Thu, 23 Sep 2004 09:31:12 +0000 Subject: [PATCH] fade fix --- stepmania/src/RageSound.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/stepmania/src/RageSound.cpp b/stepmania/src/RageSound.cpp index 329e02385f..45185396ec 100644 --- a/stepmania/src/RageSound.cpp +++ b/stepmania/src/RageSound.cpp @@ -560,7 +560,12 @@ bool RageSound::GetDataToPlay( int16_t *buffer, int size, int &sound_frame, int * source.) If we don't know the length, don't fade. */ if( m_Param.m_FadeLength != 0 && (m_Param.m_LengthSeconds != -1 || m_Param.m_FadedOutAt != -1) ) { - const float fFinishFadingOutAt = m_Param.m_FadedOutAt != -1? m_Param.m_FadedOutAt:m_Param.m_LengthSeconds; + float fFinishFadingOutAt; + if( m_Param.m_FadedOutAt != -1 ) + fFinishFadingOutAt = m_Param.m_FadedOutAt; + else + fFinishFadingOutAt = m_Param.m_StartSecond + m_Param.m_LengthSeconds; + const float fStartFadingOutAt = fFinishFadingOutAt - m_Param.m_FadeLength; const float fStartSecond = float(decode_position) / samplerate(); const float fEndSecond = float(decode_position+got_frames) / samplerate();