diff --git a/stepmania/src/RageSoundReader_Chain.cpp b/stepmania/src/RageSoundReader_Chain.cpp index 18ae6ffa71..7d29f1bca3 100644 --- a/stepmania/src/RageSoundReader_Chain.cpp +++ b/stepmania/src/RageSoundReader_Chain.cpp @@ -182,7 +182,7 @@ void RageSoundReader_Chain::Finish() sort( m_aSounds.begin(), m_aSounds.end() ); } -int RageSoundReader_Chain::SetPosition_Accurate( int iFrame ) +int RageSoundReader_Chain::SetPosition( int iFrame ) { /* Clear m_apActiveSounds. */ while( !m_apActiveSounds.empty() ) @@ -206,7 +206,7 @@ int RageSoundReader_Chain::SetPosition_Accurate( int iFrame ) RageSoundReader *pReader = pSound->pSound; int iOffsetFrames = iFrame - iOffsetFrame; - if( iOffsetFrames > 0 && pReader->SetPosition_Accurate(iOffsetFrames) == 0 ) + if( iOffsetFrames > 0 && pReader->SetPosition(iOffsetFrames) == 0 ) { /* We're past the end of this sound. */ ReleaseSound( pSound ); diff --git a/stepmania/src/RageSoundReader_Chain.h b/stepmania/src/RageSoundReader_Chain.h index 3059bfa7d2..8a86729e6a 100644 --- a/stepmania/src/RageSoundReader_Chain.h +++ b/stepmania/src/RageSoundReader_Chain.h @@ -30,10 +30,7 @@ public: int GetLength() const; int GetLength_Fast() const; - int SetPosition_Accurate( int iFrame ); - /* It rarely makes sense to set an approximate time for a chained sound, since any - * error in overlap will become obvious. */ - int SetPosition_Fast( int iFrame ) { return SetPosition_Accurate( iFrame ); } + int SetPosition( int iFrame ); int Read( char *pBuf, int iFrames ); int GetSampleRate() const { return m_iActualSampleRate; } unsigned GetNumChannels() const { return m_iChannels; }