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

If m_LengthSeconds is longer than the actual file, pad with silence; this way,

Browse Source 
if looping, the sound will loop exactly once every m_LengthSeconds.  This should
fix obscure beat alignment problems if sample music ends at the end of the file,
since before, extending the length beyond the end of the file didn't do anything.

Fix m_FadeLength.  The length was being ignored.

Add m_FadedOutAt; this way, if beat alignment extends a 10-second clip at the
end of a file by .5 seconds, we can fade out 9..10, instead of 9.5 ... 10.5,
which would cause the sound to cut out early.
This commit is contained in:
Glenn Maynard
2004-09-23 09:10:04 +00:00
parent cae82a308a
commit 4a17c3d725
2 changed files with 35 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/RageSound.cpp
+29 -5
View File
@@ -49,6 +49,7 @@ RageSoundParams::RageSoundParams():
m_StartSecond = 0;
m_LengthSeconds = -1;
m_FadeLength = 0;
m_FadedOutAt = -1;
m_Volume = -1.0f; // use SOUNDMAN->GetMixVolume()
m_Balance = 0; // center
speed_input_samples = speed_output_samples = 1;
@@ -428,6 +429,10 @@ void PanSound( int16_t *buffer, int frames, float fPos )
void FadeSound( int16_t *buffer, int frames, float fStartVolume, float fEndVolume )
{
/* If the whole buffer is full volume, skip. */
if( fStartVolume > .9999f && fEndVolume > .9999f )
return;
for( int samp = 0; samp < frames; ++samp )
{
float fVolPercent = SCALE( samp, 0, frames, fStartVolume, fEndVolume );
@@ -478,6 +483,22 @@ bool RageSound::GetDataToPlay( int16_t *buffer, int size, int &sound_frame, int
/* Get a block of data. */
int got_frames = GetData( (char *) buffer, size );
/* If we didn't get any data, see if we need to pad the end of the file with
* silence for m_LengthSeconds. */
if( !got_frames && m_Param.m_LengthSeconds != -1 )
{
const float LastSecond = m_Param.m_StartSecond + m_Param.m_LengthSeconds;
int LastFrame = int(LastSecond*samplerate());
int FramesOfSilence = LastFrame - decode_position;
FramesOfSilence = clamp( FramesOfSilence, 0, size );
if( FramesOfSilence > 0 )
{
memset( buffer, 0, FramesOfSilence * framesize );
got_frames = FramesOfSilence;
}
}
if( !got_frames )
{
/* EOF. */
@@ -533,15 +554,18 @@ bool RageSound::GetDataToPlay( int16_t *buffer, int size, int &sound_frame, int
/* This block goes from decode_position to decode_position+got_frames. */
/* We want to fade when there's FADE_TIME seconds left, but if
/* We want to fade when there's m_FadeLength seconds 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. */
if( m_Param.m_FadeLength != 0 && m_Param.m_LengthSeconds != -1 )
if( m_Param.m_FadeLength != 0 && (m_Param.m_LengthSeconds != -1 || m_Param.m_FadedOutAt != -1) )
{
const float fLastSecond = m_Param.m_StartSecond+m_Param.m_LengthSeconds;
const float fStartVolume = fLastSecond - float(decode_position) / samplerate();
const float fEndVolume = fLastSecond - float(decode_position+got_frames) / samplerate();
const float fFinishFadingOutAt = m_Param.m_FadedOutAt != -1? m_Param.m_FadedOutAt: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();
const float fStartVolume = SCALE( fStartSecond, fStartFadingOutAt, fFinishFadingOutAt, 1.0f, 0.0f );
const float fEndVolume = SCALE( fEndSecond, fStartFadingOutAt, fFinishFadingOutAt, 1.0f, 0.0f );
FadeSound( buffer, got_frames, fStartVolume, fEndVolume );
}
stepmania/src/RageSound.h
+6 -1
View File
@@ -35,8 +35,13 @@ struct RageSoundParams
float m_StartSecond;
float m_LengthSeconds;
/* Amount of time to fade out at the end. */
/* Number of seconds to spend fading out. */
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; }
float m_Volume;