cppbind: automatic conversion of SGReferenced derived pointers.

[simgear.git] / simgear / sound / sample_group.cxx

diff --git a/simgear/sound/sample_group.cxx b/simgear/sound/sample_group.cxx
index eac283195ff209e48f14adc7f694e6299542e002..78efd1675efa71718e6956ba21d5208f1e24aae1 100644 (file)
--- a/simgear/sound/sample_group.cxx
+++ b/simgear/sound/sample_group.cxx
@@ -35,6 +35,10 @@
 
 using std::string;
 
+#ifdef HAVE_STD_ISNAN
+using std::isnan;
+#endif
+
 bool isNaN(float *v) {
    return (isnan(v[0]) || isnan(v[1]) || isnan(v[2]));
 }
@@ -295,8 +299,8 @@ SGSampleGroup::stop ()
                 alSourceStop( source );
                 testForALError("stop");
             }
-#endif
             _smgr->release_source( source );
+#endif
             sample->no_valid_source();
         }
 
@@ -316,8 +320,8 @@ SGSampleGroup::suspend ()
         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;
 #ifdef ENABLE_SOUND
+            SGSoundSample *sample = sample_current->second;
             if ( sample->is_valid_source() && sample->is_playing() ) {
                 alSourcePause( sample->get_source() );
             }
@@ -332,17 +336,17 @@ void
 SGSampleGroup::resume ()
 {
     if (_active && _pause == true) {
+#ifdef ENABLE_SOUND
         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;
-#ifdef ENABLE_SOUND
             if ( sample->is_valid_source() && sample->is_playing() ) {
                 alSourcePlay( sample->get_source() );
             }
-#endif
         }
         testForALError("resume");
+#endif
         _pause = false;
     }
 }