Fix shared library build with sqlite

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

diff --git a/src/Main/main.cxx b/src/Main/main.cxx
index 04e075c8861a4b73660067f14a7e2ba701ee6c3b..4dc123c27951416415c6f818b47e3c19419dbb37 100644 (file)
--- a/src/Main/main.cxx
+++ b/src/Main/main.cxx
@@ -60,6 +60,7 @@
 #include <Viewer/WindowSystemAdapter.hxx>
 #include <Viewer/splash.hxx>
 #include <Viewer/renderer.hxx>
+#include <Navaids/NavDataCache.hxx>
 
 #include "fg_commands.hxx"
 #include "fg_io.hxx"
@@ -68,6 +69,7 @@
 #include "fg_init.hxx"
 #include "fg_os.hxx"
 #include "fg_props.hxx"
+#include "positioninit.hxx"
 
 using namespace flightgear;
 
@@ -96,9 +98,9 @@ static void fgLoadInitialScenery()
         }
         else
         {
-            fgSplashProgress("loading scenery");
-            // be nice to loader threads while waiting for initial scenery, reduce to 2fps
-            SGTimeStamp::sleepForMSec(500);
+            fgSplashProgress("loading-scenery");
+            // be nice to loader threads while waiting for initial scenery, reduce to 20fps
+            SGTimeStamp::sleepForMSec(50);
         }
     }
 }
@@ -181,7 +183,7 @@ static void fgIdleFunction ( void ) {
     // our initializations out of the idle callback so that we can get a
     // splash screen up and running right away.
     static int idle_state = 0;
-
+  
     static osg::ref_ptr<GeneralInitOperation> genOp;
     if ( idle_state == 0 ) {
         idle_state++;
@@ -209,24 +211,24 @@ static void fgIdleFunction ( void ) {
         if (!guiFinishInit())
             return;
         idle_state++;
-        fgSplashProgress("loading aircraft list");
+        fgSplashProgress("loading-aircraft-list");
 
     } else if ( idle_state == 2 ) {
         idle_state++;
-        fgSplashProgress("loading navigation data");
+        fgSplashProgress("loading-nav-data");
 
     } else if ( idle_state == 3 ) {
         idle_state++;
         fgInitNav();
 
-        fgSplashProgress("initializing scenery system");
+        fgSplashProgress("init-scenery");
 
     } else if ( idle_state == 4 ) {
         idle_state+=2;
         // based on the requested presets, calculate the true starting
         // lon, lat
-        fgInitPosition();
-        fgInitTowerLocationListener();
+        flightgear::initPosition();
+        flightgear::initTowerLocationListener();
 
         TimeManager* t = new TimeManager;
         globals->add_subsystem("time", t, SGSubsystemMgr::INIT);
@@ -261,51 +263,42 @@ static void fgIdleFunction ( void ) {
         globals->get_scenery()->bind();
         globals->set_tile_mgr( new FGTileMgr );
 
-        fgSplashProgress("loading aircraft");
+        fgSplashProgress("loading-aircraft");
 
     } else if ( idle_state == 6 ) {
         idle_state++;
-        fgSplashProgress("initializing subsystems");
+        fgSplashProgress("creating-subsystems");
 
     } else if ( idle_state == 7 ) {
         idle_state++;
-        // Initialize audio support
-#ifdef ENABLE_AUDIO_SUPPORT
-
-        // Start the intro music
-        if ( fgGetBool("/sim/startup/intro-music") ) {
-            SGPath mp3file( globals->get_fg_root() );
-            mp3file.append( "Sounds/intro.mp3" );
-
-            SG_LOG( SG_GENERAL, SG_INFO,
-                "Starting intro music: " << mp3file.str() );
-
-# if defined( __CYGWIN__ )
-            string command = "start /m `cygpath -w " + mp3file.str() + "`";
-# elif defined( _WIN32 )
-            string command = "start /m " + mp3file.str();
-# else
-            string command = "mpg123 " + mp3file.str() + "> /dev/null 2>&1";
-# endif
-
-            if (0 != system ( command.c_str() ))
-            {
-                SG_LOG( SG_SOUND, SG_WARN,
-                    "Failed to play mp3 file " << mp3file.str() << ". Maybe mp3 player is not installed." );
-            }
-        }
-#endif
-        // This is the top level init routine which calls all the
-        // other subsystem initialization routines.  If you are adding
-        // a subsystem to flightgear, its initialization call should be
-        // located in this routine.
-        if( !fgInitSubsystems()) {
-            SG_LOG( SG_GENERAL, SG_ALERT,
-                "Subsystem initialization failed ..." );
-            exit(-1);
+        SGTimeStamp st;
+        st.stamp();
+        fgCreateSubsystems();
+        SG_LOG(SG_GENERAL, SG_INFO, "Creating subsystems took:" << st.elapsedMSec());
+        fgSplashProgress("binding-subsystems");
+      
+    } else if ( idle_state == 8 ) {
+        idle_state++;
+        SGTimeStamp st;
+        st.stamp();
+        globals->get_subsystem_mgr()->bind();
+        SG_LOG(SG_GENERAL, SG_INFO, "Binding subsystems took:" << st.elapsedMSec());
+
+        fgSplashProgress("init-subsystems");
+    } else if ( idle_state == 9 ) {
+        SGSubsystem::InitStatus status = globals->get_subsystem_mgr()->incrementalInit();
+        if ( status == SGSubsystem::INIT_DONE) {
+          ++idle_state;
+          fgSplashProgress("finishing-subsystems");
+        } else {
+          fgSplashProgress("init-subsystems");
         }
-
-        // Torsten Dreyer:
+      
+    } else if ( idle_state == 10 ) {
+        idle_state = 900;
+        fgPostInitSubsystems();
+      
+              // Torsten Dreyer:
         // ugly hack for automatic runway selection on startup based on
         // metar data. Makes startup.nas obsolete and guarantees the same
         // runway selection as for AI traffic. However, this code belongs to
@@ -326,16 +319,16 @@ static void fgIdleFunction ( void ) {
             // the other logic is taken from former startup.nas
             if( hdg < 360.0 && apt.length() > 0 && strthdg > 360.0 && rwy.length() == 0 && onground && parkpos.length() == 0 ) {
                 extern bool fgSetPosFromAirportIDandHdg( const string& id, double tgt_hdg );
-                fgSetPosFromAirportIDandHdg( apt, hdg );
+                flightgear::setPosFromAirportIDandHdg( apt, hdg );
             }
         } else {
             SG_LOG(SG_ENVIRONMENT, SG_INFO,
                 "No METAR available to pick active runway" );
         }
 
-        fgSplashProgress("initializing graphics engine");
+        fgSplashProgress("init-graphics");
 
-    } else if ( idle_state == 8 ) {
+    } else if ( idle_state == 900 ) {
         idle_state = 1000;
         
         // setup OpenGL view parameters
@@ -443,5 +436,9 @@ int fgMainInit( int argc, char **argv ) {
     delete globals;
     globals = NULL;
     
+    // delete the NavCache here. This will cause the destruction of many cached
+    // objects (eg, airports, navaids, runways).
+    delete flightgear::NavDataCache::instance();
+  
     return result;
 }