math: Move lerp function into SGMisc.

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

diff --git a/simgear/sound/sample_group.cxx b/simgear/sound/sample_group.cxx
index bdc00ee64bb899f4899f34d43427296973b2f1ef..069f85df9dd557776171d3855c9fd77712a54b37 100644 (file)
--- a/simgear/sound/sample_group.cxx
+++ b/simgear/sound/sample_group.cxx
@@ -409,13 +409,15 @@ void SGSampleGroup::update_pos_and_orientation() {
 
         // Test if a sample is farther away than max distance, if so
         // stop the sound playback and free it's source.
-        float max2 = sample->get_max_dist() * sample->get_max_dist();
-        float dist2 = position[0]*position[0]
-                      + position[1]*position[1] + position[2]*position[2];
-        if (sample->is_playing() && (dist2 > max2)) {
-            sample->stop();
-        } else if (!sample->is_playing() && (dist2 < max2)) {
-            sample->play(sample->is_looping());
+        if (!_tied_to_listener) {
+            float max2 = sample->get_max_dist() * sample->get_max_dist();
+            float dist2 = position[0]*position[0]
+                          + position[1]*position[1] + position[2]*position[2];
+            if ((dist2 > max2) && !sample->test_out_of_range()) {
+                sample->set_out_of_range(true);
+            } else if ((dist2 < max2) && sample->test_out_of_range()) {
+                sample->set_out_of_range(false);
+            }
         }
     }
 }