Reset, fix Nasal timers added on shutdown.

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

diff --git a/src/Main/globals.hxx b/src/Main/globals.hxx
index 97f07307adb119231396c4679f160d5b5d9b4284..8f1736f146b125697138e43feb1638487bedbc12 100644 (file)
--- a/src/Main/globals.hxx
+++ b/src/Main/globals.hxx
@@ -33,6 +33,7 @@
 #include <string>
 
 typedef std::vector<std::string> string_list;
+typedef std::vector<SGPath> PathList;
 
 // Forward declarations
 
@@ -65,7 +66,7 @@ class FGViewMgr;
 class FGViewer;
 class FGRenderer;
 class FGFontCache;
-
+class FGSampleQueue;
 
 /**
  * Bucket for subsystem pointers representing the sim's state.
@@ -93,6 +94,11 @@ private:
     // Root of FlightGear data tree
     std::string fg_root;
 
+    /**
+     * locations to search for (non-scenery) data. 
+     */
+    PathList additional_data_paths;
+    
     // Users home directory for data
     std::string fg_home;
 
@@ -132,10 +138,10 @@ private:
     string_list *initial_waypoints;
 
     // FlightGear scenery manager
-    FGScenery *scenery;
+    SGSharedPtr<FGScenery> _scenery;
 
     // Tile manager
-    FGTileMgr *tile_mgr;
+    SGSharedPtr<FGTileMgr> _tile_mgr;
 
     FGFontCache *fontcache;
 
@@ -150,13 +156,27 @@ private:
     SGPropertyNode_ptr positionLon, positionLat, positionAlt;
     SGPropertyNode_ptr viewLon, viewLat, viewAlt;
     SGPropertyNode_ptr orientHeading, orientPitch, orientRoll;
+    
+    /**
+     * 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();
     virtual ~FGGlobals();
 
     virtual FGRenderer *get_renderer () const;
-
+    void set_renderer(FGRenderer* render);
+    
     virtual SGSubsystemMgr *get_subsystem_mgr () const;
 
     virtual SGSubsystem *get_subsystem (const char * name);
@@ -178,6 +198,26 @@ public:
     inline const std::string &get_fg_root () const { return fg_root; }
     void set_fg_root (const std::string &root);
 
+    /**
+     * Get list of data locations. fg_root is always the final item in the
+     * result.
+     */
+    PathList get_data_paths() const;
+    
+    /**
+     * Get data locations which contain the file path suffix. Eg pass ing
+     * 'AI/Traffic' to get all data paths which define <path>/AI/Traffic subdir
+     */
+    PathList get_data_paths(const std::string& suffix) const;
+    
+    void append_data_path(const SGPath& path);
+    
+    /**
+     * Given a path suffix (eg 'Textures' or 'AI/Traffic'), find the
+     * first data directory which defines it.
+     */
+    SGPath find_data_dir(const std::string& pathSuffix) const;
+    
     inline const std::string &get_fg_home () const { return fg_home; }
     void set_fg_home (const std::string &home);
 
@@ -229,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; }
@@ -242,8 +282,13 @@ public:
     FGViewer *get_current_view() const;
 
     inline SGPropertyNode *get_props () { return props; }
-    inline void set_props( SGPropertyNode *n ) { props = n; }
 
+    /**
+     * @brief reset the property tree to new, empty tree. Ensure all
+     * subsystems are shutdown and unbound before call this.
+     */
+    void resetPropertyRoot();
+    
     inline FGLocale* get_locale () { return locale; }
 
     inline SGCommandMgr *get_commands () { return commands; }
@@ -273,11 +318,11 @@ public:
         initial_waypoints = list;
     }
 
-    inline FGScenery * get_scenery () const { return scenery; }
-    inline void set_scenery ( FGScenery *s ) { scenery = s; }
+    FGScenery * get_scenery () const;
+    void set_scenery ( FGScenery *s );
 
-    inline FGTileMgr * get_tile_mgr () const { return tile_mgr; }
-    inline void set_tile_mgr ( FGTileMgr *t ) { tile_mgr = t; }
+    FGTileMgr * get_tile_mgr () const;
+    void set_tile_mgr ( FGTileMgr *t );
 
     inline FGFontCache *get_fontcache() const { return fontcache; }
   
@@ -304,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);
 };