X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FSound%2Ffg_fx.hxx;h=7d5132dd9e2a9c85a80fc4ba97f423b03ddab104;hb=bcea720db3e29a62626b361f2149a7147e149f3b;hp=a28ca9a7b80065574e702a618b50b06f698800f3;hpb=51c04e9e4c4d2ecc0f3ee0a6d3559d1e22e247c5;p=flightgear.git

diff --git a/src/Sound/fg_fx.hxx b/src/Sound/fg_fx.hxx
index a28ca9a7b..7d5132dd9 100644
--- 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
@@ -17,42 +17,58 @@
 //
 // 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
 
-#include <Main/fgfs.hxx>
+#include <simgear/compiler.h>
 
-class SGSound;
+#include <vector>
+
+#include <simgear/structure/subsystem_mgr.hxx>
+#include <simgear/props/props.hxx>
+#include <simgear/sound/sample_group.hxx>
+
+class SGXmlSound;
 
 /**
  * Generator for FlightGear sound effects.
  *
- * This module uses FGSoundMgr to generate sound effects based
- * on current flight conditions.  The sound manager must be initialized
+ * This module uses a FGSampleGroup class to generate sound effects based
+ * on current flight conditions. The sound manager must be initialized
  * before this object is.
+ *
+ *    This module will load and play a set of sound effects defined in an
+ *    xml file and tie them to various property states.
  */
-class FGFX : public FGSubsystem
+class FGFX : public SGSampleGroup
 {
 
 public:
 
-  FGFX ();
-  virtual ~FGFX ();
+    FGFX ( const std::string &refname, SGPropertyNode *props = 0 );
+    virtual ~FGFX ();
 
-  virtual void init ();
-  virtual void reinit ();
-  virtual void bind ();
-  virtual void unbind ();
-  virtual void update (double dt);
+    virtual void init ();
+    virtual void reinit ();
+    virtual void update (double dt);
 
 private:
 
-  vector<SGSound *> _sound;
+    bool _is_aimodel;
+    SGSharedPtr<SGSampleGroup> _avionics;
+    std::vector<SGXmlSound *> _sound;
 
+    SGPropertyNode_ptr _props;
+    SGPropertyNode_ptr _enabled;
+    SGPropertyNode_ptr _volume;
+    SGPropertyNode_ptr _avionics_enabled;
+    SGPropertyNode_ptr _avionics_volume;
+    SGPropertyNode_ptr _avionics_ext;
+    SGPropertyNode_ptr _internal;
 };