From acb2bc9286e864d23e0ab83c4cc42f03aff7d860 Mon Sep 17 00:00:00 2001 From: Durk Talsma Date: Mon, 25 Jul 2011 12:53:10 +0200 Subject: [PATCH] Bugfixes: - Allow the ATC/AI code to start from a non-airport location - Windows compilation fixes. --- src/ATC/atc_mgr.cxx | 122 +++++------ src/ATCDCL/ATCDialog.cxx | 394 ------------------------------------ src/ATCDCL/ATCDialog.hxx | 116 ----------- src/ATCDCL/ATCDialogOld.cxx | 2 +- src/ATCDCL/ATCmgr.cxx | 2 +- src/ATCDCL/CMakeLists.txt | 2 +- src/ATCDCL/Makefile.am | 2 +- 7 files changed, 68 insertions(+), 572 deletions(-) delete mode 100644 src/ATCDCL/ATCDialog.cxx delete mode 100644 src/ATCDCL/ATCDialog.hxx diff --git a/src/ATC/atc_mgr.cxx b/src/ATC/atc_mgr.cxx index 1e1544531..a47aa78fb 100644 --- a/src/ATC/atc_mgr.cxx +++ b/src/ATC/atc_mgr.cxx @@ -89,7 +89,7 @@ void FGATCManager::init() { flight->setCallSign(callsign); trafficRef->assign(flight); - FGAIFlightPlan *fp = new FGAIFlightPlan; + FGAIFlightPlan *fp = 0; ai_ac.setTrafficRef(trafficRef); string flightPlanName = airport + "-" + airport + ".xml"; @@ -99,48 +99,51 @@ void FGATCManager::init() { FGAirport *apt = FGAirport::findByIdent(airport); - FGAirportDynamics* dcs = apt->getDynamics(); - int park_index = dcs->getNrOfParkings() - 1; - cerr << "found information: " << runway << " " << airport << ": parking = " << parking << endl; - if (onGround) { - while (park_index >= 0 && dcs->getParkingName(park_index) != parking) park_index--; - if (park_index < 0) { - SG_LOG( SG_GENERAL, SG_ALERT, - "Failed to find parking position " << parking << - " at airport " << airport ); - } - if (parking.empty() || (park_index < 0)) { - controller = apt->getDynamics()->getTowerController(); - int stationFreq = apt->getDynamics()->getTowerFrequency(2); - cerr << "Setting radio frequency to in airfrequency: " << stationFreq << endl; - fgSetDouble("/instrumentation/comm[0]/frequencies/selected-mhz", ((double) stationFreq / 100.0)); - leg = 4; - string fltType = "ga"; - fp->createTakeOff(&ai_ac, false, apt, 0, fltType); - } else { - controller = apt->getDynamics()->getStartupController(); - int stationFreq = apt->getDynamics()->getGroundFrequency(2); - cerr << "Setting radio frequency to : " << stationFreq << endl; - fgSetDouble("/instrumentation/comm[0]/frequencies/selected-mhz", ((double) stationFreq / 100.0)); - leg = 2; - //double, lat, lon, head; // Unused variables; - //int getId = apt->getDynamics()->getParking(gateId, &lat, &lon, &head); - FGParking* parking = dcs->getParking(park_index); - aircraftRadius = parking->getRadius(); - string fltType = parking->getType(); // gate / ramp, ga, etc etc. - string aircraftType; // Unused. - string airline; // Currently used for gate selection, but a fallback mechanism will apply when not specified. - fp->setGate(park_index); - fp->createPushBack(&ai_ac, - false, - apt, - latitude, - longitude, - aircraftRadius, - fltType, - aircraftType, - airline); - } + if (apt) { + FGAirportDynamics* dcs = apt->getDynamics(); + int park_index = dcs->getNrOfParkings() - 1; + cerr << "found information: " << runway << " " << airport << ": parking = " << parking << endl; + if (onGround) { + fp = new FGAIFlightPlan; + while (park_index >= 0 && dcs->getParkingName(park_index) != parking) park_index--; + if (park_index < 0) { + SG_LOG( SG_GENERAL, SG_ALERT, + "Failed to find parking position " << parking << + " at airport " << airport ); + } + if (parking.empty() || (park_index < 0)) { + controller = apt->getDynamics()->getTowerController(); + int stationFreq = apt->getDynamics()->getTowerFrequency(2); + cerr << "Setting radio frequency to in airfrequency: " << stationFreq << endl; + fgSetDouble("/instrumentation/comm[0]/frequencies/selected-mhz", ((double) stationFreq / 100.0)); + leg = 4; + string fltType = "ga"; + fp->createTakeOff(&ai_ac, false, apt, 0, fltType); + } else { + controller = apt->getDynamics()->getStartupController(); + int stationFreq = apt->getDynamics()->getGroundFrequency(2); + cerr << "Setting radio frequency to : " << stationFreq << endl; + fgSetDouble("/instrumentation/comm[0]/frequencies/selected-mhz", ((double) stationFreq / 100.0)); + leg = 2; + //double, lat, lon, head; // Unused variables; + //int getId = apt->getDynamics()->getParking(gateId, &lat, &lon, &head); + FGParking* parking = dcs->getParking(park_index); + aircraftRadius = parking->getRadius(); + string fltType = parking->getType(); // gate / ramp, ga, etc etc. + string aircraftType; // Unused. + string airline; // Currently used for gate selection, but a fallback mechanism will apply when not specified. + fp->setGate(park_index); + fp->createPushBack(&ai_ac, + false, + apt, + latitude, + longitude, + aircraftRadius, + fltType, + aircraftType, + airline); + } + } } else { controller = 0; } @@ -148,10 +151,11 @@ void FGATCManager::init() { // Create an initial flightplan and assign it to the ai_ac. We won't use this flightplan, but it is necessary to // keep the ATC code happy. - - fp->restart(); - fp->setLeg(leg); - ai_ac.SetFlightPlan(fp); + if (fp) { + fp->restart(); + fp->setLeg(leg); + ai_ac.SetFlightPlan(fp); + } if (controller) { controller->announcePosition(ai_ac.getID(), fp, fp->getCurrentWaypoint()->routeIndex, ai_ac._getLatitude(), ai_ac._getLongitude(), heading, speed, altitude, @@ -178,16 +182,18 @@ void FGATCManager::update ( double time ) { FGAIFlightPlan *fp = ai_ac.GetFlightPlan(); /* test code : find out how the routing develops */ - int size = fp->getNrOfWayPoints(); - //cerr << "Setting pos" << pos << " "; - //cerr << "setting intentions " ; - for (int i = 0; i < size; i++) { - int val = fp->getRouteIndex(i); - //cerr << val << " "; - //if ((val) && (val != pos)) { - //intentions.push_back(val); - //cerr << "[done ] " << endl; - //} + if (fp) { + int size = fp->getNrOfWayPoints(); + //cerr << "Setting pos" << pos << " "; + //cerr << "setting intentions " ; + for (int i = 0; i < size; i++) { + int val = fp->getRouteIndex(i); + //cerr << val << " "; + //if ((val) && (val != pos)) { + //intentions.push_back(val); + //cerr << "[done ] " << endl; + //} + } } //cerr << "[done ] " << endl; double longitude = fgGetDouble("/position/longitude-deg"); @@ -200,8 +206,8 @@ void FGATCManager::update ( double time ) { ai_ac.setAltitude(altitude); ai_ac.setHeading(heading); ai_ac.setSpeed(speed); - ai_ac.update(time); controller = ai_ac.getATCController(); + ai_ac.update(time); currentATCDialog->update(time); if (controller) { diff --git a/src/ATCDCL/ATCDialog.cxx b/src/ATCDCL/ATCDialog.cxx deleted file mode 100644 index 026a65449..000000000 --- a/src/ATCDCL/ATCDialog.cxx +++ /dev/null @@ -1,394 +0,0 @@ -// ATCDialog.cxx - Functions and classes to handle the pop-up ATC dialog -// -// Written by Alexander Kappes and David Luff, started February 2003. -// -// Copyright (C) 2003 Alexander Kappes and David Luff -// -// This program is free software; you can redistribute it and/or -// modify it under the terms of the GNU General Public License as -// published by the Free Software Foundation; either version 2 of the -// License, or (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, but -// WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program; if not, write to the Free Software -// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif - -#include - -#include -#include - -#include
-#include // mkDialog -#include - -#include "ATCDialog.hxx" -#include "ATC.hxx" -#include "ATCmgr.hxx" -#include "ATCutils.hxx" -#include -#include - -#include - -using std::ostringstream; - -FGATCDialog *current_atcdialog; - -// For the command manager - maybe eventually this should go in the built in command list -static bool do_ATC_dialog(const SGPropertyNode* arg) { - cerr << "Running ATCDCL do_ATC_dialog" << endl; - current_atcdialog->PopupDialog(); - return(true); -} - -static bool do_ATC_freq_search(const SGPropertyNode* arg) { - current_atcdialog->FreqDialog(); - return(true); -} - -ATCMenuEntry::ATCMenuEntry() { - stationid = ""; - //stationfr = 0; - transmission = ""; - menuentry = ""; - callback_code = 0; -} - -ATCMenuEntry::~ATCMenuEntry() { -} - -void atcUppercase(string &s) { - for(unsigned int i=0; i... entry matches 'name' -static SGPropertyNode *getNamedNode(SGPropertyNode *prop, const char *name) { - SGPropertyNode* p; - - for (int i = 0; i < prop->nChildren(); i++) - if ((p = getNamedNode(prop->getChild(i), name))) - return p; - - if (!strcmp(prop->getStringValue("name"), name)) - return prop; - - return 0; -} - - -FGATCDialog::FGATCDialog() { - _callbackPending = false; - _callbackTimer = 0.0; - _callbackWait = 0.0; - _callbackPtr = NULL; - _callbackCode = 0; - _gui = (NewGUI *)globals->get_subsystem("gui"); -} - -FGATCDialog::~FGATCDialog() { -} - -void FGATCDialog::Init() { - // Add ATC-dialog to the command list - //globals->get_commands()->addCommand("ATC-dialog", do_ATC_dialog); - // Add ATC-freq-search to the command list - //globals->get_commands()->addCommand("ATC-freq-search", do_ATC_freq_search); - - // initialize properties polled in Update() - //globals->get_props()->setStringValue("/sim/atc/freq-airport", ""); - //globals->get_props()->setIntValue("/sim/atc/transmission-num", -1); -} - -void FGATCDialog::Update(double dt) { - //static SGPropertyNode_ptr airport = globals->get_props()->getNode("/sim/atc/freq-airport", true); - //string s = airport->getStringValue(); - //if (!s.empty()) { - // airport->setStringValue(""); - // FreqDisplay(s); - //} - - //static SGPropertyNode_ptr trans_num = globals->get_props()->getNode("/sim/atc/transmission-num", true); - //int n = trans_num->getIntValue(); - //if (n >= 0) { - // trans_num->setIntValue(-1); - // PopupCallback(n); - //} - - //if(_callbackPending) { - // if(_callbackTimer > _callbackWait) { - // _callbackPtr->ReceiveUserCallback(_callbackCode); - // _callbackPtr->NotifyTransmissionFinished(fgGetString("/sim/user/callsign")); - // _callbackPending = false; - // } else { - // _callbackTimer += dt; - // } - //} -} - -// Add an entry -void FGATCDialog::add_entry(const string& station, const string& transmission, const string& menutext, atc_type type, int code) { - - ATCMenuEntry a; - - a.stationid = station; - a.transmission = transmission; - a.menuentry = menutext; - a.callback_code = code; - - (available_dialog[type])[station.c_str()].push_back(a); - -} - -void FGATCDialog::remove_entry( const string &station, const string &trans, atc_type type ) { - atcmentry_vec_type* p = &((available_dialog[type])[station]); - atcmentry_vec_iterator current = p->begin(); - while(current != p->end()) { - if(current->transmission == trans) current = p->erase(current); - else ++current; - } -} - -void FGATCDialog::remove_entry( const string &station, int code, atc_type type ) { - atcmentry_vec_type* p = &((available_dialog[type])[station]); - atcmentry_vec_iterator current = p->begin(); - while(current != p->end()) { - if(current->callback_code == code) current = p->erase(current); - else ++current; - } -} - -// query the database whether the transmission is already registered; -bool FGATCDialog::trans_reg( const string &station, const string &trans, atc_type type ) { - atcmentry_vec_type* p = &((available_dialog[type])[station]); - atcmentry_vec_iterator current = p->begin(); - for ( ; current != p->end() ; ++current ) { - if ( current->transmission == trans ) return true; - } - return false; -} - -// query the database whether the transmission is already registered; -bool FGATCDialog::trans_reg( const string &station, int code, atc_type type ) { - atcmentry_vec_type* p = &((available_dialog[type])[station]); - atcmentry_vec_iterator current = p->begin(); - for ( ; current != p->end() ; ++current ) { - if ( current->callback_code == code ) return true; - } - return false; -} - -// Display the ATC popup dialog box with options relevant to the users current situation. -void FGATCDialog::PopupDialog() { - const char *dialog_name = "atc-dialog"; - SGPropertyNode_ptr dlg = _gui->getDialogProperties(dialog_name); - if (!dlg) - return; - - _gui->closeDialog(dialog_name); - - SGPropertyNode_ptr button_group = getNamedNode(dlg, "transmission-choice"); - // remove all transmission buttons - button_group->removeChildren("button", false); - - string label; - FGATC* atcptr = globals->get_ATC_mgr()->GetComm1ATCPointer(); // Hardwired to comm1 at the moment - - if (!atcptr) { - label = "Not currently tuned to any ATC service"; - mkDialog(label.c_str()); - return; - } - - if(atcptr->GetType() == ATIS) { - label = "Tuned to ATIS - no communication possible"; - mkDialog(label.c_str()); - return; - } - - atcmentry_vec_type atcmlist = (available_dialog[atcptr->GetType()])[atcptr->get_ident()]; - atcmentry_vec_iterator current = atcmlist.begin(); - atcmentry_vec_iterator last = atcmlist.end(); - - if(!atcmlist.size()) { - label = "No transmission available"; - mkDialog(label.c_str()); - return; - } - - const int bufsize = 32; - char buf[bufsize]; - // loop over all entries in atcmentrylist - for (int n = 0; n < 10; ++n) { - snprintf(buf, bufsize, "/sim/atc/opt[%d]", n); - fgSetBool(buf, false); - - if (current == last) - continue; - - // add transmission button (modified copy of ) - SGPropertyNode *entry = button_group->getNode("button", n, true); - copyProperties(button_group->getNode("button-template", true), entry); - entry->removeChildren("enabled", true); - entry->setStringValue("property", buf); - entry->setIntValue("keynum", '1' + n); - if (n == 0) - entry->setBoolValue("default", true); - - snprintf(buf, bufsize, "%d", n + 1); - string legend = string(buf) + ". " + current->menuentry; - entry->setStringValue("legend", legend.c_str()); - entry->setIntValue("binding/value", n); - current++; - } - - _gui->showDialog(dialog_name); - return; -} - -void FGATCDialog::PopupCallback(int num) { - FGATC* atcptr = globals->get_ATC_mgr()->GetComm1ATCPointer(); // FIXME - Hardwired to comm1 at the moment - - if (!atcptr) - return; - - if (atcptr->GetType() == TOWER) { - //cout << "TOWER " << endl; - //cout << "ident is " << atcptr->get_ident() << endl; - atcmentry_vec_type atcmlist = (available_dialog[TOWER])[atcptr->get_ident()]; - int size = atcmlist.size(); - if(size && num < size) { - //cout << "Doing callback...\n"; - ATCMenuEntry a = atcmlist[num]; - atcptr->SetFreqInUse(); - string pilot = atcptr->GenText(a.transmission, a.callback_code); - fgSetString("/sim/messages/pilot", pilot.c_str()); - // This is the user's speech getting displayed. - _callbackPending = true; - _callbackTimer = 0.0; - _callbackWait = 5.0; - _callbackPtr = atcptr; - _callbackCode = a.callback_code; - } else { - //cout << "No options available...\n"; - } - //cout << "Donded" << endl; - } -} - -class AirportsWithATC : public FGAirport::AirportFilter -{ -public: - virtual FGPositioned::Type maxType() const { - return FGPositioned::SEAPORT; - } - - virtual bool passAirport(FGAirport* aApt) const - { - return (!aApt->commStations().empty()); - } -}; - -void FGATCDialog::FreqDialog() { - const char *dialog_name = "atc-freq-search"; - SGPropertyNode_ptr dlg = _gui->getDialogProperties(dialog_name); - if (!dlg) - return; - - _gui->closeDialog(dialog_name); - - SGPropertyNode_ptr button_group = getNamedNode(dlg, "quick-buttons"); - // remove all dynamic airport/ATC buttons - button_group->removeChildren("button", false); - - - SGGeod geod(SGGeod::fromDegFt(fgGetDouble("/position/longitude-deg"), - fgGetDouble("/position/latitude-deg"), fgGetDouble("/position/altitude-ft"))); - - AirportsWithATC filt; - FGPositioned::List results = FGPositioned::findWithinRange(geod, 50.0, &filt); - FGPositioned::sortByRange(results, geod); - for (unsigned int r=0; (rgetNode("button", r, true); - copyProperties(button_group->getNode("button-template", true), entry); - entry->removeChildren("enabled", true); - entry->setStringValue("legend", results[r]->ident()); - entry->setStringValue("binding[0]/value", results[r]->ident()); - } - - // (un)hide message saying no things in range - SGPropertyNode_ptr range_error = getNamedNode(dlg, "no-atc-in-range"); - range_error->setBoolValue("enabled", !results.empty()); - - _gui->showDialog(dialog_name); -} - -void FGATCDialog::FreqDisplay(string& ident) { - const char *dialog_name = "atc-freq-display"; - SGPropertyNode_ptr dlg = _gui->getDialogProperties(dialog_name); - if (!dlg) - return; - - _gui->closeDialog(dialog_name); - - SGPropertyNode_ptr freq_group = getNamedNode(dlg, "frequency-list"); - // remove all frequency entries - freq_group->removeChildren("group", false); - - atcUppercase(ident); - string label; - - const FGAirport *a = fgFindAirportID(ident); - if (!a) { - label = "Airport " + ident + " not found in database."; - mkDialog(label.c_str()); - return; - } - - // set title - label = ident + " Frequencies"; - dlg->setStringValue("text/label", label.c_str()); - - const flightgear::CommStationList& comms(a->commStations()); - if (comms.empty()) { - label = "No frequencies found for airport " + ident; - mkDialog(label.c_str()); - return; - } - - int n = 0; - for (unsigned int c=0; c < comms.size(); ++c) { - flightgear::CommStation* comm = comms[c]; - - // add frequency line (modified copy of ) - SGPropertyNode *entry = freq_group->getNode("group", n, true); - copyProperties(freq_group->getNode("group-template", true), entry); - entry->removeChildren("enabled", true); - - entry->setStringValue("text[0]/label", comm->ident()); - - char buf[8]; - snprintf(buf, 8, "%.2f", comm->freqMHz()); - if(buf[5] == '3') buf[5] = '2'; - if(buf[5] == '8') buf[5] = '7'; - buf[7] = '\0'; - - entry->setStringValue("text[1]/label", buf); - ++n; - } - - _gui->showDialog(dialog_name); -} - diff --git a/src/ATCDCL/ATCDialog.hxx b/src/ATCDCL/ATCDialog.hxx deleted file mode 100644 index b60fa599a..000000000 --- a/src/ATCDCL/ATCDialog.hxx +++ /dev/null @@ -1,116 +0,0 @@ -// ATCDialog.hxx - Functions and classes to handle the pop-up ATC dialog -// -// Written by Alexander Kappes and David Luff, started February 2003. -// -// Copyright (C) 2003 Alexander Kappes and David Luff -// -// This program is free software; you can redistribute it and/or -// modify it under the terms of the GNU General Public License as -// published by the Free Software Foundation; either version 2 of the -// License, or (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, but -// WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program; if not, write to the Free Software -// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - -#ifndef ATC_DIALOG_HXX -#define ATC_DIALOG_HXX - -#include - -#include -#include - -#include "ATC.hxx" - -using std::vector; -using std::map; - -class NewGUI; - -// ATCMenuEntry - an encapsulation of an entry in the ATC dialog -struct ATCMenuEntry { - - string stationid; // ID of transmitting station - //int stationfr; // ? - string transmission; // Actual speech of transmission - string menuentry; // Shortened version for display in the dialog - int callback_code; // This code is supplied by the registering station, and then - // returned to the registering station if that option is chosen. - // The actual value is only understood by the registering station - - // FGATCDialog only stores it and returns it if appropriate. - - ATCMenuEntry(); - ~ATCMenuEntry(); -}; - -typedef vector < ATCMenuEntry > atcmentry_vec_type; -typedef atcmentry_vec_type::iterator atcmentry_vec_iterator; - -typedef map < string, atcmentry_vec_type > atcmentry_map_type; -typedef atcmentry_map_type::iterator atcmentry_map_iterator; - -void atcUppercase(string &s); - -//void ATCDialogInit(); -//void ATCDoDialog(atc_type type); - -class FGATCDialog { - -public: - - FGATCDialog(); - ~FGATCDialog(); - - void Init(); - - void Update(double dt); - - void PopupDialog(); - - void PopupCallback(int); - - void add_entry( const string& station, const string& transmission, const string& menutext, atc_type type, int code); - - void remove_entry( const string &station, const string &trans, atc_type type ); - - void remove_entry( const string &station, int code, atc_type type ); - - // query the database whether the transmission is already registered; - bool trans_reg( const string &station, const string &trans, atc_type type ); - - // query the database whether the transmission is already registered; - bool trans_reg( const string &station, int code, atc_type type ); - - // Display a frequency search dialog for nearby stations - void FreqDialog(); - - // Display the comm ATC frequencies for airport ident - // where ident is a valid ICAO code. - void FreqDisplay(string& ident); - -private: - - atcmentry_map_type available_dialog[ATC_NUM_TYPES]; - - int freq; - bool reset; - - bool _callbackPending; - double _callbackTimer; - double _callbackWait; - FGATC* _callbackPtr; - int _callbackCode; - - NewGUI *_gui; -}; - -extern FGATCDialog *current_atcdialog; - -#endif // ATC_DIALOG_HXX - diff --git a/src/ATCDCL/ATCDialogOld.cxx b/src/ATCDCL/ATCDialogOld.cxx index 026a65449..9f1a53077 100644 --- a/src/ATCDCL/ATCDialogOld.cxx +++ b/src/ATCDCL/ATCDialogOld.cxx @@ -31,7 +31,7 @@ #include // mkDialog #include -#include "ATCDialog.hxx" +#include "ATCDialogOld.hxx" #include "ATC.hxx" #include "ATCmgr.hxx" #include "ATCutils.hxx" diff --git a/src/ATCDCL/ATCmgr.cxx b/src/ATCDCL/ATCmgr.cxx index 0b93d6a20..7a3da5969 100644 --- a/src/ATCDCL/ATCmgr.cxx +++ b/src/ATCDCL/ATCmgr.cxx @@ -31,7 +31,7 @@ #include
#include "ATCmgr.hxx" -#include "ATCDialog.hxx" +#include "ATCDialogOld.hxx" #include "ATCutils.hxx" #include "atis.hxx" diff --git a/src/ATCDCL/CMakeLists.txt b/src/ATCDCL/CMakeLists.txt index d9e8db69b..d0dde266a 100644 --- a/src/ATCDCL/CMakeLists.txt +++ b/src/ATCDCL/CMakeLists.txt @@ -3,7 +3,7 @@ include(FlightGearComponent) set(SOURCES ATC.cxx atis.cxx - ATCDialog.cxx + ATCDialogOld.cxx ATCVoice.cxx ATCmgr.cxx ATCutils.cxx diff --git a/src/ATCDCL/Makefile.am b/src/ATCDCL/Makefile.am index 8c2a2b74b..f5e9479fa 100644 --- a/src/ATCDCL/Makefile.am +++ b/src/ATCDCL/Makefile.am @@ -3,7 +3,7 @@ noinst_LIBRARIES = libATCDCL.a libATCDCL_a_SOURCES = \ ATC.hxx ATC.cxx \ atis.hxx atis.cxx \ - ATCDialog.hxx ATCDialog.cxx \ + ATCDialogOld.hxx ATCDialogOld.cxx \ ATCVoice.hxx ATCVoice.cxx \ ATCmgr.hxx ATCmgr.cxx \ ATCutils.hxx ATCutils.cxx \ -- 2.39.5