Lots of changes to the ATC/AI system for initial revision of random AI GA VFR traffic

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

diff --git a/src/Sound/fg_fx.cxx b/src/Sound/fg_fx.cxx
index d13a56f81f7f0ad5e13ab14dc5df01f0ad5bd8ec..93e8b779b770ac61e256ec4c6e93c633e2d674f7 100644 (file)
--- a/src/Sound/fg_fx.cxx
+++ b/src/Sound/fg_fx.cxx
@@ -25,18 +25,18 @@
 #pragma warning (disable: 4786)
 #endif
 
-#include <simgear/misc/props.hxx>
-#include <simgear/misc/sg_path.hxx>
 #include <simgear/debug/logstream.hxx>
-#include <simgear/misc/exception.hxx>
+#include <simgear/structure/exception.hxx>
 #ifdef __BORLANDC__
 #  define exception c_exception
 #endif
+#include <simgear/misc/sg_path.hxx>
+#include <simgear/props/props.hxx>
+#include <simgear/sound/sound.hxx>
 
 #include <Main/fg_props.hxx>
 
 #include "fg_fx.hxx"
-#include "fg_sound.hxx"
 
 
 FGFX::FGFX ()
@@ -62,7 +62,7 @@ FGFX::init()
    }
 
    path.append(path_str.c_str());
-   SG_LOG(SG_GENERAL, SG_INFO, "Reading Instrument " << node->getName()
+   SG_LOG(SG_GENERAL, SG_INFO, "Reading sound " << node->getName()
           << " from " << path.str());
 
    SGPropertyNode root;
@@ -76,8 +76,10 @@ FGFX::init()
 
    node = root.getNode("fx");
    for (i = 0; i < node->nChildren(); i++) {
-      FGSound *sound = new FGSound();
-      sound->init(node->getChild(i));
+      SGSound *sound = new SGSound();
+
+      sound->init(globals->get_props(), node->getChild(i),
+                  globals->get_soundmgr(), globals->get_fg_root());
 
       _sound.push_back(sound);
    }