Added sound effect changes from David Megginson.

diff --git a/src/Main/fg_init.cxx b/src/Main/fg_init.cxx
index 1be234127418aa02958968198ecfcc134c33d80d..8ef3e2c589eece5d241b276554af62317b530eb0 100644 (file)
--- a/src/Main/fg_init.cxx
+++ b/src/Main/fg_init.cxx
@@ -90,6 +90,8 @@
 #include <Navaids/navlist.hxx>
 #include <Scenery/scenery.hxx>
 #include <Scenery/tilemgr.hxx>
+#include <Sound/fg_fx.hxx>
+#include <Sound/soundmgr.hxx>
 #include <Time/event.hxx>
 #include <Time/light.hxx>
 #include <Time/sunpos.hxx>
@@ -730,6 +732,23 @@ bool fgInitSubsystems( void ) {
     fgInitCommands();
 
 
+    ////////////////////////////////////////////////////////////////////
+    // Initialize the sound subsystem.
+    ////////////////////////////////////////////////////////////////////
+
+    globals->set_soundmgr(new FGSoundMgr);
+    globals->get_soundmgr()->init();
+    globals->get_soundmgr()->bind();
+
+
+    ////////////////////////////////////////////////////////////////////
+    // Initialize the sound-effects subsystem.
+    ////////////////////////////////////////////////////////////////////
+    globals->set_fx(new FGFX);
+    globals->get_fx()->init();
+    globals->get_fx()->bind();
+
+
     ////////////////////////////////////////////////////////////////////
     // Initialize the radio stack subsystem.
     ////////////////////////////////////////////////////////////////////

diff --git a/src/Main/globals.hxx b/src/Main/globals.hxx
index c68053602f65061a13295c16f50d46a1dc29ed20..170fe8235823c2e3b61b5c415b9fd639137591a2 100644 (file)
--- a/src/Main/globals.hxx
+++ b/src/Main/globals.hxx
@@ -37,10 +37,6 @@
 #include <simgear/misc/commands.hxx>
 #include <simgear/misc/props.hxx>
 
-// #include <Controls/controls.hxx>
-// #include <Sound/soundmgr.hxx>
-// #include "viewmgr.hxx"
-
 SG_USING_STD( vector );
 SG_USING_STD( string );
 
@@ -50,6 +46,7 @@ typedef vector<string> string_list;
 // Forward declarations
 class FGControls;
 class FGSoundMgr;
+class FGFX;
 class FGViewMgr;
 class FGViewer;
 
@@ -89,6 +86,9 @@ private:
     // sound manager
     FGSoundMgr *soundmgr;
 
+    // sound-effects manager
+    FGFX *fx;
+
     // control input state
     FGControls *controls;
 
@@ -144,6 +144,9 @@ public:
     inline FGSoundMgr *get_soundmgr() const { return soundmgr; }
     inline void set_soundmgr( FGSoundMgr *sm ) { soundmgr = sm; }
 
+    inline FGFX *get_fx() const { return fx; }
+    inline void set_fx( FGFX *x ) { fx = x; }
+
     inline FGControls *get_controls() const { return controls; }
     inline void set_controls( FGControls *c ) { controls = c; }