remove param
This commit is contained in:
@@ -149,7 +149,7 @@ void GameLoop::RunGameLoop()
|
|||||||
CheckFocus();
|
CheckFocus();
|
||||||
|
|
||||||
/* Update SOUNDMAN early (before any RageSound::GetPosition calls), to flush position data. */
|
/* Update SOUNDMAN early (before any RageSound::GetPosition calls), to flush position data. */
|
||||||
SOUNDMAN->Update( fDeltaTime );
|
SOUNDMAN->Update();
|
||||||
|
|
||||||
/* Update song beat information -before- calling update on all the classes that
|
/* Update song beat information -before- calling update on all the classes that
|
||||||
* depend on it. If you don't do this first, the classes are all acting on old
|
* depend on it. If you don't do this first, the classes are all acting on old
|
||||||
|
|||||||
@@ -158,7 +158,7 @@ void RageSoundManager::Update( float fDeltaTime )
|
|||||||
delete *it;
|
delete *it;
|
||||||
|
|
||||||
if( m_pDriver != NULL )
|
if( m_pDriver != NULL )
|
||||||
m_pDriver->Update( fDeltaTime );
|
m_pDriver->Update();
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Register the given sound, and return a unique ID. */
|
/* Register the given sound, and return a unique ID. */
|
||||||
|
|||||||
@@ -37,7 +37,7 @@ public:
|
|||||||
* call RageSoundBase::SoundIsFinishedPlaying(). */
|
* call RageSoundBase::SoundIsFinishedPlaying(). */
|
||||||
|
|
||||||
/* Optional, if needed: */
|
/* Optional, if needed: */
|
||||||
virtual void Update(float delta) { }
|
virtual void Update() { }
|
||||||
|
|
||||||
/* Sound startup latency--delay between Play() being called and actually
|
/* Sound startup latency--delay between Play() being called and actually
|
||||||
* hearing it. (This isn't necessarily the same as the buffer latency.) */
|
* hearing it. (This isn't necessarily the same as the buffer latency.) */
|
||||||
|
|||||||
@@ -203,7 +203,7 @@ void RageSound_ALSA9::StartMixing(RageSoundBase *snd)
|
|||||||
stream_pool[i]->state = stream_pool[i]->PLAYING;
|
stream_pool[i]->state = stream_pool[i]->PLAYING;
|
||||||
}
|
}
|
||||||
|
|
||||||
void RageSound_ALSA9::Update(float delta)
|
void RageSound_ALSA9::Update()
|
||||||
{
|
{
|
||||||
for(unsigned i = 0; i < stream_pool.size(); ++i)
|
for(unsigned i = 0; i < stream_pool.size(); ++i)
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -17,7 +17,7 @@ public:
|
|||||||
int64_t GetPosition( const RageSoundBase *snd ) const;
|
int64_t GetPosition( const RageSoundBase *snd ) const;
|
||||||
int GetSampleRate( int rate ) const;
|
int GetSampleRate( int rate ) const;
|
||||||
|
|
||||||
void Update(float delta);
|
void Update();
|
||||||
|
|
||||||
RageSound_ALSA9();
|
RageSound_ALSA9();
|
||||||
RString Init();
|
RString Init();
|
||||||
|
|||||||
@@ -100,7 +100,7 @@ void RageSound_DSound::MixerThread()
|
|||||||
stream_pool[i]->pcm->Stop();
|
stream_pool[i]->pcm->Stop();
|
||||||
}
|
}
|
||||||
|
|
||||||
void RageSound_DSound::Update(float delta)
|
void RageSound_DSound::Update()
|
||||||
{
|
{
|
||||||
/* SoundStopped might erase sounds out from under us, so make a copy
|
/* SoundStopped might erase sounds out from under us, so make a copy
|
||||||
* of the sound list. */
|
* of the sound list. */
|
||||||
|
|||||||
@@ -65,7 +65,7 @@ private:
|
|||||||
void StopMixing( RageSoundBase *snd ); /* used by RageSound */
|
void StopMixing( RageSoundBase *snd ); /* used by RageSound */
|
||||||
bool PauseMixing( RageSoundBase *snd, bool bStop );
|
bool PauseMixing( RageSoundBase *snd, bool bStop );
|
||||||
int64_t GetPosition( const RageSoundBase *snd ) const;
|
int64_t GetPosition( const RageSoundBase *snd ) const;
|
||||||
void Update(float delta);
|
void Update();
|
||||||
|
|
||||||
int GetSampleRate( int rate ) const { return rate; }
|
int GetSampleRate( int rate ) const { return rate; }
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -258,7 +258,7 @@ int RageSound_Generic_Software::GetDataForSound( sound &s )
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
void RageSound_Generic_Software::Update(float delta)
|
void RageSound_Generic_Software::Update()
|
||||||
{
|
{
|
||||||
/* We must not lock here, since the decoder thread might hold the lock for a
|
/* We must not lock here, since the decoder thread might hold the lock for a
|
||||||
* while at a time. This is threadsafe, because once a sound is in STOPPING,
|
* while at a time. This is threadsafe, because once a sound is in STOPPING,
|
||||||
|
|||||||
@@ -10,7 +10,7 @@ static const int samples_per_block = 512;
|
|||||||
class RageSound_Generic_Software: public RageSoundDriver
|
class RageSound_Generic_Software: public RageSoundDriver
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
virtual void Update(float delta);
|
virtual void Update();
|
||||||
|
|
||||||
void StartMixing( RageSoundBase *snd ); /* used by RageSound */
|
void StartMixing( RageSoundBase *snd ); /* used by RageSound */
|
||||||
void StopMixing( RageSoundBase *snd ); /* used by RageSound */
|
void StopMixing( RageSoundBase *snd ); /* used by RageSound */
|
||||||
|
|||||||
@@ -6,7 +6,7 @@
|
|||||||
|
|
||||||
const int channels = 2;
|
const int channels = 2;
|
||||||
|
|
||||||
void RageSound_Null::Update( float fDeltaTime )
|
void RageSound_Null::Update()
|
||||||
{
|
{
|
||||||
/* "Play" frames. */
|
/* "Play" frames. */
|
||||||
while( m_iLastCursorPos < GetPosition(NULL)+1024*4 )
|
while( m_iLastCursorPos < GetPosition(NULL)+1024*4 )
|
||||||
@@ -16,7 +16,7 @@ void RageSound_Null::Update( float fDeltaTime )
|
|||||||
m_iLastCursorPos += 256;
|
m_iLastCursorPos += 256;
|
||||||
}
|
}
|
||||||
|
|
||||||
RageSound_Generic_Software::Update( fDeltaTime );
|
RageSound_Generic_Software::Update();
|
||||||
}
|
}
|
||||||
|
|
||||||
int64_t RageSound_Null::GetPosition( const RageSoundBase *snd ) const
|
int64_t RageSound_Null::GetPosition( const RageSoundBase *snd ) const
|
||||||
|
|||||||
@@ -9,7 +9,7 @@ public:
|
|||||||
RageSound_Null();
|
RageSound_Null();
|
||||||
int64_t GetPosition( const RageSoundBase *snd ) const;
|
int64_t GetPosition( const RageSoundBase *snd ) const;
|
||||||
int GetSampleRate( int iRate ) const;
|
int GetSampleRate( int iRate ) const;
|
||||||
void Update( float fDeltaTime );
|
void Update();
|
||||||
|
|
||||||
private:
|
private:
|
||||||
int64_t m_iLastCursorPos;
|
int64_t m_iLastCursorPos;
|
||||||
|
|||||||
Reference in New Issue
Block a user