commradio: improvements for atis speech

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

diff --git a/src/Navaids/navlist.hxx b/src/Navaids/navlist.hxx
index e33697406b6d204cd24cc70e9fa189c25258c541..c10b7e3b7d865079c5225436bdffe75073a8da2d 100644 (file)
--- a/src/Navaids/navlist.hxx
+++ b/src/Navaids/navlist.hxx
@@ -49,18 +49,19 @@ public:
   class TypeFilter : public FGPositioned::Filter
   {
   public:
-    TypeFilter(const FGPositioned::Type type);
+    TypeFilter( const FGPositioned::Type type = FGPositioned::INVALID );
+    TypeFilter( const FGPositioned::Type minType,
+                const FGPositioned::Type maxType );
     
-    TypeFilter(const FGPositioned::Type minType,
-               const FGPositioned::Type maxType);
-    
-    virtual FGPositioned::Type minType() const {
-      return _mintype;
-    }
+    /**
+     * Construct from string containing type
+     *
+     * @param type One of "fix"|"vor"|"ndb"|"ils"|"dme"|"tacan"|"any"
+     */
+    bool fromTypeString(const std::string& type);
     
-    virtual FGPositioned::Type maxType()  const {
-      return _maxtype;
-    }
+    virtual FGPositioned::Type minType() const { return _mintype; }
+    virtual FGPositioned::Type maxType() const { return _maxtype; }
     
   protected:
     FGPositioned::Type _mintype;
@@ -85,13 +86,13 @@ public:
   static TypeFilter* tacanFilter();
   
   
-  static TypeFilter* carrierFilter();
+  static TypeFilter* mobileTacanFilter();
   
     /** Query the database for the specified station.  It is assumed
       * that there will be multiple stations with matching frequencies
       * so a position must be specified.
       */
-    static FGNavRecord *findByFreq( double freq, const SGGeod& position,
+    static FGNavRecordRef findByFreq( double freq, const SGGeod& position,
                                    TypeFilter* filter = NULL);
 
     /**
@@ -99,7 +100,7 @@ public:
      * mobile TACANs which have no valid position. The first match is
      * returned only.
      */
-    static FGNavRecord *findByFreq( double freq, TypeFilter* filter = NULL);
+    static FGNavRecordRef findByFreq( double freq, TypeFilter* filter = NULL);
   
     static nav_list_type findAllByFreq( double freq, const SGGeod& position,
                                        TypeFilter* filter = NULL);