Fix yet another subtle resize problem I introduced, which upset PUI. This code is...

[flightgear.git] / src / Main / fg_io.cxx

diff --git a/src/Main/fg_io.cxx b/src/Main/fg_io.cxx
index 75ec5c97830f8b3ac125267d7ed5477087dd3b6b..6d6be65f50c4724d635ace9520a15da23d7ddd29 100644 (file)
--- a/src/Main/fg_io.cxx
+++ b/src/Main/fg_io.cxx
@@ -46,6 +46,7 @@
 #include <Network/atlas.hxx>
 #include <Network/AV400.hxx>
 #include <Network/AV400Sim.hxx>
+#include <Network/AV400WSim.hxx>
 #include <Network/garmin.hxx>
 #include <Network/httpd.hxx>
 #ifdef FG_JPEG_SERVER
@@ -65,6 +66,9 @@
 #include <Network/rul.hxx>
 #include <Network/generic.hxx>
 #include <Network/multiplay.hxx>
+#ifdef FG_HAVE_HLA
+#include <Network/HLA/hla.hxx>
+#endif
 
 #include "globals.hxx"
 #include "fg_io.hxx"
@@ -139,7 +143,13 @@ FGIO::parse_port_config( const string& config )
        } else if ( protocol == "AV400Sim" ) {
            FGAV400Sim *av400sim = new FGAV400Sim;
            io = av400sim;
-       } else if ( protocol == "garmin" ) {
+        } else if ( protocol == "AV400WSimA" ) {
+            FGAV400WSimA *av400wsima = new FGAV400WSimA;
+            io = av400wsima;
+        } else if ( protocol == "AV400WSimB" ) {
+            FGAV400WSimB *av400wsimb = new FGAV400WSimB;
+            io = av400wsimb;
+       } else if ( protocol == "garmin" ) {
            FGGarmin *garmin = new FGGarmin;
            io = garmin;
        } else if ( protocol == "httpd" ) {
@@ -213,6 +223,10 @@ FGIO::parse_port_config( const string& config )
            string host = tokens[3];
            string port = tokens[4];
            return new FGMultiplay(dir, atoi(rate.c_str()), host, atoi(port.c_str()));
+#ifdef FG_HAVE_HLA
+       } else if ( protocol == "hla" ) {
+           return new FGHLA(tokens);
+#endif
        } else {
            return NULL;
        }
@@ -223,7 +237,7 @@ FGIO::parse_port_config( const string& config )
        delete io;
        return 0;
     }
-    
+
     if (tokens.size() < 3) {
       SG_LOG( SG_IO, SG_ALERT, "Incompatible number of network arguments.");
       return NULL;
@@ -253,16 +267,27 @@ FGIO::parse_port_config( const string& config )
        string baud = tokens[5];
        SG_LOG( SG_IO, SG_INFO, "  baud = " << baud );
 
-        
+
        SGSerial *ch = new SGSerial( device, baud );
        io->set_io_channel( ch );
+        
+        if ( protocol == "AV400WSimB" ) {
+            if ( tokens.size() < 7 ) {
+                SG_LOG( SG_IO, SG_ALERT, "Missing second hz for AV400WSimB.");
+                return NULL;
+            }
+            FGAV400WSimB *fgavb = static_cast<FGAV400WSimB*>(io);
+            string hz2_str = tokens[6];
+            double hz2 = atof(hz2_str.c_str());
+            fgavb->set_hz2(hz2);
+        }
     } else if ( medium == "file" ) {
        // file name
         if ( tokens.size() < 4) {
           SG_LOG( SG_IO, SG_ALERT, "Incompatible number of arguments for file I/O.");
          return NULL;
         }
-         
+
        string file = tokens[4];
        SG_LOG( SG_IO, SG_INFO, "  file name = " << file );
         int repeat = 1;