X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=simgear%2Fsound%2Fsample_group.cxx;h=a5d19641d385e86097f7a20cccbf6069ac37c4bb;hb=145a7fa1467c028f80e141a324950b2c47e34b7b;hp=815fb460f2215a88def21a8b1f0fd22f075cb7ad;hpb=31dd77c6949818f8b3b51832bbf06038ea4b7427;p=simgear.git

diff --git a/simgear/sound/sample_group.cxx b/simgear/sound/sample_group.cxx
index 815fb460..a5d19641 100644
--- a/simgear/sound/sample_group.cxx
+++ b/simgear/sound/sample_group.cxx
@@ -26,47 +26,18 @@
 
 #include <simgear/compiler.h>
 
-#if defined (__APPLE__)
-#  ifdef __GNUC__
-#    if ( __GNUC__ >= 3 ) && ( __GNUC_MINOR__ >= 3 )
-//  #        include <math.h>
-inline int (isnan)(double r) { return !(r <= 0 || r >= 0); }
-#    else
-    // any C++ header file undefines isinf and isnan
-    // so this should be included before <iostream>
-    // the functions are STILL in libm (libSystem on mac os x)
-extern "C" int isnan (double);
-extern "C" int isinf (double);
-#    endif
-#  else
-//    inline int (isinf)(double r) { return isinf(r); }
-//    inline int (isnan)(double r) { return isnan(r); }
-#  endif
-#endif
-
-#if defined (__FreeBSD__)
-#  if __FreeBSD_version < 500000
-     extern "C" {
-       inline int isnan(double r) { return !(r <= 0 || r >= 0); }
-     }
-#  endif
-#endif
-
-#if defined (__CYGWIN__)
-#  include <ieeefp.h>
-#endif
-
-#if defined(__MINGW32__)
-#  define isnan(x) _isnan(x)
-#endif
-
 #include "soundmgr_openal.hxx"
 #include "sample_group.hxx"
 
+bool isNaN(float *v) {
+   return (isnan(v[0]) || isnan(v[1]) || isnan(v[2]));
+}
+
 SGSampleGroup::SGSampleGroup () :
     _smgr(NULL),
     _refname(""),
     _active(false),
+    _pause(false),
     _tied_to_listener(false),
     _velocity(SGVec3d::zeros()),
     _orientation(SGQuatd::zeros()),
@@ -79,6 +50,7 @@ SGSampleGroup::SGSampleGroup ( SGSoundMgr *smgr, const string &refname ) :
     _smgr(smgr),
     _refname(refname),
     _active(false), 
+    _pause(false),
     _tied_to_listener(false),
     _velocity(SGVec3d::zeros()),
     _orientation(SGQuatd::zeros()),
@@ -109,10 +81,36 @@ SGSampleGroup::~SGSampleGroup ()
 
 void SGSampleGroup::update( double dt ) {
 
-    if ( !_active ) return;
+    if ( !_active || _pause ) return;
 
     testForALError("start of update!!\n");
 
+    // Delete any OpenAL buffers that might still be in use.
+    unsigned int size = _removed_samples.size();
+    for (unsigned int i=0; i<size; ) {
+        SGSoundSample *sample = _removed_samples[i];
+        ALint result = AL_STOPPED;
+
+        if ( sample->is_valid_source() ) {
+            if ( sample->is_looping() ) {
+                sample->no_valid_source();
+                _smgr->release_source( sample->get_source() );
+            }
+            else
+                alGetSourcei( sample->get_source(), AL_SOURCE_STATE, &result );
+        }
+
+        if ( result == AL_STOPPED ) {
+            ALuint buffer = sample->get_buffer();
+            alDeleteBuffers( 1, &buffer );
+            testForALError("buffer remove");
+            _removed_samples.erase( _removed_samples.begin()+i );
+            size--;
+            continue;
+        }
+        i++;
+    }
+
     sample_map_iterator sample_current = _samples.begin();
     sample_map_iterator sample_end = _samples.end();
     for ( ; sample_current != sample_end; ++sample_current ) {
@@ -126,7 +124,6 @@ void SGSampleGroup::update( double dt ) {
                 continue;
 
             // start playing the sample
-            ALboolean looping = sample->get_looping() ? AL_TRUE : AL_FALSE;
             ALuint buffer = sample->get_buffer();
             ALuint source = _smgr->request_source();
             if (alIsSource(source) == AL_TRUE && alIsBuffer(buffer) == AL_TRUE)
@@ -139,9 +136,10 @@ void SGSampleGroup::update( double dt ) {
                 sample->set_source( source );
                 update_sample_config( sample );
 
-                alSourcei( source, AL_SOURCE_RELATIVE, AL_FALSE );
+                ALboolean looping = sample->is_looping() ? AL_TRUE : AL_FALSE;
                 alSourcei( source, AL_LOOPING, looping );
                 alSourcef( source, AL_ROLLOFF_FACTOR, 1.0 );
+                alSourcei( source, AL_SOURCE_RELATIVE, AL_FALSE );
                 alSourcePlay( source );
                 testForALError("sample play");
             } else {
@@ -155,10 +153,10 @@ void SGSampleGroup::update( double dt ) {
             if ( !sample->is_playing() ) {
                 // a request to stop playing the sound has been filed.
 
-                sample->no_valid_source();
                 sample->stop();
+                sample->no_valid_source();
                 _smgr->release_source( sample->get_source() );
-            } else  {
+            } else if ( _smgr->has_changed() ) {
                 update_sample_config( sample );
             }
 
@@ -171,9 +169,11 @@ void SGSampleGroup::update( double dt ) {
             alGetSourcei( source, AL_SOURCE_STATE, &result );
             if ( result == AL_STOPPED ) {
                 // sample is stoped because it wasn't looping
-                sample->no_valid_source();
                 sample->stop();
+                sample->no_valid_source();
                 _smgr->release_source( source );
+                _smgr->release_buffer( sample );
+                remove( sample->get_sample_name() );
             }
         }
         testForALError("update");
@@ -181,7 +181,7 @@ void SGSampleGroup::update( double dt ) {
 }
 
 // add a sound effect, return true if successful
-bool SGSampleGroup::add( SGSoundSample *sound, const string& refname ) {
+bool SGSampleGroup::add( SGSharedPtr<SGSoundSample> sound, const string& refname ) {
 
     sample_map_iterator sample_it = _samples.find( refname );
     if ( sample_it != _samples.end() ) {
@@ -203,9 +203,9 @@ bool SGSampleGroup::remove( const string &refname ) {
         return false;
     }
 
-    // remove the sources buffer
-    _smgr->release_buffer( sample_it->second );
-    _samples.erase( refname );
+    if ( sample_it->second->is_valid_buffer() )
+        _removed_samples.push_back( sample_it->second );
+    _samples.erase( sample_it );
 
     return true;
 }
@@ -240,7 +240,7 @@ SGSoundSample *SGSampleGroup::find( const string &refname ) {
 void
 SGSampleGroup::suspend ()
 {
-    _active = false;
+    _pause = true;
     sample_map_iterator sample_current = _samples.begin();
     sample_map_iterator sample_end = _samples.end();
     for ( ; sample_current != sample_end; ++sample_current ) {
@@ -267,7 +267,7 @@ SGSampleGroup::resume ()
         }
     }
     testForALError("resume");
-    _active = true;
+    _pause = false;
 }
 
 
@@ -308,7 +308,7 @@ bool SGSampleGroup::stop( const string& refname ) {
 }
 
 // set source velocity of all managed sounds
-void SGSampleGroup::set_velocity( const SGVec3d &vel ) {
+void SGSampleGroup::set_velocity( const SGVec3f &vel ) {
     if ( isnan(vel[0]) || isnan(vel[1]) || isnan(vel[2]) )
     {
         SG_LOG( SG_GENERAL, SG_ALERT, "NAN's found in SampleGroup velocity");
@@ -368,35 +368,46 @@ void SGSampleGroup::set_volume( float vol )
 }
 
 void SGSampleGroup::update_sample_config( SGSoundSample *sample ) {
-    if ( sample->is_valid_source() ) {
-        unsigned int source = sample->get_source();
-
-        if ( _tied_to_listener && _smgr->has_changed() ) {
-            alSourcefv( source, AL_POSITION, _smgr->get_position().data() );
-            alSourcefv( source, AL_DIRECTION, _smgr->get_direction().data() );
-            alSourcefv( source, AL_VELOCITY, _smgr->get_velocity().data() );
-        } else {
-            alSourcefv( source, AL_POSITION, sample->get_position() );
-            alSourcefv( source, AL_DIRECTION, sample->get_orientation() );
-            alSourcefv( source, AL_VELOCITY, sample->get_velocity() );
-        }
-        testForALError("position and orientation");
-
-        alSourcef( source, AL_PITCH, sample->get_pitch() );
-        alSourcef( source, AL_GAIN, sample->get_volume() );
-        testForALError("pitch and gain");
-
-        if ( sample->has_static_data_changed() ) {
-            alSourcef( source, AL_CONE_INNER_ANGLE, sample->get_innerangle() );
-            alSourcef( source, AL_CONE_OUTER_ANGLE, sample->get_outerangle() );
-            alSourcef( source, AL_CONE_OUTER_GAIN, sample->get_outergain() );
-            testForALError("audio cone");
-
-            alSourcef( source, AL_MAX_DISTANCE, sample->get_max_dist() );
-            alSourcef( source, AL_REFERENCE_DISTANCE,
-                               sample->get_reference_dist() );
-            testForALError("distance rolloff");
-        }
+    SGVec3f orientation, velocity;
+    SGVec3d position;
+
+    if ( _tied_to_listener ) {
+        orientation = _smgr->get_direction();
+        position = _smgr->get_position();
+        velocity = _smgr->get_velocity();
+    } else {
+        sample->update_absolute_position();
+        orientation = sample->get_orientation();
+        position = sample->get_position();
+        velocity = sample->get_velocity();
+    }
+
+    if (dist(position, _smgr->get_position()) > 10000)
+        printf("source and listener distance greater than 20km!\n");
+    if (isNaN(toVec3f(position).data())) printf("NaN in source position\n");
+    if (isNaN(orientation.data())) printf("NaN in source orientation\n");
+    if (isNaN(velocity.data())) printf("NaN in source velocity\n");
+
+    unsigned int source = sample->get_source();
+    alSourcefv( source, AL_POSITION, toVec3f(position).data() );
+    alSourcefv( source, AL_VELOCITY, velocity.data() );
+    alSourcefv( source, AL_DIRECTION, orientation.data() );
+    testForALError("position and orientation");
+
+    alSourcef( source, AL_PITCH, sample->get_pitch() );
+    alSourcef( source, AL_GAIN, sample->get_volume() );
+    testForALError("pitch and gain");
+
+    if ( sample->has_static_data_changed() ) {
+        alSourcef( source, AL_CONE_INNER_ANGLE, sample->get_innerangle() );
+        alSourcef( source, AL_CONE_OUTER_ANGLE, sample->get_outerangle() );
+        alSourcef( source, AL_CONE_OUTER_GAIN, sample->get_outergain() );
+        testForALError("audio cone");
+
+        alSourcef( source, AL_MAX_DISTANCE, sample->get_max_dist() );
+        alSourcef( source, AL_REFERENCE_DISTANCE,
+                           sample->get_reference_dist() );
+        testForALError("distance rolloff");
     }
 }