FGFS-4.1/simgear
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

#767 related: fix sound resource management

Browse Source 
Use _smgr->release_buffer instead of direct alDeleteBuffers.
This commit is contained in:
ThorstenB
2012-05-12 23:35:10 +02:00
parent 6695b918ea
commit e69d1b5a82
1 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
simgear/sound/sample_group.cxx
View File

@@ -102,21 +102,19 @@ void SGSampleGroup::update( double dt ) {
alSourceStop( source );
alGetSourcei( source, AL_SOURCE_STATE, &result );
}
if ( result == AL_STOPPED ) {
sample->no_valid_source();
_smgr->release_source( sample->get_source() );
}
}
if ( result == AL_STOPPED ) {
sample->no_valid_source();
_smgr->release_source( source );
}
}
if ( result == AL_STOPPED ) {
sample->stop();
if ( !sample->is_queue() ) {
ALuint buffer = sample->get_buffer();
// disconnect buffer from its source - otherwise it cannot be deleted
alSourceUnqueueBuffers(sample->get_source(), 1, &buffer);
alDeleteBuffers( 1, &buffer );
testForALError("buffer remove");
if (( !sample->is_queue() )&&
(sample->is_valid_buffer()))
{
_smgr->release_buffer(sample);
}
_removed_samples.erase( _removed_samples.begin()+i );
size--;
@@ -181,7 +179,7 @@ void SGSampleGroup::update( double dt ) {
alSourcePlay( source );
testForALError("sample play");
} else
SG_LOG( SG_SOUND, SG_ALERT, "No such buffer!\n");
SG_LOG( SG_SOUND, SG_ALERT, "No such buffer!");
}
}
@@ -193,7 +191,7 @@ void SGSampleGroup::update( double dt ) {
alGetSourcei( source, AL_SOURCE_STATE, &result );
if ( result == AL_STOPPED ) {
// sample is stoped because it wasn't looping
// sample is stopped because it wasn't looping
sample->stop();
sample->no_valid_source();
_smgr->release_source( source );