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

Revert. FLUSHING was defined by me, so it's not possible for me to have

Browse Source 
misconceptions about what it means.  :)  Probable real fix in a moment
(that doesn't cause us to waste resources mixing silence).
This commit is contained in:
Glenn Maynard
2004-11-04 00:19:18 +00:00
parent feae525a63
commit 26faea2615
1 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/arch/Sound/RageSoundDriver_ALSA9.cpp
+12 -5
View File
@@ -168,7 +168,7 @@ void RageSound_ALSA9::StartMixing(RageSoundBase *snd)
}
/* Place the sound in SETUP, where nobody else will touch it, until we put it
* in PLAYING below. */
* in FLUSHING or PLAYING below. */
stream_pool[i]->state = stream::SETUP;
m_InactiveSoundMutex.Unlock();
@@ -186,9 +186,16 @@ void RageSound_ALSA9::StartMixing(RageSoundBase *snd)
stream_pool[i]->pcm->Play();
// Forget what was here before. Go straight to PLAYING; every sound is
// supposed to be heard in full.
stream_pool[i]->state = stream_pool[i]->PLAYING;
/* If bEOF is true, we actually finished the whole file in the prebuffering
* GetData call above, and the sound should go straight to FLUSHING. Otherwise,
* set PLAYING. */
if( bEOF )
{
stream_pool[i]->state = stream_pool[i]->FLUSHING;
stream_pool[i]->flush_pos = stream_pool[i]->pcm->GetPosition();
}
else
stream_pool[i]->state = stream_pool[i]->PLAYING;
}
void RageSound_ALSA9::Update(float delta)
@@ -203,7 +210,7 @@ void RageSound_ALSA9::Update(float delta)
stream_pool[i]->snd->SoundIsFinishedPlaying();
stream_pool[i]->snd = NULL;
/* Once we do this, the sound is once again available for use; we must lock
/* Once we do this, the sound is again available for use; we must lock
* m_InactiveSoundMutex to take it out of INACTIVE again. */
stream_pool[i]->state = stream_pool[i]->INACTIVE;
}