Catch sound exceptions at the earliest, report problem has an alert, and continue...

[flightgear.git] / src / ATC / ATCDialog.hxx

diff --git a/src/ATC/ATCDialog.hxx b/src/ATC/ATCDialog.hxx
index d5295c8a3d68ba4056207ab39a54b09fe6453794..f37edf17a21d0c7ca55a6bbef612f6148686f53b 100644 (file)
--- a/src/ATC/ATCDialog.hxx
+++ b/src/ATC/ATCDialog.hxx
@@ -25,6 +25,8 @@
 
 #include "ATC.hxx"
 
+class NewGUI;
+
 // ATCMenuEntry - an encapsulation of an entry in the ATC dialog
 struct ATCMenuEntry {
 
@@ -60,16 +62,22 @@ public:
        
        void Init();
        
+       void Update(double dt);
+       
        void PopupDialog();
        
-       void add_entry( string station, string transmission, string menutext, atc_type type, int code);
+       void PopupCallback(int);
        
-       void remove_entry( const string &station, const string &trans, atc_type type );
+       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
@@ -77,7 +85,7 @@ public:
        
        // Display the comm ATC frequencies for airport ident
        // where ident is a valid ICAO code.
-       void FreqDisplay(string ident);
+       void FreqDisplay(string& ident);
 
 private:
 
@@ -86,6 +94,13 @@ private:
        int  freq;
        bool reset;
        
+       bool _callbackPending;
+       double _callbackTimer;
+       double _callbackWait;
+       FGATC* _callbackPtr;
+       int _callbackCode;
+
+       NewGUI *_gui;
 };
        
 extern FGATCDialog *current_atcdialog;