Oops fixed one small mistake from the last fix.

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

diff --git a/src/Main/fg_io.cxx b/src/Main/fg_io.cxx
index 4a75a78fb0ba65413981c8a4d0d08cad734f2fcc..5e22ce66a59f3fa15c29545cbf7dc242b53a2b4a 100644 (file)
--- a/src/Main/fg_io.cxx
+++ b/src/Main/fg_io.cxx
@@ -23,6 +23,8 @@
 
 #include <simgear/compiler.h>
 
+#include <stdlib.h>             // atoi()
+
 #include STL_STRING
 
 #include <simgear/debug/logstream.hxx>
@@ -30,14 +32,23 @@
 #include <simgear/io/sg_file.hxx>
 #include <simgear/io/sg_serial.hxx>
 #include <simgear/io/sg_socket.hxx>
+#include <simgear/io/sg_socket_udp.hxx>
 #include <simgear/math/sg_types.hxx>
 #include <simgear/timing/timestamp.hxx>
 
 #include <Network/protocol.hxx>
+#include <Network/atc610x.hxx>
 #include <Network/atlas.hxx>
 #include <Network/garmin.hxx>
+#include <Network/httpd.hxx>
+#ifdef FG_JPEG_SERVER
+#  include <Network/jpg-httpd.hxx>
+#endif
 #include <Network/joyclient.hxx>
 #include <Network/native.hxx>
+#include <Network/native_ctrls.hxx>
+#include <Network/native_fdm.hxx>
+#include <Network/opengc.hxx>
 #include <Network/nmea.hxx>
 #include <Network/props.hxx>
 #include <Network/pve.hxx>
@@ -56,6 +67,8 @@ io_container global_io_list;
 // configure a port based on the config string
 static FGProtocol *parse_port_config( const string& config )
 {
+    bool short_circuit = false;
+
     string::size_type begin, end;
 
     begin = 0;
@@ -73,18 +86,48 @@ static FGProtocol *parse_port_config( const string& config )
     SG_LOG( SG_IO, SG_INFO, "  protocol = " << protocol );
 
     FGProtocol *io;
-    if ( protocol == "atlas" ) {
+    if ( protocol == "atc610x" ) {
+       FGATC610x *atc610x = new FGATC610x;
+       io = atc610x;
+        short_circuit = true;
+       cout << "here ..." << endl;
+    } else if ( protocol == "atlas" ) {
        FGAtlas *atlas = new FGAtlas;
        io = atlas;
+    } else if ( protocol == "opengc" ) {
+       // char wait;
+       // printf("Parsed opengc\n"); cin >> wait;
+       FGOpenGC *opengc = new FGOpenGC;
+       io = opengc;
     } else if ( protocol == "garmin" ) {
        FGGarmin *garmin = new FGGarmin;
        io = garmin;
+    } else if ( protocol == "httpd" ) {
+        // determine port
+        string port = config.substr(begin);
+       FGHttpd *httpd = new FGHttpd( atoi(port.c_str()) );
+       io = httpd;
+        short_circuit = true;
+#ifdef FG_JPEG_SERVER
+    } else if ( protocol == "jpg-httpd" ) {
+        // determine port
+        string port = config.substr(begin);
+       FGJpegHttpd *jpeg_httpd = new FGJpegHttpd( atoi(port.c_str()) );
+       io = jpeg_httpd;
+        short_circuit = true;
+#endif
     } else if ( protocol == "joyclient" ) {
        FGJoyClient *joyclient = new FGJoyClient;
        io = joyclient;
     } else if ( protocol == "native" ) {
        FGNative *native = new FGNative;
        io = native;
+    } else if ( protocol == "native_ctrls" ) {
+       FGNativeCtrls *native_ctrls = new FGNativeCtrls;
+       io = native_ctrls;
+    } else if ( protocol == "native_fdm" ) {
+       FGNativeFDM *native_fdm = new FGNativeFDM;
+       io = native_fdm;
     } else if ( protocol == "nmea" ) {
        FGNMEA *nmea = new FGNMEA;
        io = nmea;
@@ -104,90 +147,92 @@ static FGProtocol *parse_port_config( const string& config )
        return NULL;
     }
 
-    // determine medium
-    end = config.find(",", begin);
-    if ( end == string::npos ) {
-       return NULL;            // dummy
-    }
+    if ( ! short_circuit ) {
+        // determine medium
+        end = config.find(",", begin);
+        if ( end == string::npos ) {
+            return NULL;               // dummy
+        }
     
-    string medium = config.substr(begin, end - begin);
-    begin = end + 1;
-    SG_LOG( SG_IO, SG_INFO, "  medium = " << medium );
-
-    // determine direction
-    end = config.find(",", begin);
-    if ( end == string::npos ) {
-       return NULL;            // dummy
-    }
+        string medium = config.substr(begin, end - begin);
+        begin = end + 1;
+        SG_LOG( SG_IO, SG_INFO, "  medium = " << medium );
+
+        // determine direction
+        end = config.find(",", begin);
+        if ( end == string::npos ) {
+            return NULL;               // dummy
+        }
     
-    string direction = config.substr(begin, end - begin);
-    begin = end + 1;
-    io->set_direction( direction );
-    SG_LOG( SG_IO, SG_INFO, "  direction = " << direction );
-
-    // determine hertz
-    end = config.find(",", begin);
-    if ( end == string::npos ) {
-       return NULL;            // dummy
-    }
+        string direction = config.substr(begin, end - begin);
+        begin = end + 1;
+        io->set_direction( direction );
+        SG_LOG( SG_IO, SG_INFO, "  direction = " << direction );
+
+        // determine hertz
+        end = config.find(",", begin);
+        if ( end == string::npos ) {
+            return NULL;               // dummy
+        }
     
-    string hertz_str = config.substr(begin, end - begin);
-    begin = end + 1;
-    double hertz = atof( hertz_str.c_str() );
-    io->set_hz( hertz );
-    SG_LOG( SG_IO, SG_INFO, "  hertz = " << hertz );
-
-    if ( medium == "serial" ) {
-       // device name
-       end = config.find(",", begin);
-       if ( end == string::npos ) {
-           return NULL;
-       }
+        string hertz_str = config.substr(begin, end - begin);
+        begin = end + 1;
+        double hertz = atof( hertz_str.c_str() );
+        io->set_hz( hertz );
+        SG_LOG( SG_IO, SG_INFO, "  hertz = " << hertz );
+
+        if ( medium == "serial" ) {
+            // device name
+            end = config.find(",", begin);
+            if ( end == string::npos ) {
+                return NULL;
+            }
     
-       string device = config.substr(begin, end - begin);
-       begin = end + 1;
-       SG_LOG( SG_IO, SG_INFO, "  device = " << device );
-
-       // baud
-       string baud = config.substr(begin);
-       SG_LOG( SG_IO, SG_INFO, "  baud = " << baud );
-
-       SGSerial *ch = new SGSerial( device, baud );
-       io->set_io_channel( ch );
-    } else if ( medium == "file" ) {
-       // file name
-       string file = config.substr(begin);
-       SG_LOG( SG_IO, SG_INFO, "  file name = " << file );
-
-       SGFile *ch = new SGFile( file );
-       io->set_io_channel( ch );
-    } else if ( medium == "socket" ) {
-       // hostname
-       end = config.find(",", begin);
-       if ( end == string::npos ) {
-           return NULL;
-       }
+            string device = config.substr(begin, end - begin);
+            begin = end + 1;
+            SG_LOG( SG_IO, SG_INFO, "  device = " << device );
+
+            // baud
+            string baud = config.substr(begin);
+            SG_LOG( SG_IO, SG_INFO, "  baud = " << baud );
+
+            SGSerial *ch = new SGSerial( device, baud );
+            io->set_io_channel( ch );
+        } else if ( medium == "file" ) {
+            // file name
+            string file = config.substr(begin);
+            SG_LOG( SG_IO, SG_INFO, "  file name = " << file );
+
+            SGFile *ch = new SGFile( file );
+            io->set_io_channel( ch );
+        } else if ( medium == "socket" ) {
+            // hostname
+            end = config.find(",", begin);
+            if ( end == string::npos ) {
+                return NULL;
+            }
     
-       string hostname = config.substr(begin, end - begin);
-       begin = end + 1;
-       SG_LOG( SG_IO, SG_INFO, "  hostname = " << hostname );
-
-       // port string
-       end = config.find(",", begin);
-       if ( end == string::npos ) {
-           return NULL;
-       }
+            string hostname = config.substr(begin, end - begin);
+            begin = end + 1;
+            SG_LOG( SG_IO, SG_INFO, "  hostname = " << hostname );
+
+            // port string
+            end = config.find(",", begin);
+            if ( end == string::npos ) {
+                return NULL;
+            }
     
-       string port = config.substr(begin, end - begin);
-       begin = end + 1;
-       SG_LOG( SG_IO, SG_INFO, "  port string = " << port );
-
-       // socket style
-       string style_str = config.substr(begin);
-       SG_LOG( SG_IO, SG_INFO, "  style string = " << style_str );
-       
-       SGSocket *ch = new SGSocket( hostname, port, style_str );
-       io->set_io_channel( ch );
+            string port = config.substr(begin, end - begin);
+            begin = end + 1;
+            SG_LOG( SG_IO, SG_INFO, "  port string = " << port );
+
+            // socket style
+            string style_str = config.substr(begin);
+            SG_LOG( SG_IO, SG_INFO, "  style string = " << style_str );
+            
+            SGSocket *ch = new SGSocket( hostname, port, style_str );
+            io->set_io_channel( ch );
+        }
     }
 
     return io;