#include <boost/foreach.hpp>
#include <algorithm>
+#include <osgViewer/Viewer>
+#include <osgDB/Registry>
+
#include <simgear/structure/commands.hxx>
#include <simgear/misc/sg_path.hxx>
#include <simgear/misc/sg_dir.hxx>
#include <Navaids/navlist.hxx>
#include <Viewer/renderer.hxx>
#include <Viewer/viewmgr.hxx>
+#include <Sound/sample_queue.hxx>
#include "globals.hxx"
#include "locale.hxx"
fg_home( "" ),
time_params( NULL ),
ephem( NULL ),
- matlib( NULL ),
route_mgr( NULL ),
ATIS_mgr( NULL ),
controls( NULL ),
viewmgr( NULL ),
- commands( new SGCommandMgr ),
+ commands( SGCommandMgr::instance() ),
channel_options_list( NULL ),
initial_waypoints( NULL ),
fontcache ( new FGFontCache ),
channellist( NULL ),
- haveUserSettings(false)
+ haveUserSettings(false),
+ _chatter_queue(NULL)
{
SGPropertyNode* root = new SGPropertyNode;
props = SGPropertyNode_ptr(root);
subsystem_mgr->remove("model-manager");
_tile_mgr.clear();
+ osg::ref_ptr<osgViewer::Viewer> vw(renderer->getViewer());
+ if (vw) {
+ // https://code.google.com/p/flightgear-bugs/issues/detail?id=1291
+ // explicitly stop trheading before we delete the renderer or
+ // viewMgr (which ultimately holds refs to the CameraGroup, and
+ // GraphicsContext)
+ vw->stopThreading();
+ }
+
+ // don't cancel the pager until after shutdown, since AIModels (and
+ // potentially others) can queue delete requests on the pager.
+ if (vw && vw->getDatabasePager()) {
+ vw->getDatabasePager()->cancel();
+ vw->getDatabasePager()->clear();
+ }
+
+ osgDB::Registry::instance()->clearObjectCache();
+
// 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
+ subsystem_mgr = NULL; // important so ::get_subsystem returns NULL
+ vw = 0; // don't delete the viewer until now
delete time_params;
set_matlib(NULL);
delete locale;
locale = NULL;
+ cleanupListeners();
+
props.clear();
delete commands;
{
SGPath dirPath(path);
if (!dirPath.exists()) {
- SG_LOG(SG_GENERAL, SG_WARN, "aircraft path not found:" << path);
+ SG_LOG(SG_GENERAL, SG_ALERT, "aircraft path not found:" << path);
return;
}
+
+ SGPath acSubdir(dirPath);
+ acSubdir.append("Aircraft");
+ if (acSubdir.exists()) {
+ SG_LOG(SG_GENERAL, SG_WARN, "Specified an aircraft-dir with an 'Aircraft' subdirectory:" << dirPath
+ << ", will instead use child directory:" << acSubdir);
+ dirPath = acSubdir;
+ }
+
std::string abspath = dirPath.realpath();
-
unsigned int index = fg_aircraft_dirs.size();
fg_aircraft_dirs.push_back(abspath);
}
}
+static void treeClearAliases(SGPropertyNode* nd)
+{
+ if (nd->isAlias()) {
+ nd->unalias();
+ }
+
+ for (int i=0; i<nd->nChildren(); ++i) {
+ SGPropertyNode* cp = nd->getChild(i);
+ treeClearAliases(cp);
+ }
+}
+
void
FGGlobals::resetPropertyRoot()
{
delete locale;
+ cleanupListeners();
+
+ // we don't strictly need to clear these (they will be reset when we
+ // initProperties again), but trying to reduce false-positives when dumping
+ // ref-counts.
+ positionLon.clear();
+ positionLat.clear();
+ positionAlt.clear();
+ viewLon.clear();
+ viewLat.clear();
+ viewAlt.clear();
+ orientPitch.clear();
+ orientHeading.clear();
+ orientRoll.clear();
+
+ // clear aliases so ref-counts are accurate when dumped
+ treeClearAliases(props);
+
SG_LOG(SG_GENERAL, SG_INFO, "root props refcount:" << props.getNumRefs());
treeDumpRefCounts(0, props);
+ //BaseStackSnapshot::dumpAll(std::cout);
+
props = new SGPropertyNode;
initProperties();
locale = new FGLocale(props);
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;
+}
+
+void FGGlobals::addListenerToCleanup(SGPropertyChangeListener* l)
+{
+ _listeners_to_cleanup.push_back(l);
+}
+
+void FGGlobals::cleanupListeners()
+{
+ SGPropertyChangeListenerVec::iterator i = _listeners_to_cleanup.begin();
+ for (; i != _listeners_to_cleanup.end(); ++i) {
+ delete *i;
+ }
+ _listeners_to_cleanup.clear();
+}
+
// end of globals.cxx