Ron Jensen: fixed a potential NaN and Segfault in JSBSim propeller code

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

diff --git a/src/Sound/fg_fx.hxx b/src/Sound/fg_fx.hxx
index 26c802f34a8f56953b26f5e5b7bbf0e488ea9c7a..3803f5bc6ad1538d568a6356b63e3277aa77bc24 100644 (file)
--- a/src/Sound/fg_fx.hxx
+++ b/src/Sound/fg_fx.hxx
@@ -29,6 +29,7 @@
 #include <vector>
 
 #include <simgear/structure/subsystem_mgr.hxx>
+#include <simgear/props/props.hxx>
 #include <simgear/sound/sample_group.hxx>
 
 class SGXmlSound;
@@ -48,7 +49,7 @@ class FGFX : public SGSampleGroup
 
 public:
 
-    FGFX ( SGSoundMgr *smgr, const string &refname );
+    FGFX ( SGSoundMgr *smgr, const string &refname, SGPropertyNode *props = 0 );
     virtual ~FGFX ();
 
     virtual void init ();
@@ -57,14 +58,16 @@ public:
 
 private:
 
+    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_external;
+    SGPropertyNode_ptr _avionics_ext;
     SGPropertyNode_ptr _internal;
 };