One more std::string fixup.

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

diff --git a/src/Main/fg_io.cxx b/src/Main/fg_io.cxx
index 5c1628dba59fcdd5660c152c256a6b4ef2c692a0..36ca64433d3f6dc923acdfcdaa59374ea88856d7 100644 (file)
--- a/src/Main/fg_io.cxx
+++ b/src/Main/fg_io.cxx
@@ -26,9 +26,9 @@
 
 #include <simgear/compiler.h>
 
-#include <stdlib.h>             // atoi()
+#include <cstdlib>             // atoi()
 
-#include STL_STRING
+#include <string>
 
 #include <simgear/debug/logstream.hxx>
 #include <simgear/io/iochannel.hxx>
@@ -43,6 +43,8 @@
 #include <Network/protocol.hxx>
 #include <Network/ATC-Main.hxx>
 #include <Network/atlas.hxx>
+#include <Network/AV400.hxx>
+#include <Network/AV400Sim.hxx>
 #include <Network/garmin.hxx>
 #include <Network/httpd.hxx>
 #ifdef FG_JPEG_SERVER
@@ -66,15 +68,16 @@
 #include "globals.hxx"
 #include "fg_io.hxx"
 
-SG_USING_STD(string);
+using std::atoi;
+using std::string;
 
 
 FGIO::FGIO()
 {
 }
 
-#include STL_ALGORITHM
-SG_USING_STD(for_each);
+#include <algorithm>
+using std::for_each;
 
 static void delete_ptr( FGProtocol* p ) { delete p; }
 
@@ -113,6 +116,7 @@ FGIO::parse_port_config( const string& config )
                 SG_LOG( SG_IO, SG_ALERT, "Usage: --atcsim=[no-]pedals,"
                         << "input0_config,input1_config,"
                         << "output0_config,output1_config,file.nas" );
+               delete atcsim;
                 return NULL;
             }
             if ( tokens[1] == "no-pedals" ) {
@@ -130,6 +134,12 @@ FGIO::parse_port_config( const string& config )
            // printf("Parsed opengc\n"); cin >> wait;
            FGOpenGC *opengc = new FGOpenGC;
            io = opengc;
+       } else if ( protocol == "AV400" ) {
+           FGAV400 *av400 = new FGAV400;
+           io = av400;
+       } else if ( protocol == "AV400Sim" ) {
+           FGAV400Sim *av400sim = new FGAV400Sim;
+           io = av400sim;
        } else if ( protocol == "garmin" ) {
            FGGarmin *garmin = new FGGarmin;
            io = garmin;
@@ -177,13 +187,28 @@ FGIO::parse_port_config( const string& config )
            FGRUL *rul = new FGRUL;
            io = rul;
         } else if ( protocol == "generic" ) {
-            int n = 6;
-            if (tokens[1] == "socket")  n++;
-            else if (tokens[1] == "file") n--;
-            FGGeneric *generic = new FGGeneric( tokens[n] );
+            size_t configToken;
+            if (tokens[1] == "socket") {
+                configToken = 7;
+            } else if (tokens[1] == "file") {
+                configToken = 5;
+            } else {
+                configToken = 6;
+            }
+
+            if (configToken >= tokens.size()) {
+                SG_LOG( SG_IO, SG_ALERT, "Not enough tokens passed for the generic protocol.");
+                return NULL;
+            }
+
+            FGGeneric *generic = new FGGeneric( tokens );
             io = generic;
-       } else if ( protocol == "multiplay" ) {\
-           //Determine dir, rate, host & port
+       } else if ( protocol == "multiplay" ) {
+           if ( tokens.size() != 5 ) {
+               SG_LOG( SG_IO, SG_ALERT, "Ignoring invalid --multiplay option "
+                       "(4 arguments expected: --multiplay=dir,hz,hostname,port)" );
+               return NULL;
+           }
            string dir = tokens[1];
            string rate = tokens[2];
            string host = tokens[3];
@@ -229,6 +254,7 @@ 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 );
     } else if ( medium == "file" ) {
@@ -240,8 +266,18 @@ FGIO::parse_port_config( const string& config )
          
        string file = tokens[4];
        SG_LOG( SG_IO, SG_INFO, "  file name = " << file );
-
-       SGFile *ch = new SGFile( file );
+        int repeat = 1;
+        if (tokens.size() >= 7 && tokens[6] == "repeat") {
+            if (tokens.size() >= 8) {
+                repeat = atoi(tokens[7].c_str());
+                FGGeneric* generic = dynamic_cast<FGGeneric*>(io);
+                if (generic)
+                    generic->setExitOnError(true);
+            } else {
+                repeat = -1;
+            }
+        }
+       SGFile *ch = new SGFile( file, repeat );
        io->set_io_channel( ch );
     } else if ( medium == "socket" ) {
         if ( tokens.size() < 6) {
@@ -298,6 +334,11 @@ FGIO::init()
     }
 }
 
+void
+FGIO::reinit()
+{
+}
+
 
 // process any IO channel work
 void