X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=src%2FMain%2Fmain.cxx;h=8ac54aa5695984ea8d671a3e80b50954dad03b14;hb=3e0489bd910620e5d34e33d231c55135daeb2543;hp=281da283f6fbc059fce27735aca7936c0cbfd99e;hpb=b5c46a8d59120f18b0bc268af72ecb6d3a75b3e3;p=flightgear.git

diff --git a/src/Main/main.cxx b/src/Main/main.cxx
index 281da283f..8ac54aa56 100644
--- a/src/Main/main.cxx
+++ b/src/Main/main.cxx
@@ -47,6 +47,7 @@
 #include <simgear/scene/model/animation.hxx>
 #include <simgear/scene/sky/sky.hxx>
 #include <simgear/structure/event_mgr.hxx>
+#include <simgear/props/AtomicChangeListener.hxx>
 #include <simgear/props/props.hxx>
 #include <simgear/timing/sg_time.hxx>
 #include <simgear/math/sg_random.h>
@@ -104,6 +105,7 @@ long global_multi_loop;
 SGTimeStamp last_time_stamp;
 SGTimeStamp current_time_stamp;
 
+void fgInitSoundManager();
 void fgSetNewSoundDevice(const char *);
 
 // The atexit() function handler should know when the graphical subsystem
@@ -166,7 +168,7 @@ void fgUpdateTimeDepCalcs() {
                 // normal playback
                 replay_time->setDoubleValue( replay_time->getDoubleValue()
                                              + ( delta_time_sec
-                                               * fgGetInt("/sim/speed-up") ) );
+                                                 * fgGetInt("/sim/speed-up") ) );
             } else if ( replay_state->getIntValue() == 2 ) {
                 // paused playback (don't advance replay time)
             }
@@ -343,14 +345,14 @@ static void fgMainLoop( void ) {
     // probably move eventually
 
     /* printf("Before - ground = %.2f  runway = %.2f  alt = %.2f\n",
-           scenery.get_cur_elev(),
-           cur_fdm_state->get_Runway_altitude() * SG_FEET_TO_METER,
-           cur_fdm_state->get_Altitude() * SG_FEET_TO_METER); */
+       scenery.get_cur_elev(),
+       cur_fdm_state->get_Runway_altitude() * SG_FEET_TO_METER,
+       cur_fdm_state->get_Altitude() * SG_FEET_TO_METER); */
 
     /* printf("Adjustment - ground = %.2f  runway = %.2f  alt = %.2f\n",
-           scenery.get_cur_elev(),
-           cur_fdm_state->get_Runway_altitude() * SG_FEET_TO_METER,
-           cur_fdm_state->get_Altitude() * SG_FEET_TO_METER); */
+       scenery.get_cur_elev(),
+       cur_fdm_state->get_Runway_altitude() * SG_FEET_TO_METER,
+       cur_fdm_state->get_Altitude() * SG_FEET_TO_METER); */
 
     // cout << "Warp = " << globals->get_warp() << endl;
 
@@ -422,7 +424,7 @@ static void fgMainLoop( void ) {
         general.set_frame_rate( frames );
         fgSetInt("/sim/frame-rate", frames);
         SG_LOG( SG_ALL, SG_DEBUG,
-            "--> Frame rate is = " << general.get_frame_rate() );
+                "--> Frame rate is = " << general.get_frame_rate() );
         frames = 0;
     }
     last_time = t->get_cur_time();
@@ -451,7 +453,7 @@ static void fgMainLoop( void ) {
         fgUpdateTimeDepCalcs();
     } else {
         SG_LOG( SG_ALL, SG_DEBUG,
-            "Elapsed time is zero ... we're zinging" );
+                "Elapsed time is zero ... we're zinging" );
     }
 
     globals->get_subsystem_mgr()->update(delta_time_sec);
@@ -482,22 +484,33 @@ static void fgMainLoop( void ) {
     // Update the sound manager last so it can use the CPU while the GPU
     // is processing the scenery (doubled the frame-rate for me) -EMH-
 #ifdef ENABLE_AUDIO_SUPPORT
-    static SGPropertyNode *sound_enabled = fgGetNode("/sim/sound/enabled");
-    static SGSoundMgr *smgr = globals->get_soundmgr();
-    static bool smgr_enabled = true;
-    if (smgr_enabled != sound_enabled->getBoolValue()) {
-        if (smgr_enabled == true) { // request to suspend
-            smgr->suspend();
-        } else {
-            smgr->resume();
+    static bool smgr_init = true;
+    if (smgr_init == true) {
+        static SGPropertyNode *sound_working = fgGetNode("/sim/sound/working");
+        if (sound_working->getBoolValue() == true) {
+            fgInitSoundManager();
+            smgr_init = false;
+        }
+    } else {
+        static SGPropertyNode *sound_enabled = fgGetNode("/sim/sound/enabled");
+        static SGSoundMgr *smgr = globals->get_soundmgr();
+        static bool smgr_enabled = true;
+
+        if (smgr_enabled != sound_enabled->getBoolValue()) {
+            if (smgr_enabled == true) { // request to suspend
+                smgr->suspend();
+                smgr_enabled = false;
+            } else {
+                smgr->resume();
+                smgr_enabled = true;
+            }
         }
-        smgr_enabled = sound_enabled->getBoolValue();
-    }
 
-    if (smgr_enabled == true) {
-        static SGPropertyNode *volume = fgGetNode("/sim/sound/volume");
-        smgr->set_volume(volume->getFloatValue());
-        smgr->update(delta_time_sec);
+        if (smgr_enabled == true) {
+            static SGPropertyNode *volume = fgGetNode("/sim/sound/volume");
+            smgr->set_volume(volume->getFloatValue());
+            smgr->update(delta_time_sec);
+        }
     }
 #endif
 
@@ -507,19 +520,32 @@ static void fgMainLoop( void ) {
         && cur_fdm_state->get_inited()) {
         fgSetBool("sim/sceneryloaded",true);
         if (fgGetBool("/sim/sound/working")) {
-            smgr->activate();
-        } else {
-            smgr->stop();
+            globals->get_soundmgr()->activate();
         }
         globals->get_props()->tie("/sim/sound/devices/name",
               SGRawValueFunctions<const char *>(0, fgSetNewSoundDevice), false);
     }
-
+    simgear::AtomicChangeListener::fireChangeListeners();
     fgRequestRedraw();
 
     SG_LOG( SG_ALL, SG_DEBUG, "" );
 }
 
+void fgInitSoundManager()
+{
+    SGSoundMgr *smgr = globals->get_soundmgr();
+
+    smgr->bind();
+    smgr->init(fgGetString("/sim/sound/device-name", NULL));
+
+    vector <const char*>devices = smgr->get_available_devices();
+    for (unsigned int i=0; i<devices.size(); i++) {
+        SGPropertyNode *p = fgGetNode("/sim/sound/devices/device", i, true);
+        p->setStringValue(devices[i]);
+    }
+    devices.clear();
+}
+
 void fgSetNewSoundDevice(const char *device)
 {
     globals->get_soundmgr()->suspend();
@@ -757,7 +783,7 @@ static void fgIdleFunction ( void ) {
 
 # if defined( __CYGWIN__ )
             string command = "start /m `cygpath -w " + mp3file.str() + "`";
-# elif defined( WIN32 )
+# elif defined( _WIN32 )
             string command = "start /m " + mp3file.str();
 # else
             string command = "mpg123 " + mp3file.str() + "> /dev/null 2>&1";
@@ -865,7 +891,7 @@ bool fgMainInit( int argc, char **argv ) {
     fgInitFGRoot(argc, argv);
 
     // Check for the correct base package version
-    static char required_version[] = "1.9.0";
+    static char required_version[] = "2.0.0";
     string base_version = fgBasePackageVersion();
     if ( !(base_version == required_version) ) {
         // tell the operator how to use this application