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

std::map entries can not be removed when inside a for (auto current : _samples) loop. Rework the removal code to accept the iterator itself and move incrementing the iterator until after the erase action or let the erase action assign the new iterator.

Browse Source
This commit is contained in:
Erik Hofman 2022-09-24 10:23:52 +02:00
parent 9e20d853f7
commit a8d3397fb4
2 changed files with 25 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
simgear/sound/sample_group.cxx
View File

@ -85,8 +85,11 @@ void SGSampleGroup::start_playing_sample(SGSoundSample *sample)
_smgr->sample_play( sample );
}
void SGSampleGroup::check_playing_sample(SGSoundSample *sample)
bool SGSampleGroup::check_playing_sample(sample_map::iterator& sample_it)
{
SGSoundSample *sample = sample_it->second;
bool rv = true;
// check if the sound has stopped by itself
if (_smgr->is_sample_stopped(sample)) {
// sample is stopped because it wasn't looping
@ -94,7 +97,8 @@ void SGSampleGroup::check_playing_sample(SGSoundSample *sample)
sample->no_valid_source();
_smgr->release_source( sample->get_source() );
_smgr->release_buffer( sample );
remove( sample->get_sample_name() );
sample_it = remove( sample_it );
rv = false;
} else if ( sample->has_changed() ) {
if ( !sample->is_playing() ) {
// a request to stop playing the sound has been filed.
@ -105,6 +109,7 @@ void SGSampleGroup::check_playing_sample(SGSoundSample *sample)
update_sample_config( sample );
}
}
return rv;
}
void SGSampleGroup::update( double dt ) {
@ -121,15 +126,21 @@ void SGSampleGroup::update( double dt ) {
_changed = false;
}
for (auto current : _samples) {
SGSoundSample *sample = current.second;
for (auto current = _samples.begin(); current != _samples.end(); ) {
SGSoundSample *sample = current->second;
bool increment = true;
if ( !sample->is_valid_source() && sample->is_playing() && !sample->test_out_of_range()) {
start_playing_sample(sample);
} else if ( sample->is_valid_source() ) {
check_playing_sample(sample);
increment = check_playing_sample(current);
}
if (increment) {
++current;
}
testForMgrError("update");
}
}
@ -166,6 +177,13 @@ bool SGSampleGroup::remove( const std::string &refname ) {
return true;
}
sample_map::iterator SGSampleGroup::remove( sample_map::iterator sample_it ) {
if ( sample_it->second->is_valid_buffer() )
_removed_samples.push_back( sample_it->second );
return _samples.erase( sample_it );
}
// return true of the specified sound exists in the sound manager system
bool SGSampleGroup::exists( const std::string &refname ) {

3
simgear/sound/sample_group.hxx
View File

@ -223,7 +223,8 @@ protected:
private:
void cleanup_removed_samples();
void start_playing_sample(SGSoundSample *sample);
void check_playing_sample(SGSoundSample *sample);
bool check_playing_sample(sample_map::iterator& sample_it );
sample_map::iterator remove( sample_map::iterator sample_it );
bool _changed = false;
bool _pause = false;