fly/flightgear
1
0
Fork 0
Code Activity

Clean-up, part III.

Browse source 
Consistent white-spacing only. Also move all dead code to bottom section
(to be removed later).
This commit is contained in:
ThorstenB 2012-05-13 00:11:20 +02:00
parent a2922e2e23
commit 91198ebc8e
1 changed files with 266 additions and 253 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

507
src/ATCDCL/ATC.cxx
View file

@ -39,43 +39,42 @@ FGATC::FGATC() :
_currentStation(NULL), _currentStation(NULL),
range(0), range(0),
_voice(true), _voice(true),
_playing(false), _playing(false),
_sgr(NULL), _sgr(NULL),
_type(INVALID),
_display(false)
#ifdef OLD_ATC_MGR #ifdef OLD_ATC_MGR
freqClear(true), ,freqClear(true),
receiving(false), receiving(false),
respond(false), respond(false),
responseID(""), responseID(""),
runResponseCounter(false), runResponseCounter(false),
_runReleaseCounter(false), _runReleaseCounter(false),
responseReqd(false), responseReqd(false),
// Transmission timing stuff // Transmission timing stuff
pending_transmission(""), pending_transmission(""),
#endif _timeout(0),
_type(INVALID), _pending(false),
_display(false) _transmit(false),
#ifdef OLD_ATC_MGR _transmitting(false),
,_timeout(0), _counter(0.0),
_pending(false), _max_count(5.0)
_transmit(false),
_transmitting(false),
_counter(0.0),
_max_count(5.0)
#endif #endif
{ {
SGSoundMgr *smgr = globals->get_soundmgr(); SGSoundMgr *smgr = globals->get_soundmgr();
_sgr = smgr->find("atc", true); _sgr = smgr->find("atc", true);
_sgr->tie_to_listener(); _sgr->tie_to_listener();
_masterVolume = fgGetNode("/sim/sound/atc/volume", true); _masterVolume = fgGetNode("/sim/sound/atc/volume", true);
_enabled = fgGetNode("/sim/sound/atc/enabled", true); _enabled = fgGetNode("/sim/sound/atc/enabled", true);
_atc_external = fgGetNode("/sim/sound/atc/external-view", true); _atc_external = fgGetNode("/sim/sound/atc/external-view", true);
_internal = fgGetNode("/sim/current-view/internal", true); _internal = fgGetNode("/sim/current-view/internal", true);
} }
FGATC::~FGATC() { FGATC::~FGATC() {
} }
#ifndef OLD_ATC_MGR
// Derived classes wishing to use the response counter should // Derived classes wishing to use the response counter should
// call this from their own Update(...). // call this from their own Update(...).
void FGATC::Update(double dt) { void FGATC::Update(double dt) {
@ -91,105 +90,6 @@ void FGATC::Update(double dt) {
_sgr->suspend(); _sgr->suspend();
} }
#endif #endif
#ifdef OLD_ATC_MGR
if(runResponseCounter) {
//cout << responseCounter << '\t' << responseTime << '\n';
if(responseCounter >= responseTime) {
runResponseCounter = false;
respond = true;
//cout << "RESPOND\n";
} else {
responseCounter += dt;
}
}
if(_runReleaseCounter) {
if(_releaseCounter >= _releaseTime) {
freqClear = true;
_runReleaseCounter = false;
} else {
_releaseCounter += dt;
}
}
// Transmission stuff cribbed from AIPlane.cxx
if(_pending) {
if(GetFreqClear()) {
//cout << "TUNED STATION FREQ CLEAR\n";
SetFreqInUse();
_pending = false;
_transmit = true;
_transmitting = false;
} else {
if(_timeout > 0.0) { // allows count down to be avoided by initially setting it to zero
_timeout -= dt;
if(_timeout <= 0.0) {
_timeout = 0.0;
_pending = false;
// timed out - don't render.
}
}
}
}
if(_transmit) {
_counter = 0.0;
_max_count = 5.0; // FIXME - hardwired length of message - need to calculate it!
//cout << "Transmission = " << pending_transmission << '\n';
if(_display) {
//Render(pending_transmission, ident, false);
Render(pending_transmission);
}
_transmit = false;
_transmitting = true;
} else if(_transmitting) {
if(_counter >= _max_count) {
//NoRender(plane.callsign); commented out since at the moment NoRender is designed just to stop repeating messages,
// and this will be primarily used on single messages.
_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;
}
#endif
}
#ifdef OLD_ATC_MGR
void FGATC::ReceiveUserCallback(int code) {
SG_LOG(SG_ATC, SG_WARN, "WARNING - whichever ATC class was intended to receive callback code " << code << " didn't get it!!!");
}
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
// Shouldn't happen with AI only, but user could confuse things??
responseID = rid;
runResponseCounter = true;
responseCounter = 0.0;
responseTime = 1.8; // TODO - randomize this slightly.
}
void FGATC::NotifyTransmissionFinished(const string& rid) {
//cout << "Transmission finished, callsign = " << rid << '\n';
receiving = false;
responseID = rid;
if(responseReqd) {
runResponseCounter = true;
responseCounter = 0.0;
responseTime = 1.2; // TODO - randomize this slightly, and allow it to be dependent on the transmission and how busy the ATC is.
respond = false; // TODO - this ignores the fact that more than one plane could call this before response
// Shouldn't happen with AI only, but user could confuse things??
} else {
freqClear = true;
}
} }
#endif #endif
@ -237,159 +137,272 @@ void FGATC::SetStation(flightgear::CommStation* sta) {
// The refname is a string to identify this sample to the sound manager // 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. // The repeating flag indicates whether the message should be repeated continuously or played once.
void FGATC::Render(string& msg, const float volume, void FGATC::Render(string& msg, const float volume,
const string& refname, const bool repeating) { const string& refname, const bool repeating) {
if ((!_display) ||(volume < 0.05)) if ((!_display) ||(volume < 0.05))
{ {
NoRender(refname); NoRender(refname);
return; return;
} }
if (repeating) if (repeating)
fgSetString("/sim/messages/atis", msg.c_str()); fgSetString("/sim/messages/atis", msg.c_str());
else else
fgSetString("/sim/messages/atc", msg.c_str()); fgSetString("/sim/messages/atc", msg.c_str());
#ifdef ENABLE_AUDIO_SUPPORT #ifdef ENABLE_AUDIO_SUPPORT
bool useVoice = _voice && fgGetBool("/sim/sound/voice") && fgGetBool("/sim/sound/atc/enabled"); bool useVoice = _voice && fgGetBool("/sim/sound/voice") && fgGetBool("/sim/sound/atc/enabled");
SGSoundSample *simple = _sgr->find(refname); SGSoundSample *simple = _sgr->find(refname);
if(useVoice) { if(useVoice) {
if (simple && (_currentMsg == msg)) if (simple && (_currentMsg == msg))
{ {
simple->set_volume(volume); simple->set_volume(volume);
} }
else else
{ {
_currentMsg = msg; _currentMsg = msg;
size_t len; size_t len;
void* buf = NULL; void* buf = NULL;
if (!_vPtr) if (!_vPtr)
_vPtr = GetVoicePointer(); _vPtr = GetVoicePointer();
if (_vPtr) if (_vPtr)
buf = _vPtr->WriteMessage((char*)msg.c_str(), &len); buf = _vPtr->WriteMessage((char*)msg.c_str(), &len);
NoRender(refname); NoRender(refname);
if(buf) { if(buf) {
try { try {
// >>> Beware: must pass a (new) object to the (add) method, // >>> Beware: must pass a (new) object to the (add) method,
// >>> because the (remove) method is going to do a (delete) // >>> because the (remove) method is going to do a (delete)
// >>> whether that's what you want or not. // >>> whether that's what you want or not.
simple = new SGSoundSample(&buf, len, 8000); simple = new SGSoundSample(&buf, len, 8000);
simple->set_volume(volume); simple->set_volume(volume);
_sgr->add(simple, refname); _sgr->add(simple, refname);
_sgr->play(refname, repeating); _sgr->play(refname, repeating);
} catch ( sg_io_exception &e ) { } catch ( sg_io_exception &e ) {
SG_LOG(SG_ATC, SG_ALERT, e.getFormattedMessage()); SG_LOG(SG_ATC, SG_ALERT, e.getFormattedMessage());
} }
} }
} }
} }
else else
if (simple) if (simple)
{ {
NoRender(refname); NoRender(refname);
} }
#endif // ENABLE_AUDIO_SUPPORT #endif // ENABLE_AUDIO_SUPPORT
if (!useVoice) if (!useVoice)
{ {
// first rip the underscores and the pause hints out of the string - these are for the convenience of the voice parser // first rip the underscores and the pause hints out of the string - these are for the convenience of the voice parser
for(unsigned int i = 0; i < msg.length(); ++i) { for(unsigned int i = 0; i < msg.length(); ++i) {
if((msg.substr(i,1) == "_") || (msg.substr(i,1) == "/")) { if((msg.substr(i,1) == "_") || (msg.substr(i,1) == "/")) {
msg[i] = ' '; msg[i] = ' ';
} }
} }
} }
_playing = true; _playing = true;
} }
// Cease rendering a transmission. // Cease rendering a transmission.
void FGATC::NoRender(const string& refname) { void FGATC::NoRender(const string& refname) {
if(_playing) { if(_playing) {
if(_voice) { if(_voice) {
#ifdef ENABLE_AUDIO_SUPPORT #ifdef ENABLE_AUDIO_SUPPORT
_sgr->stop(refname); _sgr->stop(refname);
_sgr->remove(refname); _sgr->remove(refname);
#endif #endif
} }
_playing = false; _playing = false;
} }
} }
#ifdef OLD_ATC_MGR #ifdef OLD_ATC_MGR
// Derived classes wishing to use the response counter should
// call this from their own Update(...).
void FGATC::Update(double dt) {
#ifdef ENABLE_AUDIO_SUPPORT
bool active = _atc_external->getBoolValue() ||
_internal->getBoolValue();
if ( active && _enabled->getBoolValue() ) {
_sgr->set_volume( _masterVolume->getFloatValue() );
_sgr->resume(); // no-op if already in resumed state
} else {
_sgr->suspend();
}
#endif
if(runResponseCounter) {
//cout << responseCounter << '\t' << responseTime << '\n';
if(responseCounter >= responseTime) {
runResponseCounter = false;
respond = true;
//cout << "RESPOND\n";
} else {
responseCounter += dt;
}
}
if(_runReleaseCounter) {
if(_releaseCounter >= _releaseTime) {
freqClear = true;
_runReleaseCounter = false;
} else {
_releaseCounter += dt;
}
}
// Transmission stuff cribbed from AIPlane.cxx
if(_pending) {
if(GetFreqClear()) {
//cout << "TUNED STATION FREQ CLEAR\n";
SetFreqInUse();
_pending = false;
_transmit = true;
_transmitting = false;
} else {
if(_timeout > 0.0) { // allows count down to be avoided by initially setting it to zero
_timeout -= dt;
if(_timeout <= 0.0) {
_timeout = 0.0;
_pending = false;
// timed out - don't render.
}
}
}
}
if(_transmit) {
_counter = 0.0;
_max_count = 5.0; // FIXME - hardwired length of message - need to calculate it!
//cout << "Transmission = " << pending_transmission << '\n';
if(_display) {
//Render(pending_transmission, ident, false);
Render(pending_transmission);
}
_transmit = false;
_transmitting = true;
} else if(_transmitting) {
if(_counter >= _max_count) {
//NoRender(plane.callsign); commented out since at the moment NoRender is designed just to stop repeating messages,
// and this will be primarily used on single messages.
_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;
}
}
void FGATC::ReceiveUserCallback(int code) {
SG_LOG(SG_ATC, SG_WARN, "WARNING - whichever ATC class was intended to receive callback code " << code << " didn't get it!!!");
}
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
// Shouldn't happen with AI only, but user could confuse things??
responseID = rid;
runResponseCounter = true;
responseCounter = 0.0;
responseTime = 1.8; // TODO - randomize this slightly.
}
void FGATC::NotifyTransmissionFinished(const string& rid) {
//cout << "Transmission finished, callsign = " << rid << '\n';
receiving = false;
responseID = rid;
if(responseReqd) {
runResponseCounter = true;
responseCounter = 0.0;
responseTime = 1.2; // TODO - randomize this slightly, and allow it to be dependent on the transmission and how busy the ATC is.
respond = false; // TODO - this ignores the fact that more than one plane could call this before response
// Shouldn't happen with AI only, but user could confuse things??
} else {
freqClear = true;
}
}
// Generate the text of a message from its parameters and the current context. // Generate the text of a message from its parameters and the current context.
string FGATC::GenText(const string& m, int c) { string FGATC::GenText(const string& m, int c) {
return(""); return("");
} }
ostream& operator << (ostream& os, atc_type atc) { ostream& operator << (ostream& os, atc_type atc) {
switch(atc) { switch(atc) {
case(AWOS): return(os << "AWOS"); case(AWOS): return(os << "AWOS");
case(ATIS): return(os << "ATIS"); case(ATIS): return(os << "ATIS");
case(GROUND): return(os << "GROUND"); case(GROUND): return(os << "GROUND");
case(TOWER): return(os << "TOWER"); case(TOWER): return(os << "TOWER");
case(APPROACH): return(os << "APPROACH"); case(APPROACH): return(os << "APPROACH");
case(DEPARTURE): return(os << "DEPARTURE"); case(DEPARTURE): return(os << "DEPARTURE");
case(ENROUTE): return(os << "ENROUTE"); case(ENROUTE): return(os << "ENROUTE");
case(INVALID): return(os << "INVALID"); case(INVALID): return(os << "INVALID");
} }
return(os << "ERROR - Unknown switch in atc_type operator << "); return(os << "ERROR - Unknown switch in atc_type operator << ");
} }
std::istream& operator >> ( std::istream& fin, ATCData& a ) std::istream& operator >> ( std::istream& fin, ATCData& a )
{ {
double f; double f;
char ch; char ch;
char tp; char tp;
fin >> tp; fin >> tp;
switch(tp) { switch(tp) {
case 'I': case 'I':
a.type = ATIS; a.type = ATIS;
break; break;
case 'T': case 'T':
a.type = TOWER; a.type = TOWER;
break; break;
case 'G': case 'G':
a.type = GROUND; a.type = GROUND;
break; break;
case 'A': case 'A':
a.type = APPROACH; a.type = APPROACH;
break; break;
case '[': case '[':
a.type = INVALID; a.type = INVALID;
return fin >> skipeol; return fin >> skipeol;
default: default:
SG_LOG(SG_ATC, SG_ALERT, "Warning - unknown type \'" << tp << "\' found whilst reading ATC frequency data!\n"); SG_LOG(SG_ATC, SG_ALERT, "Warning - unknown type \'" << tp << "\' found whilst reading ATC frequency data!\n");
a.type = INVALID; a.type = INVALID;
return fin >> skipeol; return fin >> skipeol;
} }
double lat, lon, elev; double lat, lon, elev;
fin >> lat >> lon >> elev >> f >> a.range >> a.ident; fin >> lat >> lon >> elev >> f >> a.range >> a.ident;
a.geod = SGGeod::fromDegM(lon, lat, elev); a.geod = SGGeod::fromDegM(lon, lat, elev);
a.name = ""; a.name = "";
fin >> ch; fin >> ch;
if(ch != '"') a.name += ch; if(ch != '"') a.name += ch;
while(1) { while(1) {
//in >> noskipws //in >> noskipws
fin.unsetf(std::ios::skipws); fin.unsetf(std::ios::skipws);
fin >> ch; fin >> ch;
if((ch == '"') || (ch == 0x0A)) { if((ch == '"') || (ch == 0x0A)) {
break; break;
} // we shouldn't need the 0x0A but it makes a nice safely in case someone leaves off the " } // we shouldn't need the 0x0A but it makes a nice safely in case someone leaves off the "
a.name += ch; a.name += ch;
} }
fin.setf(std::ios::skipws); fin.setf(std::ios::skipws);
//cout << "Comm name = " << a.name << '\n'; //cout << "Comm name = " << a.name << '\n';
a.freq = (int)(f*100.0 + 0.5); a.freq = (int)(f*100.0 + 0.5);
// cout << a.ident << endl; // cout << a.ident << endl;
// generate cartesian coordinates // generate cartesian coordinates
a.cart = SGVec3d::fromGeod(a.geod); a.cart = SGVec3d::fromGeod(a.geod);
return fin >> skipeol; return fin >> skipeol;
} }
#endif #endif