"PlayTheSound"? Don't rename functions to ridiculous things like that. This works fine in VC7 and VC8, so I'm reverting it. Ask before making ugly changes.
This commit is contained in:
@@ -647,7 +647,7 @@ RageSound *RageSound::Play( const RageSoundParams *pParams )
|
|||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
return SOUNDMAN->PlayTheSound( *this, pParams );
|
return SOUNDMAN->PlaySound( *this, pParams );
|
||||||
}
|
}
|
||||||
|
|
||||||
void RageSound::Stop()
|
void RageSound::Stop()
|
||||||
|
|||||||
@@ -244,9 +244,9 @@ int RageSoundManager::GetDriverSampleRate( int iRate ) const
|
|||||||
return m_pDriver->GetSampleRate( iRate );
|
return m_pDriver->GetSampleRate( iRate );
|
||||||
}
|
}
|
||||||
|
|
||||||
/* The return value of PlayTheSound and PlayCopyOfSound is only valid in the main
|
/* The return value of PlaySound and PlayCopyOfSound is only valid in the main
|
||||||
* thread, until the next call to Update(). After that, it may be deleted. */
|
* thread, until the next call to Update(). After that, it may be deleted. */
|
||||||
RageSound *RageSoundManager::PlayTheSound( RageSound &snd, const RageSoundParams *params )
|
RageSound *RageSoundManager::PlaySound( RageSound &snd, const RageSoundParams *params )
|
||||||
{
|
{
|
||||||
if( snd.IsPlaying() )
|
if( snd.IsPlaying() )
|
||||||
return PlayCopyOfSound( snd, params );
|
return PlayCopyOfSound( snd, params );
|
||||||
|
|||||||
@@ -55,7 +55,7 @@ public:
|
|||||||
|
|
||||||
void PlayOnce( RString sPath );
|
void PlayOnce( RString sPath );
|
||||||
|
|
||||||
RageSound *PlayTheSound( RageSound &snd, const RageSoundParams *params = NULL );
|
RageSound *PlaySound( RageSound &snd, const RageSoundParams *params = NULL );
|
||||||
RageSound *PlayCopyOfSound( RageSound &snd, const RageSoundParams *params = NULL );
|
RageSound *PlayCopyOfSound( RageSound &snd, const RageSoundParams *params = NULL );
|
||||||
|
|
||||||
private:
|
private:
|
||||||
|
|||||||
Reference in New Issue
Block a user