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

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

diff --git a/src/ATC/commlist.hxx b/src/ATC/commlist.hxx
index 74ee43a4350c2cbc783bd432d92036b1f429548d..73c17e72d3669a0e68f30086db3a070876aa2b65 100644 (file)
--- a/src/ATC/commlist.hxx
+++ b/src/ATC/commlist.hxx
@@ -3,7 +3,7 @@
 // Written by David Luff and Alexander Kappes, started Jan 2003.
 // Based on navlist.hxx by Curtis Olson, started April 2000.
 //
-// Copyright (C) 2000  Curtis L. Olson - curt@flightgear.org
+// Copyright (C) 2000  Curtis L. Olson - http://www.flightgear.org/~curt
 //
 // This program is free software; you can redistribute it and/or
 // modify it under the terms of the GNU General Public License as
@@ -44,6 +44,7 @@
 #include "ATC.hxx"
 #include "atis.hxx"
 
+SG_USING_STD(list);
 SG_USING_STD(map);
 SG_USING_STD(vector);
 SG_USING_STD(string);
@@ -67,7 +68,7 @@ public:
     ~FGCommList();
 
     // load all comm frequencies and build the map
-    bool init( SGPath path );
+    bool init( const SGPath& path );
 
     // query the database for the specified frequency, lon and lat are
     // in degrees, elev is in meters.
@@ -77,9 +78,9 @@ public:
        // The data found is written into the passed-in ATCData structure.
     bool FindByFreq( double lon, double lat, double elev, double freq, ATCData* ad, atc_type tp = INVALID );
        
-    // query the database by location, lon and lat are
-    // in degrees, elev is in meters, range is in nautical miles.
-       // Returns the number of stations of the specified type that are in range, and pushes them into stations
+    // query the database by location, lon and lat are in degrees, elev is in meters, range is in nautical miles.
+       // Returns the number of stations of the specified atc_type tp that are in range of the position defined by 
+       // lon, lat and elev, and pushes them into stations.
        // If no atc_type is specifed, returns the number of all stations in range, and pushes them into stations
        // ** stations is erased before use **
     int FindByPos( double lon, double lat, double elev, double range, comm_list_type* stations, atc_type tp = INVALID );
@@ -96,11 +97,11 @@ public:
        double FindClosest( double lon, double lat, double elev, ATCData& ad, atc_type tp = INVALID, double max_range = 100.0 );
        
        // Find by Airport code.
-       bool FindByCode( string ICAO, ATCData& ad, atc_type tp = INVALID );
+       bool FindByCode( const string& ICAO, ATCData& ad, atc_type tp = INVALID );
 
     // Return the callsign for an ATIS transmission given transmission time and airport id
        // This maybe should get moved somewhere else!!
-    int GetCallSign( string apt_id, int hours, int mins );
+    int GetCallSign( const string& apt_id, int hours, int mins );
        
 private:
        
@@ -111,7 +112,7 @@ private:
        comm_map_type commlist_bck;
 
        // Load comms from a specified path (which must include the filename)   
-       bool LoadComms(SGPath path);
+       bool LoadComms(const SGPath& path);
 
 //----------- This stuff is left over from atislist.[ch]xx and maybe should move somewhere else
        // Add structure and map for storing a log of atis transmissions