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

less overhead when not used

Browse Source
This commit is contained in:
Glenn Maynard
2007-01-18 10:30:47 +00:00
parent ec1764291d
commit 18d09949c5
2 changed files with 18 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/RageSoundReader_PitchChange.cpp
+12 -3
View File
@@ -22,6 +22,8 @@ RageSoundReader_PitchChange::RageSoundReader_PitchChange( RageSoundReader *pSour
m_pSource = m_pResample; m_pSource = m_pResample;
m_fSpeedRatio = 1.0f; m_fSpeedRatio = 1.0f;
m_fPitchRatio = 1.0f; m_fPitchRatio = 1.0f;
m_fLastSetSpeedRatio = m_fSpeedRatio;
m_fLastSetPitchRatio = m_fPitchRatio;
} }
RageSoundReader_PitchChange::RageSoundReader_PitchChange( const RageSoundReader_PitchChange &cpy ): RageSoundReader_PitchChange::RageSoundReader_PitchChange( const RageSoundReader_PitchChange &cpy ):
@@ -34,6 +36,8 @@ RageSoundReader_PitchChange::RageSoundReader_PitchChange( const RageSoundReader_
m_pSpeedChange = dynamic_cast<RageSoundReader_SpeedChange *>( m_pResample->GetSource() ); m_pSpeedChange = dynamic_cast<RageSoundReader_SpeedChange *>( m_pResample->GetSource() );
m_fSpeedRatio = cpy.m_fSpeedRatio; m_fSpeedRatio = cpy.m_fSpeedRatio;
m_fPitchRatio = cpy.m_fPitchRatio; m_fPitchRatio = cpy.m_fPitchRatio;
m_fLastSetSpeedRatio = cpy.m_fLastSetSpeedRatio;
m_fLastSetPitchRatio = cpy.m_fLastSetPitchRatio;
} }
int RageSoundReader_PitchChange::Read( char *pBuf, int iFrames ) int RageSoundReader_PitchChange::Read( char *pBuf, int iFrames )
@@ -42,9 +46,11 @@ int RageSoundReader_PitchChange::Read( char *pBuf, int iFrames )
* immediately on the next Read(). When this is true, apply the ratio to the * immediately on the next Read(). When this is true, apply the ratio to the
* resampler and the speed changer simultaneously, so they take effect as * resampler and the speed changer simultaneously, so they take effect as
* closely together as possible. */ * closely together as possible. */
float fRate = GetStreamToSourceRatio(); if( (m_fLastSetSpeedRatio != m_fSpeedRatio || m_fLastSetPitchRatio != m_fPitchRatio) &&
if( m_pSpeedChange->NextReadWillStep() ) m_pSpeedChange->NextReadWillStep() )
{ {
float fRate = GetStreamToSourceRatio();
/* This is the simple way: */ /* This is the simple way: */
// m_pResample->SetRate( m_fPitchRatio ); // m_pResample->SetRate( m_fPitchRatio );
// m_pSpeedChange->SetSpeedRatio( m_fSpeedRatio / m_fPitchRatio ); // m_pSpeedChange->SetSpeedRatio( m_fSpeedRatio / m_fPitchRatio );
@@ -56,12 +62,15 @@ int RageSoundReader_PitchChange::Read( char *pBuf, int iFrames )
float fActualPitchRatio = m_pResample->GetRate(); float fActualPitchRatio = m_pResample->GetRate();
float fRequestedSpeedRatio = m_fSpeedRatio / fActualPitchRatio; float fRequestedSpeedRatio = m_fSpeedRatio / fActualPitchRatio;
m_pSpeedChange->SetSpeedRatio( fRequestedSpeedRatio ); m_pSpeedChange->SetSpeedRatio( fRequestedSpeedRatio );
}
m_fLastSetSpeedRatio = m_fSpeedRatio;
m_fLastSetPitchRatio = m_fPitchRatio;
/* If we just applied a new speed and it caused the ratio to change, return /* If we just applied a new speed and it caused the ratio to change, return
* no data, so the caller can see the new ratio. */ * no data, so the caller can see the new ratio. */
if( fRate != GetStreamToSourceRatio() ) if( fRate != GetStreamToSourceRatio() )
return 0; return 0;
}
return RageSoundReader_Filter::Read( pBuf, iFrames ); return RageSoundReader_Filter::Read( pBuf, iFrames );
} }
stepmania/src/RageSoundReader_PitchChange.h
+2
View File
@@ -27,6 +27,8 @@ private:
float m_fSpeedRatio; float m_fSpeedRatio;
float m_fPitchRatio; float m_fPitchRatio;
float m_fLastSetSpeedRatio;
float m_fLastSetPitchRatio;
}; };
#endif #endif