Added two missing files from JSBSim.org that were missing in the last sync.

[flightgear.git] / src / Sound / fg_fx.hxx

diff --git a/src/Sound/fg_fx.hxx b/src/Sound/fg_fx.hxx
index 08d690c884009f7355b2a66a335d50b3b9df4404..864a898bb07219e5b7064dcb77ed6501de9171c0 100644 (file)
--- a/src/Sound/fg_fx.hxx
+++ b/src/Sound/fg_fx.hxx
@@ -17,17 +17,13 @@
 //
 // You should have received a copy of the GNU General Public License
 // along with this program; if not, write to the Free Software
-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 //
 // $Id$
 
 #ifndef __FGFX_HXX
 #define __FGFX_HXX 1
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
 #include <simgear/compiler.h>
 
 #include <queue>
@@ -36,8 +32,8 @@
 #include <simgear/sound/sample_openal.hxx>
 #include <simgear/structure/subsystem_mgr.hxx>
 
-SG_USING_STD(queue);
-SG_USING_STD(vector);
+using std::queue;
+using std::vector;
 
 class SGXmlSound;
 
@@ -76,19 +72,22 @@ public:
      * in order.
      */
     void play_message( SGSoundSample *_sample );
-    void play_message( const string path, const string fname );
+    void play_message( const string path, const string fname, double volume );
 
 private:
 
+    void update_pos_and_orientation(SGSoundMgr *smgr, double dt);
+    sgdVec3 last_visitor_pos;
+    sgdVec3 last_model_pos;
+
     vector<SGXmlSound *> _sound;
     queue<SGSoundSample *> _samplequeue;
 
     bool last_pause;
     double last_volume;
 
-    SGPropertyNode *_pause;
-    SGPropertyNode *_volume;
-
+    SGPropertyNode_ptr _pause;
+    SGPropertyNode_ptr _volume;
 };