Merge branch 'jt/runway' into next

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

diff --git a/src/Main/fg_io.cxx b/src/Main/fg_io.cxx
index 134087885203e16ab1a6ff840a5394811d632932..2ca273f1de2f10de551f747ed98fb5f1747ae028 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>
@@ -67,15 +67,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; }
 
@@ -182,13 +183,21 @@ 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] );
+            int configToken;
+            if (tokens[1] == "socket")
+                configToken = 7;
+            else if (tokens[1] == "file")
+                configToken = 5;
+            else
+                configToken = 6;
+            FGGeneric *generic = new FGGeneric( tokens[configToken] );
             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];
@@ -234,6 +243,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" ) {
@@ -245,8 +255,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) {