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 e3c1e7bc6e8e973428685b7a367e3b83494c1f69..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,9 +24,9 @@
 #ifndef __FGFX_HXX
 #define __FGFX_HXX 1
 
-#include <Main/fgfs.hxx>
+#include <simgear/structure/subsystem_mgr.hxx>
 
-class FGSound;
+class SGXmlSound;
 
 /**
  * Generator for FlightGear sound effects.
@@ -35,7 +35,7 @@ class FGSound;
  * on current flight conditions.  The sound manager must be initialized
  * before this object is.
  */
-class FGFX : public FGSubsystem
+class FGFX : public SGSubsystem
 {
 
 public:
@@ -44,13 +44,20 @@ public:
   virtual ~FGFX ();
 
   virtual void init ();
+  virtual void reinit ();
   virtual void bind ();
   virtual void unbind ();
   virtual void update (double dt);
 
 private:
 
-  vector<FGSound *> _sound;
+  vector<SGXmlSound *> _sound;
+
+  bool last_pause;
+  double last_volume;
+
+  SGPropertyNode *_pause;
+  SGPropertyNode *_volume;
 
 };