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

m_iFadeFrames -> m_iFadeOutFrames

Browse Source
This commit is contained in:
Glenn Maynard
2007-04-06 17:52:49 +00:00
parent 023025e01b
commit 9860bca9ea
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/RageSoundReader_Extend.cpp
+4 -4
View File
@@ -20,7 +20,7 @@ RageSoundReader_Extend::RageSoundReader_Extend( RageSoundReader *pSource ):
m_StopMode = M_STOP; m_StopMode = M_STOP;
m_iStartFrames = 0; m_iStartFrames = 0;
m_iLengthFrames = -1; m_iLengthFrames = -1;
m_iFadeFrames = 0; m_iFadeOutFrames = 0;
} }
int RageSoundReader_Extend::SetPosition( int iFrame ) int RageSoundReader_Extend::SetPosition( int iFrame )
@@ -99,10 +99,10 @@ int RageSoundReader_Extend::Read( float *pBuffer, int iFrames )
* 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_iFadeFrames != 0 && m_iLengthFrames != -1 ) if( m_iFadeOutFrames != 0 && m_iLengthFrames != -1 )
{ {
const int iFinishFadingOutAt = GetEndFrame(); const int iFinishFadingOutAt = GetEndFrame();
const int iStartFadingOutAt = iFinishFadingOutAt - m_iFadeFrames; const int iStartFadingOutAt = iFinishFadingOutAt - m_iFadeOutFrames;
const int iStartSecond = m_iPositionFrames; const int iStartSecond = m_iPositionFrames;
const int iEndSecond = m_iPositionFrames + iFramesRead; const int iEndSecond = m_iPositionFrames + iFramesRead;
const float fStartVolume = SCALE( iStartSecond, iStartFadingOutAt, iFinishFadingOutAt, 1.0f, 0.0f ); const float fStartVolume = SCALE( iStartSecond, iStartFadingOutAt, iFinishFadingOutAt, 1.0f, 0.0f );
@@ -164,7 +164,7 @@ bool RageSoundReader_Extend::SetProperty( const RString &sProperty, float fValue
if( sProperty == "FadeSeconds" ) if( sProperty == "FadeSeconds" )
{ {
m_iFadeFrames = lrintf( fValue * this->GetSampleRate() ); m_iFadeOutFrames = lrintf( fValue * this->GetSampleRate() );
return true; return true;
} }
stepmania/src/RageSoundReader_Extend.h
+1 -1
View File
@@ -27,7 +27,7 @@ private:
StopMode m_StopMode; StopMode m_StopMode;
int m_iStartFrames; int m_iStartFrames;
int m_iLengthFrames; int m_iLengthFrames;
int m_iFadeFrames; int m_iFadeOutFrames;
}; };
#endif #endif