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

Fix compiler error with disabled sound support.

Browse Source 
("source" is undefined in SGSampleGroup::stop).
Also fixes two related compiler warnings (unused var "sample").
This commit is contained in:
ThorstenB
2012-11-21 20:17:58 +01:00
parent 9be53e746f
commit fe86a9ed02
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
simgear/sound/sample_group.cxx
+4 -4
View File
@@ -295,8 +295,8 @@ SGSampleGroup::stop ()
alSourceStop( source ); alSourceStop( source );
testForALError("stop"); testForALError("stop");
} }
#endif
_smgr->release_source( source ); _smgr->release_source( source );
#endif
sample->no_valid_source(); sample->no_valid_source();
} }
@@ -316,8 +316,8 @@ SGSampleGroup::suspend ()
sample_map_iterator sample_current = _samples.begin(); sample_map_iterator sample_current = _samples.begin();
sample_map_iterator sample_end = _samples.end(); sample_map_iterator sample_end = _samples.end();
for ( ; sample_current != sample_end; ++sample_current ) { for ( ; sample_current != sample_end; ++sample_current ) {
SGSoundSample *sample = sample_current->second;
#ifdef ENABLE_SOUND #ifdef ENABLE_SOUND
SGSoundSample *sample = sample_current->second;
if ( sample->is_valid_source() && sample->is_playing() ) { if ( sample->is_valid_source() && sample->is_playing() ) {
alSourcePause( sample->get_source() ); alSourcePause( sample->get_source() );
} }
@@ -332,17 +332,17 @@ void
SGSampleGroup::resume () SGSampleGroup::resume ()
{ {
if (_active && _pause == true) { if (_active && _pause == true) {
#ifdef ENABLE_SOUND
sample_map_iterator sample_current = _samples.begin(); sample_map_iterator sample_current = _samples.begin();
sample_map_iterator sample_end = _samples.end(); sample_map_iterator sample_end = _samples.end();
for ( ; sample_current != sample_end; ++sample_current ) { for ( ; sample_current != sample_end; ++sample_current ) {
SGSoundSample *sample = sample_current->second; SGSoundSample *sample = sample_current->second;
#ifdef ENABLE_SOUND
if ( sample->is_valid_source() && sample->is_playing() ) { if ( sample->is_valid_source() && sample->is_playing() ) {
alSourcePlay( sample->get_source() ); alSourcePlay( sample->get_source() );
} }
#endif
} }
testForALError("resume"); testForALError("resume");
#endif
_pause = false; _pause = false;
} }
} }