commradio: improvements for atis speech

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

diff --git a/src/Navaids/markerbeacon.hxx b/src/Navaids/markerbeacon.hxx
index 198959c5970a363b29777f3cc4303c9400aaa6c9..23c88a0de1eaea1007f85d6e8e18af2a9f350ba3 100644 (file)
--- a/src/Navaids/markerbeacon.hxx
+++ b/src/Navaids/markerbeacon.hxx
@@ -27,24 +27,18 @@
 #include <simgear/compiler.h>
 
 #include "positioned.hxx"
+#include <Airports/airports_fwd.hxx>
 
-// forward decls
-class FGRunway;
-
-class FGMarkerBeacon : public FGPositioned
+class FGMarkerBeaconRecord : public FGPositioned
 {
 public:
-  static FGMarkerBeacon* create(int aTy, const std::string& aName, const SGGeod& aPos);
 
+  FGMarkerBeaconRecord(PositionedID aGuid, Type aTy, PositionedID aRunway, const SGGeod& aPos);
+    
+    FGRunwayRef runway() const;
 private:
-  FGMarkerBeacon(Type aTy, FGRunway* aRunway, const SGGeod& aPos);
-  
-  FGRunway* _runway; // should this be ref-ptr?
   
-  /**
-   * Helper to map a 'Robin' integer type to an FGPositioned::Type
-   */
-  static Type mapType(int aTy);
+  PositionedID _runway;
 };
 
 #endif // _FG_MARKERBEACON_HXX