#include <ATCDCL/ATCmgr.hxx>
#include <Autopilot/route_mgr.hxx>
#include <Cockpit/panel.hxx>
-#include <GUI/new_gui.hxx>
+#include <GUI/FGFontCache.hxx>
#include <Model/acmodel.hxx>
#include <Model/modelmgr.hxx>
#include <MultiPlayer/multiplaymgr.hxx>
renderer( new FGRenderer ),
subsystem_mgr( new SGSubsystemMgr ),
event_mgr( new SGEventMgr ),
- soundmgr( new SGSoundMgr ),
sim_time_sec( 0.0 ),
fg_root( "" ),
time_params( NULL ),
dmelist( NULL ),
tacanlist( NULL ),
carrierlist( NULL ),
- channellist( NULL )
+ channellist( NULL )
{
simgear::ResourceManager::instance()->addProvider(new AircraftResourceProvider());
simgear::PropertyObjectBase::setDefaultRoot(props);
// deallocation of AIModel objects. To ensure we can safely
// shut down all subsystems, make sure we take down the
// AIModels system first.
- SGSubsystem* ai = subsystem_mgr->remove("ai_model");
+ SGSubsystem* ai = subsystem_mgr->remove("ai-model");
if (ai) {
ai->unbind();
delete ai;
}
-
+ SGSubsystem* sound = subsystem_mgr->remove("sound");
+
subsystem_mgr->shutdown();
subsystem_mgr->unbind();
delete subsystem_mgr;
delete tacanlist;
delete carrierlist;
delete channellist;
-
- soundmgr->unbind();
- delete soundmgr;
+ delete sound;
}
SGPath tmp( fg_root );
tmp.append( "data" );
tmp.append( "version" );
- if ( ulFileExists( tmp.c_str() ) ) {
+ if ( tmp.exists() ) {
fgGetNode("BAD_FG_ROOT", true)->setStringValue(fg_root);
fg_root += "/data";
fgGetNode("GOOD_FG_ROOT", true)->setStringValue(fg_root);
SGSoundMgr *
FGGlobals::get_soundmgr () const
{
- return soundmgr;
+ if (subsystem_mgr)
+ return (SGSoundMgr*) subsystem_mgr->get_subsystem("sound");
+
+ return NULL;
}
SGEventMgr *