main.cxx - small tweak to sound updating logic.

options.cxx - change property name /sim/sound/audible to /sim/sound/pause

diff --git a/src/Main/main.cxx b/src/Main/main.cxx
index f3f2191cb562ee1ff98b50289c603c78f15c3541..809ae0a32c571721f28d65fe77078180ff6357b0 100644 (file)
--- a/src/Main/main.cxx
+++ b/src/Main/main.cxx
@@ -1216,9 +1216,7 @@ static void fgMainLoop( void ) {
 
     // Run audio scheduler
 #ifdef ENABLE_AUDIO_SUPPORT
-    if ( fgGetBool("/sim/sound/audible")
-         && globals->get_soundmgr()->is_working() )
-    {
+    if ( globals->get_soundmgr()->is_working() ) {
         globals->get_soundmgr()->update( delta_time_sec );
     }
 #endif

diff --git a/src/Main/options.cxx b/src/Main/options.cxx
index 0e19d6ee38f6f7f379c5826334d07d2873150ec1..8a85e80ddf178c5087669ffc7f4ac4743f26b539 100644 (file)
--- a/src/Main/options.cxx
+++ b/src/Main/options.cxx
@@ -184,7 +184,7 @@ fgSetDefaults ()
     fgSetBool("/sim/hud/enable3d", true);
     fgSetBool("/sim/hud/visibility", false);
     fgSetBool("/sim/panel/visibility", true);
-    fgSetBool("/sim/sound/audible", true);
+    fgSetBool("/sim/sound/pause", false);
 
                                // Flight Model options
     fgSetString("/sim/flight-model", "jsb");
@@ -1204,8 +1204,8 @@ struct OptionDesc {
     {"enable-hud",                   false, OPTION_BOOL,   "/sim/hud/visibility", true, "", 0 },
     {"disable-panel",                false, OPTION_BOOL,   "/sim/panel/visibility", false, "", 0 },
     {"enable-panel",                 false, OPTION_BOOL,   "/sim/panel/visibility", true, "", 0 },
-    {"disable-sound",                false, OPTION_BOOL,   "/sim/sound/audible", false, "", 0 },
-    {"enable-sound",                 false, OPTION_BOOL,   "/sim/sound/audible", true, "", 0 },
+    {"disable-sound",                false, OPTION_BOOL,   "/sim/sound/pause", true, "", 0 },
+    {"enable-sound",                 false, OPTION_BOOL,   "/sim/sound/pause", false, "", 0 },
     {"airport",                      true,  OPTION_STRING, "/sim/presets/airport-id", false, "", 0 },
     {"airport-id",                   true,  OPTION_STRING, "/sim/presets/airport-id", false, "", 0 },
     {"runway",                       true,  OPTION_STRING, "/sim/presets/runway", false, "", 0 },