actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

remove m_FadedOutAt; didn't like the effect produced

Browse Source
This commit is contained in:
Glenn Maynard
2004-09-23 12:23:24 +00:00
parent 9dbfc3ace1
commit 1b02c6d494
2 changed files with 2 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/RageSound.cpp
+2 -8
View File
@@ -49,7 +49,6 @@ RageSoundParams::RageSoundParams():
m_StartSecond = 0; m_StartSecond = 0;
m_LengthSeconds = -1; m_LengthSeconds = -1;
m_FadeLength = 0; m_FadeLength = 0;
m_FadedOutAt = -1;
m_Volume = -1.0f; // use SOUNDMAN->GetMixVolume() m_Volume = -1.0f; // use SOUNDMAN->GetMixVolume()
m_Balance = 0; // center m_Balance = 0; // center
speed_input_samples = speed_output_samples = 1; speed_input_samples = speed_output_samples = 1;
@@ -558,14 +557,9 @@ bool RageSound::GetDataToPlay( int16_t *buffer, int size, int &sound_frame, int
* m_LengthFrames is -1, we don't know the length we're playing. * 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 * (m_LengthFrames is the length to play, not the length of the
* source.) If we don't know the length, don't fade. */ * 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) ) if( m_Param.m_FadeLength != 0 && m_Param.m_LengthSeconds != -1 )
{ {
float fFinishFadingOutAt; const float fFinishFadingOutAt = m_Param.m_StartSecond + m_Param.m_LengthSeconds;
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 fStartFadingOutAt = fFinishFadingOutAt - m_Param.m_FadeLength;
const float fStartSecond = float(decode_position) / samplerate(); const float fStartSecond = float(decode_position) / samplerate();
const float fEndSecond = float(decode_position+got_frames) / samplerate(); const float fEndSecond = float(decode_position+got_frames) / samplerate();
stepmania/src/RageSound.h
-4
View File
@@ -38,10 +38,6 @@ struct RageSoundParams
/* Number of seconds to spend fading out. */ /* Number of seconds to spend fading out. */
float m_FadeLength; float m_FadeLength;
/* If set, the sound will be completely faded out at this position; otherwise,
* m_LengthSeconds is used. */
float m_FadedOutAt;
void SetNoFade() { m_FadeLength = 0; } void SetNoFade() { m_FadeLength = 0; }
float m_Volume; float m_Volume;