_transmitting = false;
_counter = 0.0;
_max_count = 5.0;
+
+ _voiceOK = false;
}
FGATC::~FGATC() {
//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';
SG_LOG(SG_ATC, SG_WARN, "WARNING - whichever ATC class was intended to receive callback code " << code << " didn't get it!!!");
}
-void FGATC::SetResponseReqd(string rid) {
+void FGATC::SetResponseReqd(const string& rid) {
receiving = false;
responseReqd = true;
respond = false; // TODO - this ignores the fact that more than one plane could call this before response
responseTime = 1.8; // TODO - randomize this slightly.
}
-void FGATC::NotifyTransmissionFinished(string rid) {
+void FGATC::NotifyTransmissionFinished(const string& rid) {
//cout << "Transmission finished, callsign = " << rid << '\n';
receiving = false;
responseID = rid;
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);
void FGATC::ProcessCallback(int code) {
}
-void FGATC::AddPlane(string pid) {
+void FGATC::AddPlane(const string& pid) {
}
int FGATC::RemovePlane() {
// Outputs the transmission either on screen or as audio depending on user preference
// The refname is a string to identify this sample to the sound manager
// The repeating flag indicates whether the message should be repeated continuously or played once.
-void FGATC::Render(string msg, string refname, bool repeating) {
+void FGATC::Render(string& msg, const string& refname, bool repeating) {
#ifdef ENABLE_AUDIO_SUPPORT
- voice = (voiceOK && 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) {
+ 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"));
+ simple->set_volume(5.0 * fgGetDouble("/instrumentation/comm[0]/volume"));
globals->get_soundmgr()->add(simple, refname);
if(repeating) {
globals->get_soundmgr()->play_looped(refname);
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) {
+void FGATC::NoRender(const string& refname) {
+ if(_playing) {
+ if(_voice) {
#ifdef ENABLE_AUDIO_SUPPORT
globals->get_soundmgr()->stop(refname);
globals->get_soundmgr()->remove(refname);
} else {
globals->get_ATC_display()->CancelRepeatingMessage();
}
- playing = false;
+ _playing = false;
}
}