Reset: clear effects cache

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

diff --git a/src/Main/globals.cxx b/src/Main/globals.cxx
index 909c83fb662157b84911850e2d10e8442968824f..acfb0d6299576f48cfd8e5f85f5fc2a724d17b02 100644 (file)
--- a/src/Main/globals.cxx
+++ b/src/Main/globals.cxx
@@ -53,6 +53,7 @@
 #include <Navaids/navlist.hxx>
 #include <Viewer/renderer.hxx>
 #include <Viewer/viewmgr.hxx>
+#include <Sound/sample_queue.hxx>
 
 #include "globals.hxx"
 #include "locale.hxx"
@@ -151,7 +152,8 @@ FGGlobals::FGGlobals() :
     initial_waypoints( NULL ),
     fontcache ( new FGFontCache ),
     channellist( NULL ),
-    haveUserSettings(false)
+    haveUserSettings(false),
+    _chatter_queue(NULL)
 {
     SGPropertyNode* root = new SGPropertyNode;
     props = SGPropertyNode_ptr(root);
@@ -210,12 +212,13 @@ FGGlobals::~FGGlobals()
     // renderer touches subsystems during its destruction
     set_renderer(NULL);
     _scenery.clear();
-
+    _chatter_queue.clear();
+    
     delete subsystem_mgr;
     subsystem_mgr = NULL; // important so ::get_subsystem returns NULL 
 
     delete time_params;
-    delete matlib;
+    set_matlib(NULL);
     delete route_mgr;
     delete ATIS_mgr;
     delete channel_options_list;
@@ -230,6 +233,8 @@ FGGlobals::~FGGlobals()
     locale = NULL;
     
     props.clear();
+    
+    delete commands;
 }
 
 // set the fg_root path
@@ -520,10 +525,9 @@ FGGlobals::resetPropertyRoot()
 {
     delete locale;
     
-#if DEBUG_RESET
     SG_LOG(SG_GENERAL, SG_INFO, "root props refcount:" << props.getNumRefs());
     treeDumpRefCounts(0, props);
-#endif
+
     props = new SGPropertyNode;
     initProperties();
     locale = new FGLocale(props);
@@ -688,4 +692,21 @@ void FGGlobals::set_tile_mgr ( FGTileMgr *t )
     _tile_mgr = t;
 }
 
+void FGGlobals::set_matlib( SGMaterialLib *m )
+{
+    if (matlib)
+        delete matlib;
+    matlib = m;
+}
+
+FGSampleQueue* FGGlobals::get_chatter_queue() const
+{
+    return _chatter_queue;
+}
+
+void FGGlobals::set_chatter_queue(FGSampleQueue* queue)
+{
+    _chatter_queue = queue;
+}
+
 // end of globals.cxx