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

diff --git a/src/Sound/fg_fx.hxx b/src/Sound/fg_fx.hxx
index 864a898bb..7d5132dd9 100644
--- a/src/Sound/fg_fx.hxx
+++ b/src/Sound/fg_fx.hxx
@@ -26,68 +26,49 @@
 
 #include <simgear/compiler.h>
 
-#include <queue>
 #include <vector>
 
-#include <simgear/sound/sample_openal.hxx>
 #include <simgear/structure/subsystem_mgr.hxx>
-
-using std::queue;
-using std::vector;
+#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.
  *
- * Note: this module supports two separate sound mechanisms concurrently.
- *
- * 1. This module will load and play a set of sound effects defined in an
+ *    This module will load and play a set of sound effects defined in an
  *    xml file and tie them to various property states.
- * 2. This modules also maintains a queue of 'message' audio files.  These
- *    are played sequentially with no overlap until the queue is finished.
- *    This second mechanims is useful for things like tutorial messages or
- *    background atc chatter.
  */
-class FGFX : public SGSubsystem
+class FGFX : public SGSampleGroup
 {
 
 public:
 
-    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);
 
-    /**
-     * add a sound sample to the message queue which is played sequentially
-     * in order.
-     */
-    void play_message( SGSoundSample *_sample );
-    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;
+    bool _is_aimodel;
+    SGSharedPtr<SGSampleGroup> _avionics;
+    std::vector<SGXmlSound *> _sound;
 
-    SGPropertyNode_ptr _pause;
+    SGPropertyNode_ptr _props;
+    SGPropertyNode_ptr _enabled;
     SGPropertyNode_ptr _volume;
+    SGPropertyNode_ptr _avionics_enabled;
+    SGPropertyNode_ptr _avionics_volume;
+    SGPropertyNode_ptr _avionics_ext;
+    SGPropertyNode_ptr _internal;
 };