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

use SoundIsFinishedPlaying

Browse Source 
when Stop is called, stop the sound immediately; don't wait for it
to flush
This commit is contained in:
Glenn Maynard
2004-04-07 04:13:26 +00:00
parent 6274bf9011
commit e451db6b30
1 changed files with 7 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/arch/Sound/RageSoundDriver_DSound.cpp
+7 -12
View File
@@ -101,7 +101,7 @@ void RageSound_DSound::Update(float delta)
/* The sound has stopped and flushed all of its buffers. */
if(str[i]->snd != NULL)
str[i]->snd->StopPlaying();
str[i]->snd->SoundIsFinishedPlaying();
str[i]->snd = NULL;
str[i]->pcm->Stop();
@@ -309,17 +309,12 @@ void RageSound_DSound::StopMixing( RageSoundBase *snd )
return;
}
/* STOPPING tells the mixer thread to release the stream once str->flush_bufs
* buffers have been flushed. */
stream_pool[i]->state = stream_pool[i]->STOPPING;
/* Flush two buffers worth of data. */
stream_pool[i]->flush_pos = stream_pool[i]->pcm->GetOutputPosition();
/* This function is called externally (by RageSound) to stop immediately.
* We need to prevent SoundStopped from being called; it should only be
* called when we stop implicitely at the end of a sound. Set snd to NULL. */
stream_pool[i]->snd = NULL;
/* We need to make sure the sound stream is actually stopped before we return;
* don't wait for the buffered frames to finish. This is because exiting a
* thread before stopping its sounds causes glitches or worse. Other drivers
* don't need to guarantee this; this is just a peculiarity of DirectSound. */
stream_pool[i]->pcm->Stop();
stream_pool[i]->state = stream_pool[i]->INACTIVE;
}
int64_t RageSound_DSound::GetPosition( const RageSoundBase *snd ) const