Migrate FlightGear code to use "#include SG_GL*" defined in

[flightgear.git] / src / ATC / ATC.cxx

diff --git a/src/ATC/ATC.cxx b/src/ATC/ATC.cxx
index d76ba74cf2ca9294508904708331653c847f9068..955cb8195f982a695bbd021ece95de9e4c1562a8 100644 (file)
--- a/src/ATC/ATC.cxx
+++ b/src/ATC/ATC.cxx
@@ -22,7 +22,7 @@
 #  include <config.h>
 #endif
 
-#include <simgear/sound/soundmgr.hxx>
+#include <simgear/sound/soundmgr_openal.hxx>
 
 #include <Main/globals.hxx>
 #include <Main/fg_props.hxx>
@@ -51,6 +51,8 @@ FGATC::FGATC() {
        _transmitting = false;
        _counter = 0.0;
        _max_count = 5.0;
+       
+       _voiceOK = false;
 }
 
 FGATC::~FGATC() {
@@ -105,8 +107,9 @@ void FGATC::Update(double dt) {
                //cout << "Transmission = " << pending_transmission << '\n';
                if(_display) {
                        //Render(pending_transmission, ident, false);
+                       Render(pending_transmission);
                        // At the moment Render only works for ATIS
-                       globals->get_ATC_display()->RegisterSingleMessage(pending_transmission);
+                       //globals->get_ATC_display()->RegisterSingleMessage(pending_transmission);
                }
                // Run the callback regardless of whether on same freq as user or not.
                //cout << "_callback_code = " << _callback_code << '\n';
@@ -122,6 +125,10 @@ void FGATC::Update(double dt) {
                        _transmitting = false;
                        //if(tuned_station) tuned_station->NotifyTransmissionFinished(plane.callsign);
                        // TODO - need to let the plane the transmission is aimed at that it's finished.
+                       // However, for now we'll just release the frequency since if we don't it all goes pear-shaped
+                       _releaseCounter = 0.0;
+                       _releaseTime = 0.9;
+                       _runReleaseCounter = true;
                }
                _counter += dt;
        }
@@ -175,8 +182,9 @@ void FGATC::ImmediateTransmit(int callback_code) {
        SG_LOG(SG_ATC, SG_INFO, "Immediate transmit called by " << ident << " " << _type << ", msg = " << pending_transmission);
        if(_display) {
                //Render(pending_transmission, ident, false);
+               Render(pending_transmission);
                // At the moment Render doesn't work except for ATIS
-               globals->get_ATC_display()->RegisterSingleMessage(pending_transmission);
+               //globals->get_ATC_display()->RegisterSingleMessage(pending_transmission);
        }
        if(callback_code) {
                ProcessCallback(callback_code);
@@ -213,13 +221,13 @@ 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"));
-       if(voice) {
+       _voice = (_voiceOK && fgGetBool("/sim/sound/voice"));
+       if(_voice) {
                int len;
-               unsigned char* buf = vPtr->WriteMessage((char*)msg.c_str(), len, voice);
-               if(voice) {
-                       SGSimpleSound* simple = new SGSimpleSound(buf, len);
+               unsigned char* buf = _vPtr->WriteMessage((char*)msg.c_str(), len, _voice);
+               if(_voice) {
+                       SGSoundSample *simple
+                            = new SGSoundSample(buf, len, 8000, false);
                        // TODO - at the moment the volume is always set off comm1 
                        // and can't be changed after the transmission has started.
                        simple->set_volume(5.0 * fgGetDouble("/radios/comm[0]/volume"));
@@ -233,23 +241,27 @@ void FGATC::Render(string msg, string refname, bool repeating) {
                delete[] buf;
        }
        #endif  // ENABLE_AUDIO_SUPPORT
-       if(!voice) {
+       if(!_voice) {
                // first rip the underscores and the pause hints out of the string - these are for the convienience of the voice parser
                for(unsigned int i = 0; i < msg.length(); ++i) {
                        if((msg.substr(i,1) == "_") || (msg.substr(i,1) == "/")) {
                                msg[i] = ' ';
                        }
                }
-               globals->get_ATC_display()->RegisterRepeatingMessage(msg);
+               if(repeating) {
+                       globals->get_ATC_display()->RegisterRepeatingMessage(msg);
+               } else {
+                       globals->get_ATC_display()->RegisterSingleMessage(msg);
+               }
        }
-       playing = true; 
+       _playing = true;        
 }
 
 
 // Cease rendering a transmission.
 void FGATC::NoRender(string refname) {
-       if(playing) {
-               if(voice) {
+       if(_playing) {
+               if(_voice) {
                        #ifdef ENABLE_AUDIO_SUPPORT             
                        globals->get_soundmgr()->stop(refname);
                        globals->get_soundmgr()->remove(refname);
@@ -257,7 +269,7 @@ void FGATC::NoRender(string refname) {
                } else {
                        globals->get_ATC_display()->CancelRepeatingMessage();
                }
-               playing = false;
+               _playing = false;
        }
 }