X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FMain%2Fglobals.hxx;h=8b5e9e6f718462b958ab9436630b1bfb0a966517;hb=6beb00f4072a997a174050b76c3e57116a49f955;hp=72d3433eff7f0988427fb2a74a56be1b8bfd0a6d;hpb=e1dd52d38aa91e17060e642c6d090556bc2d4d46;p=flightgear.git

diff --git a/src/Main/globals.hxx b/src/Main/globals.hxx
index 72d3433ef..8b5e9e6f7 100644
--- a/src/Main/globals.hxx
+++ b/src/Main/globals.hxx
@@ -34,12 +34,14 @@
 #include <simgear/magvar/magvar.hxx>
 #include <simgear/route/route.hxx>
 #include <simgear/timing/sg_time.hxx>
+#include <simgear/misc/commands.hxx>
 #include <simgear/misc/props.hxx>
 
+#include <Sound/soundmgr.hxx>
 #include "viewmgr.hxx"
 
-FG_USING_STD( vector );
-FG_USING_STD( string );
+SG_USING_STD( vector );
+SG_USING_STD( string );
 
 typedef vector<string> string_list;
 
@@ -77,7 +79,10 @@ private:
     // Global autopilot "route"
     SGRoute *route;
 
-    // viewer maneger
+    // sound manager
+    FGSoundMgr *soundmgr;
+
+    // viewer manager
     FGViewMgr *viewmgr;
     FGViewer *current_view;
 
@@ -85,8 +90,10 @@ private:
     SGPropertyNode *props;
     SGPropertyNode *initial_state;
 
+    SGCommandMgr *commands;
+
     // list of serial port-like configurations
-    string_list channel_options_list;
+    string_list *channel_options_list;
 
 public:
 
@@ -124,6 +131,9 @@ public:
     inline SGRoute *get_route() const { return route; }
     inline void set_route( SGRoute *r ) { route = r; }
 
+    inline FGSoundMgr *get_soundmgr() const { return soundmgr; }
+    inline void set_soundmgr( FGSoundMgr *sm ) { soundmgr = sm; }
+
     inline FGViewMgr *get_viewmgr() const { return viewmgr; }
     inline void set_viewmgr( FGViewMgr *vm ) { viewmgr = vm; }
     inline FGViewer *get_current_view() const { return current_view; }
@@ -132,8 +142,13 @@ public:
     inline SGPropertyNode *get_props () { return props; }
     inline void set_props( SGPropertyNode *n ) { props = n; }
 
-    inline string_list get_channel_options_list () {
-      return channel_options_list;
+    inline SGCommandMgr *get_commands () { return commands; }
+
+    inline string_list *get_channel_options_list () {
+	return channel_options_list;
+    }
+    inline void set_channel_options_list( string_list *l ) {
+	channel_options_list = l;
     }