commradio: improvements for atis speech

[flightgear.git] / src / Navaids / FlightPlan.hxx

diff --git a/src/Navaids/FlightPlan.hxx b/src/Navaids/FlightPlan.hxx
index 84944069aa0202ae6a7e04ea2034b5e3133e92c6..11d98643d201a85c42234823b0b6b35d865248e8 100644 (file)
--- a/src/Navaids/FlightPlan.hxx
+++ b/src/Navaids/FlightPlan.hxx
@@ -25,15 +25,16 @@
 #define FG_FLIGHTPLAN_HXX
 
 #include <Navaids/route.hxx>
-#include <Airports/simple.hxx>
+#include <Airports/airport.hxx>
 
-typedef SGSharedPtr<FGAirport> FGAirportRef;
-    
 namespace flightgear
 {
 
 class Transition;
-
+class FlightPlan;
+    
+typedef SGSharedPtr<FlightPlan> FlightPlanRef;
+    
 class FlightPlan : public RouteBase
 {
 public:
@@ -106,7 +107,7 @@ public:
     virtual void waypointsChanged() { }
     virtual void cleared() { }
     virtual void currentWaypointChanged() { }
-  
+    virtual void endOfFlightPlan() { }
   protected:
     Delegate();
     
@@ -118,6 +119,7 @@ public:
     void runWaypointsChanged();
     void runCurrentWaypointChanged();
     void runCleared();
+    void runFinished();
       
     friend class FlightPlan;
     
@@ -137,6 +139,8 @@ public:
   
   void setCurrentIndex(int index);
   
+  void finish();
+    
   Leg* currentLeg() const;
   Leg* nextLeg() const;
   Leg* previousLeg() const;
@@ -241,7 +245,9 @@ private:
     _waypointsChanged, 
     _currentWaypointChanged;
   
-  bool loadPlainTextRoute(const SGPath& path);
+  bool loadXmlFormat(const SGPath& path);
+  bool loadGpxFormat(const SGPath& path);
+  bool loadPlainTextFormat(const SGPath& path);
   
   void loadVersion1XMLRoute(SGPropertyNode_ptr routeData);
   void loadVersion2XMLRoute(SGPropertyNode_ptr routeData);