Update 'magic' for more consistant cross platform padding.

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

diff --git a/src/Sound/fg_fx.hxx b/src/Sound/fg_fx.hxx
index c119469cb20a9d661ee9613de43dabed904536e6..2c80d1c04bf112e6174a5b81793d4d5ac5ec900e 100644 (file)
--- a/src/Sound/fg_fx.hxx
+++ b/src/Sound/fg_fx.hxx
@@ -3,7 +3,7 @@
 // Started by David Megginson, October 2001
 // (Reuses some code from main.cxx, probably by Curtis Olson)
 //
-// Copyright (C) 2001  Curtis L. Olson - curt@flightgear.org
+// Copyright (C) 2001  Curtis L. Olson - http://www.flightgear.org/~curt
 //
 // This program is free software; you can redistribute it and/or
 // modify it under the terms of the GNU General Public License as
@@ -24,16 +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 <simgear/structure/subsystem_mgr.hxx>
 
+class SGXmlSound;
 
 /**
  * Generator for FlightGear sound effects.
@@ -42,55 +35,29 @@
  * on current flight conditions.  The sound manager must be initialized
  * before this object is.
  */
-class FGFX : public FGSubsystem
+class FGFX : public SGSubsystem
 {
 
 public:
 
-  enum {
-    MAX_ENGINES = 2,           // TODO: increase later
-    MAX_GEAR = 20,
-  };
-
   FGFX ();
   virtual ~FGFX ();
 
   virtual void init ();
+  virtual void reinit ();
   virtual void bind ();
   virtual void unbind ();
-  virtual void update (int dt);
+  virtual void update (double dt);
 
 private:
 
-  void set_playing (const char * soundName, bool state = true);
-
-  double _old_flap_position;
-  double _old_gear_position;
-
-  bool _gear_on_ground[MAX_GEAR];
-  float _wheel_spin[MAX_GEAR];
-
-                               // looped sounds
-  FGSimpleSound * _engine[MAX_ENGINES];
-  FGSimpleSound * _crank[MAX_ENGINES];
-  FGSimpleSound * _wind;
-  FGSimpleSound * _stall;
-  FGSimpleSound * _rumble;
+  vector<SGXmlSound *> _sound;
 
-                               // one-off sounds
-  FGSimpleSound * _flaps;
-  FGSimpleSound * _gear_up;
-  FGSimpleSound * _gear_dn;
-  FGSimpleSound * _squeal;
-  FGSimpleSound * _click;
+  bool last_pause;
+  double last_volume;
 
-                               // Cached property nodes.
-  const SGPropertyNode * _engine_running_prop[MAX_ENGINES];
-  const SGPropertyNode * _engine_cranking_prop[MAX_ENGINES];
-  const SGPropertyNode * _stall_warning_prop;
-  const SGPropertyNode * _vc_prop;
-  const SGPropertyNode * _flaps_prop;
-  const SGPropertyNode * _gear_prop;
+  SGPropertyNode *_pause;
+  SGPropertyNode *_volume;
 
 };