remove iRate param
This commit is contained in:
@@ -122,7 +122,7 @@ void AutoKeysounds::FinishLoading()
|
|||||||
|
|
||||||
/* Load the BGM. */
|
/* Load the BGM. */
|
||||||
RageSoundReader_Chain *pChain = new RageSoundReader_Chain;
|
RageSoundReader_Chain *pChain = new RageSoundReader_Chain;
|
||||||
pChain->SetPreferredSampleRate( SOUNDMAN->GetDriverSampleRate(44100) );
|
pChain->SetPreferredSampleRate( SOUNDMAN->GetDriverSampleRate() );
|
||||||
|
|
||||||
Song* pSong = GAMESTATE->m_pCurSong;
|
Song* pSong = GAMESTATE->m_pCurSong;
|
||||||
pChain->AddSound( pChain->LoadSound(pSong->GetMusicPath()), 0, 0 );
|
pChain->AddSound( pChain->LoadSound(pSong->GetMusicPath()), 0, 0 );
|
||||||
|
|||||||
@@ -241,7 +241,7 @@ void RageSound::LoadSoundReader( RageSoundReader *pSound )
|
|||||||
|
|
||||||
m_iStreamFrame = m_iSourceFrame = m_iStoppedSourceFrame = 0;
|
m_iStreamFrame = m_iSourceFrame = m_iStoppedSourceFrame = 0;
|
||||||
|
|
||||||
const int iNeededRate = SOUNDMAN->GetDriverSampleRate( pSound->GetSampleRate() );
|
const int iNeededRate = SOUNDMAN->GetDriverSampleRate();
|
||||||
bool bSupportRateChange = false;
|
bool bSupportRateChange = false;
|
||||||
if( iNeededRate != pSound->GetSampleRate() || bSupportRateChange )
|
if( iNeededRate != pSound->GetSampleRate() || bSupportRateChange )
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -236,7 +236,7 @@ float RageSoundManager::GetPlayLatency() const
|
|||||||
return m_pDriver->GetPlayLatency();
|
return m_pDriver->GetPlayLatency();
|
||||||
}
|
}
|
||||||
|
|
||||||
int RageSoundManager::GetDriverSampleRate( int iRate ) const
|
int RageSoundManager::GetDriverSampleRate() const
|
||||||
{
|
{
|
||||||
if( m_pDriver == NULL )
|
if( m_pDriver == NULL )
|
||||||
return 44100;
|
return 44100;
|
||||||
|
|||||||
@@ -43,7 +43,7 @@ public:
|
|||||||
int GetUniqueID(); /* used by RageSound */
|
int GetUniqueID(); /* used by RageSound */
|
||||||
void CommitPlayingPosition( int ID, int64_t frameno, int64_t pos, int got_bytes ); /* used by drivers */
|
void CommitPlayingPosition( int ID, int64_t frameno, int64_t pos, int got_bytes ); /* used by drivers */
|
||||||
float GetPlayLatency() const;
|
float GetPlayLatency() const;
|
||||||
int GetDriverSampleRate( int iRate ) const;
|
int GetDriverSampleRate() const;
|
||||||
|
|
||||||
/* When deleting a sound from any thread except the one calling Update(), this
|
/* When deleting a sound from any thread except the one calling Update(), this
|
||||||
* must be used to prevent race conditions. */
|
* must be used to prevent race conditions. */
|
||||||
|
|||||||
Reference in New Issue
Block a user