Added static port system and a new altimeter model connected to it.

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

diff --git a/src/Sound/fg_fx.hxx b/src/Sound/fg_fx.hxx
index d3e00d20c59a758557b9ba9de0704676246397f5..aaed5ae064d92cd43dde23327f550782657e2665 100644 (file)
--- a/src/Sound/fg_fx.hxx
+++ b/src/Sound/fg_fx.hxx
@@ -1,4 +1,4 @@
-// fgfx.hxx -- Sound effect management class
+// fg_fx.hxx -- Sound effect management class
 //
 // Started by David Megginson, October 2001
 // (Reuses some code from main.cxx, probably by Curtis Olson)
@@ -24,15 +24,9 @@
 #ifndef __FGFX_HXX
 #define __FGFX_HXX 1
 
-#ifdef HAVE_CONFIG_H
-#  include <config.h>
-#endif
-
 #include <simgear/compiler.h>
-#include <Main/fgfs.hxx>
-#include <Main/globals.hxx>
 
-#include "soundmgr.hxx"
+#include "fg_sound.hxx"
 
 
 /**
@@ -47,48 +41,21 @@ class FGFX : public FGSubsystem
 
 public:
 
-  enum {
-    MAX_ENGINES = 2,           // TODO: increase later
-    MAX_GEAR = 20,
-  };
-
   FGFX ();
   virtual ~FGFX ();
 
   virtual void init ();
   virtual void bind ();
   virtual void unbind ();
-  virtual void update ();
+  virtual void update (double dt);
 
 private:
 
-  void set_playing (const char * soundName, bool state = true);
-
-  double _old_flap_position;
-
-  bool _gear_on_ground[MAX_GEAR];
-
-                               // looped sounds
-  FGSimpleSound * _engine[MAX_ENGINES];
-  FGSimpleSound * _crank[MAX_ENGINES];
-  FGSimpleSound * _wind;
-  FGSimpleSound * _stall;
-  FGSimpleSound * _rumble;
-
-                               // one-off sounds
-  FGSimpleSound * _flaps;
-  FGSimpleSound * _squeal;
-  FGSimpleSound * _click;
-
-                               // Cached property nodes.
-  const SGPropertyNode * _engine_running_prop[MAX_ENGINES];
-  const SGPropertyNode * _engine_cranking_prop[MAX_ENGINES];
-  const SGPropertyNode * _stall_warning_prop;
-  const SGPropertyNode * _flaps_prop;
+  vector<FGSound *> _sound;
 
 };
 
 
 #endif
 
-// end of fgfx.hxx
+// end of fg_fx.hxx