Merge branch 'timoore/effects-anim-rebase' into next

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

diff --git a/simgear/sound/sample_group.hxx b/simgear/sound/sample_group.hxx
index e6bb10e24a0c7902a1a323c178d08b6d19c50b36..d2d47394d4530a32a33f68db431e4212f5e6638b 100644 (file)
--- a/simgear/sound/sample_group.hxx
+++ b/simgear/sound/sample_group.hxx
@@ -128,6 +128,11 @@ public:
      */
     SGSoundSample *find( const string& refname );
 
+    /**
+     * Stop all playing samples and set the source id to invalid.
+     */
+    void stop();
+
     /**
      * Request to stop playing all audio samples until further notice.
      */
@@ -189,7 +194,9 @@ public:
      * This is in the local frame coordinate system; x=north, y=east, z=down
      * @param vel Velocity vector 
      */
-    void set_velocity( const SGVec3f& vel );
+    void set_velocity( const SGVec3d& vel ) {
+       _velocity = vel; _changed = true;
+    }
 
     /**
      * Set the position of this sample group.
@@ -197,7 +204,7 @@ public:
      * @param pos Base position
      */
     void set_position_geod( const SGGeod& pos ) {
-        _base_pos = SGVec3d::fromGeod( pos ); _changed = true;
+        _base_pos = pos; _changed = true;
     }
 
     /**
@@ -224,8 +231,8 @@ private:
     float _volume;
     bool _tied_to_listener;
 
-    SGVec3f _velocity;
-    SGVec3d _base_pos;
+    SGVec3d _velocity;
+    SGGeod _base_pos;
     SGQuatd _orientation;
 
     sample_map _samples;