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

check if suspend, resume and volume changed much from the previous value before setting them.

Browse Source
This commit is contained in:
ehofman
2009-12-02 09:32:20 +00:00
committed by Tim Moore
parent 4794ab6095
commit 47617d6c04
1 changed files with 35 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
simgear/sound/sample_group.cxx
View File

@@ -244,23 +244,6 @@ SGSoundSample *SGSampleGroup::find( const string &refname ) {
}
// stop playing all associated samples
void
SGSampleGroup::suspend ()
{
_pause = true;
sample_map_iterator sample_current = _samples.begin();
sample_map_iterator sample_end = _samples.end();
for ( ; sample_current != sample_end; ++sample_current ) {
SGSoundSample *sample = sample_current->second;
if ( sample->is_valid_source() && sample->is_playing() ) {
alSourcePause( sample->get_source() );
}
}
testForALError("suspend");
}
void
SGSampleGroup::stop ()
{
@@ -288,21 +271,42 @@ SGSampleGroup::stop ()
testForALError("stop");
}
// stop playing all associated samples
void
SGSampleGroup::suspend ()
{
if (_pause == false) {
_pause = true;
sample_map_iterator sample_current = _samples.begin();
sample_map_iterator sample_end = _samples.end();
for ( ; sample_current != sample_end; ++sample_current ) {
SGSoundSample *sample = sample_current->second;
if ( sample->is_valid_source() && sample->is_playing() ) {
alSourcePause( sample->get_source() );
}
}
testForALError("suspend");
}
}
// resume playing all associated samples
void
SGSampleGroup::resume ()
{
sample_map_iterator sample_current = _samples.begin();
sample_map_iterator sample_end = _samples.end();
for ( ; sample_current != sample_end; ++sample_current ) {
SGSoundSample *sample = sample_current->second;
if (_pause == true) {
sample_map_iterator sample_current = _samples.begin();
sample_map_iterator sample_end = _samples.end();
for ( ; sample_current != sample_end; ++sample_current ) {
SGSoundSample *sample = sample_current->second;
if ( sample->is_valid_source() && sample->is_playing() ) {
alSourcePlay( sample->get_source() );
if ( sample->is_valid_source() && sample->is_playing() ) {
alSourcePlay( sample->get_source() );
}
}
testForALError("resume");
_pause = false;
}
testForALError("resume");
_pause = false;
}
@@ -344,9 +348,12 @@ bool SGSampleGroup::stop( const string& refname ) {
void SGSampleGroup::set_volume( float vol )
{
_volume = vol;
if (_volume < 0.0) _volume = 0.0;
if (_volume > 1.0) _volume = 1.0;
if (vol > _volume*1.01 || vol < _volume*0.99) {
_volume = vol;
if (_volume < 0.0) _volume = 0.0;
if (_volume > 1.0) _volume = 1.0;
_changed = true;
}
}
// set the source position and orientation of all managed sounds