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

Fix runtime switching of sound devices.

Browse Source
This commit is contained in:
ehofman
2009-12-02 08:32:59 +00:00
committed by Tim Moore
parent bc85767f19
commit 4794ab6095
2 changed files with 34 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
simgear/sound/sample_group.cxx
View File

@@ -271,17 +271,21 @@ SGSampleGroup::stop ()
SGSoundSample *sample = sample_current->second;
if ( sample->is_valid_source() ) {
ALint source = sample->get_source();
if ( sample->is_playing() ) {
alSourcePause( sample->get_source() );
alSourceStop( source );
alSourcei( source, AL_BUFFER, 0 );
}
_smgr->release_source( sample->get_source() );
_smgr->release_source( source );
sample->no_valid_source();
}
if (sample->is_valid_buffer() ) {
_smgr->release_buffer( sample );
sample->no_valid_buffer();
}
}
testForALError("suspend");
testForALError("stop");
}
// resume playing all associated samples

45
simgear/sound/soundmgr_openal.cxx
View File

@@ -186,27 +186,36 @@ void SGSoundMgr::activate() {
// stop the sound manager
void SGSoundMgr::stop() {
// first stop all sample groups
sample_group_map_iterator sample_grp_current = _sample_groups.begin();
sample_group_map_iterator sample_grp_end = _sample_groups.end();
for ( ; sample_grp_current != sample_grp_end; ++sample_grp_current ) {
SGSampleGroup *sgrp = sample_grp_current->second;
sgrp->stop();
}
// clear all OpenAL sources
for (unsigned int i=0; i<_free_sources.size(); i++) {
ALuint source = _free_sources[i];
alDeleteSources( 1 , &source );
}
_free_sources.clear();
// clear any OpenAL buffers before shutting down
buffer_map_iterator buffers_current = _buffers.begin();
buffer_map_iterator buffers_end = _buffers.end();
for ( ; buffers_current != buffers_end; ++buffers_current ) {
refUint ref = buffers_current->second;
ALuint buffer = ref.id;
alDeleteBuffers(1, &buffer);
_buffers.erase( buffers_current );
}
_buffers.clear();
if (_working) {
_working = false;
_active = false;
// clear any OpenAL buffers before shutting down
buffer_map_iterator buffers_current = _buffers.begin();
buffer_map_iterator buffers_end = _buffers.end();
for ( ; buffers_current != buffers_end; ++buffers_current ) {
refUint ref = buffers_current->second;
ALuint buffer = ref.id;
alDeleteBuffers(1, &buffer);
}
_buffers.clear();
sample_group_map_iterator sample_grp_current = _sample_groups.begin();
sample_group_map_iterator sample_grp_end = _sample_groups.end();
for ( ; sample_grp_current != sample_grp_end; ++sample_grp_current ) {
SGSampleGroup *sgrp = sample_grp_current->second;
sgrp->stop();
}
_context = alcGetCurrentContext();
_device = alcGetContextsDevice(_context);
alcDestroyContext(_context);