Bugfix: remove the (totally broken) skyblend option

[flightgear.git] / src / Main / globals.hxx

diff --git a/src/Main/globals.hxx b/src/Main/globals.hxx
index f6cc5bfd99bdfedb960123ef5cb9154a9f23ccad..8f1736f146b125697138e43feb1638487bedbc12 100644 (file)
--- a/src/Main/globals.hxx
+++ b/src/Main/globals.hxx
@@ -66,7 +66,7 @@ class FGViewMgr;
 class FGViewer;
 class FGRenderer;
 class FGFontCache;
-
+class FGSampleQueue;
 
 /**
  * Bucket for subsystem pointers representing the sim's state.
@@ -161,6 +161,14 @@ private:
      * helper to initialise standard properties on a new property tree
      */
     void initProperties();
+    
+    SGSharedPtr<FGSampleQueue> _chatter_queue;
+    
+    void cleanupListeners();
+    
+    typedef std::vector<SGPropertyChangeListener*> SGPropertyChangeListenerVec;
+    SGPropertyChangeListenerVec _listeners_to_cleanup;
+    
 public:
 
     FGGlobals();
@@ -261,7 +269,7 @@ public:
     inline void set_ephem( SGEphemeris *e ) { ephem = e; }
 
     inline SGMaterialLib *get_matlib() const { return matlib; }
-    inline void set_matlib( SGMaterialLib *m ) { matlib = m; }
+    void set_matlib( SGMaterialLib *m );
 
     inline FGATISMgr *get_ATIS_mgr() const { return ATIS_mgr; }
     inline void set_ATIS_mgr( FGATISMgr *a ) {ATIS_mgr = a; }
@@ -341,6 +349,11 @@ public:
      * Save user settings in autosave.xml
      */
     void saveUserSettings();
+    
+    FGSampleQueue* get_chatter_queue() const;
+    void set_chatter_queue(FGSampleQueue* queue);
+    
+    void addListenerToCleanup(SGPropertyChangeListener* l);
 };