Code at this level shouldn't care if the sound manager is paused or not.

Just forge ahead as if sound is playing, let the sound manger worry about
the details.

diff --git a/src/ATC/AIPlane.cxx b/src/ATC/AIPlane.cxx
index 272f4e73b12ec07982938f097b7774386a59e9db..97789d7d2157d0b32e10af0e351b163529a46c1c 100644 (file)
--- a/src/ATC/AIPlane.cxx
+++ b/src/ATC/AIPlane.cxx
@@ -183,8 +183,7 @@ void FGAIPlane::ProcessCallback(int code) {
 // The repeating flag indicates whether the message should be repeated continuously or played once.
 void FGAIPlane::Render(string refname, bool repeating) {
 #ifdef ENABLE_AUDIO_SUPPORT
-       voice = (voiceOK && fgGetBool("/sim/sound/audible")
-                 && fgGetBool("/sim/sound/voice"));
+       voice = (voiceOK && fgGetBool("/sim/sound/voice"));
        if(voice) {
                int len;
                unsigned char* buf = vPtr->WriteMessage((char*)pending_transmission.c_str(), len, voice);

diff --git a/src/ATC/ATC.cxx b/src/ATC/ATC.cxx
index 47f9bba3119b46e6d0909a15814fca196204ddde..8634de024eb34b1fcd43c2a80129045650f0eab6 100644 (file)
--- a/src/ATC/ATC.cxx
+++ b/src/ATC/ATC.cxx
@@ -217,8 +217,7 @@ void FGATC::SetData(ATCData* d) {
 // The repeating flag indicates whether the message should be repeated continuously or played once.
 void FGATC::Render(string msg, string refname, bool repeating) {
        #ifdef ENABLE_AUDIO_SUPPORT
-       voice = (voiceOK && fgGetBool("/sim/sound/audible")
-       && fgGetBool("/sim/sound/voice"));
+       voice = (voiceOK && fgGetBool("/sim/sound/voice"));
        if(voice) {
                int len;
                unsigned char* buf = vPtr->WriteMessage((char*)msg.c_str(), len, voice);

diff --git a/src/ATC/ATCmgr.cxx b/src/ATC/ATCmgr.cxx
index 3a4719772edcc4a8ad41b164044d16ff8590a0ab..6f8b911aaadcb91a383cf7e40a21f55859d04b08 100644 (file)
--- a/src/ATC/ATCmgr.cxx
+++ b/src/ATC/ATCmgr.cxx
@@ -117,9 +117,10 @@ void FGATCMgr::init() {
        voiceOK = v1->LoadVoice("default");
        voice = true;
        
-       /* I've loaded the voice even if /sim/sound/audible is false
+       /* I've loaded the voice even if /sim/sound/pause is true
        *  since I know no way of forcing load of the voice if the user
-       *  subsequently switches /sim/sound/audible to true. */
+       *  subsequently switches /sim/sound/audible to true.
+        *  (which is the right thing to do -- CLO) :-) */
 #else
        voice = false;
 #endif