dhewm/dhewm3
0
0
Fork 0
mirror of https://github.com/dhewm/dhewm3.git synced 2025-02-21 11:31:49 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix entering the menu or saving the game stopping some sounds.

Browse source 
If an OpenAL source runs out of samples it transisions into state
AL_STOPPED. That happens if we're entering the menu (which switches
to another soundworld) and when saving the game (because the game
blocks for some milliseconds). Work around this by adding a new
field 'stopped' to the channel state and use that to determine if
a sound was stopped. And not AL_STOPPED like before.
This commit is contained in:
Yamagi Burmeister 2018-07-14 17:28:37 +02:00 committed by Daniel Gibson
parent b7c9ef7ec4
commit 4a6327d87a
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
neo/sound/snd_emitter.cpp
View file

@ -179,6 +179,7 @@ void idSoundChannel::Clear( void ) {
diversity = 0.0f;
leadinSample = NULL;
trigger44kHzTime = 0;
stopped = false;
for( j = 0; j < 6; j++ ) {
lastV[j] = 0.0f;
}
@ -210,6 +211,7 @@ idSoundChannel::Stop
*/
void idSoundChannel::Stop( void ) {
triggerState = false;
stopped = true;
if ( decoder != NULL ) {
idSampleDecoder::Free( decoder );
decoder = NULL;
@ -461,9 +463,8 @@ void idSoundEmitterLocal::CheckForCompletion( int current44kHzTime ) {
if ( chan->leadinSample->onDemand ) {
chan->leadinSample->PurgeSoundSample();
}
continue;
}
} else if ( ( chan->trigger44kHzTime + chan->leadinSample->LengthIn44kHzSamples() < current44kHzTime ) || ( state == AL_STOPPED ) ) {
} else if ( ( chan->trigger44kHzTime + chan->leadinSample->LengthIn44kHzSamples() < current44kHzTime ) || ( chan->stopped ) ) {
chan->Stop();
// free hardware resources
@ -473,7 +474,6 @@ void idSoundEmitterLocal::CheckForCompletion( int current44kHzTime ) {
if ( chan->leadinSample->onDemand ) {
chan->leadinSample->PurgeSoundSample();
}
continue;
}
}
@ -831,6 +831,7 @@ int idSoundEmitterLocal::StartSound( const idSoundShader *shader, const s_channe
chan->triggerGame44kHzTime = soundWorld->game44kHz;
chan->soundShader = shader;
chan->triggerChannel = channel;
chan->stopped = false;
chan->Start();
// we need to start updating the def and mixing it in

1
neo/sound/snd_local.h
View file

@ -384,6 +384,7 @@ public:
ALuint openalStreamingOffset;
ALuint openalStreamingBuffer[3];
ALuint lastopenalStreamingBuffer[3];
bool stopped;
bool disallowSlow;