Added support for managing fov via the property manager so the --fov= option

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

diff --git a/src/Main/fg_io.cxx b/src/Main/fg_io.cxx
index b3304d651bbbce61f1edb333a1bfafc3bdea8c2c..2a7afcfbe7dda2e61e5d508aa9937a75af76ee27 100644 (file)
--- a/src/Main/fg_io.cxx
+++ b/src/Main/fg_io.cxx
@@ -31,20 +31,20 @@
 #include <simgear/io/sg_serial.hxx>
 #include <simgear/io/sg_socket.hxx>
 #include <simgear/math/sg_types.hxx>
-
-#include <Main/options.hxx>
+#include <simgear/timing/timestamp.hxx>
 
 #include <Network/protocol.hxx>
-#include <Network/native.hxx>
+#include <Network/atlas.hxx>
 #include <Network/garmin.hxx>
+#include <Network/joyclient.hxx>
+#include <Network/native.hxx>
 #include <Network/nmea.hxx>
 #include <Network/props.hxx>
 #include <Network/pve.hxx>
 #include <Network/ray.hxx>
 #include <Network/rul.hxx>
-#include <Network/joyclient.hxx>
 
-#include <Time/timestamp.hxx>
+#include "globals.hxx"
 
 FG_USING_STD(string);
 
@@ -73,12 +73,18 @@ static FGProtocol *parse_port_config( const string& config )
     FG_LOG( FG_IO, FG_INFO, "  protocol = " << protocol );
 
     FGProtocol *io;
-    if ( protocol == "native" ) {
-       FGNative *native = new FGNative;
-       io = native;
+    if ( protocol == "atlas" ) {
+       FGAtlas *atlas = new FGAtlas;
+       io = atlas;
     } else if ( protocol == "garmin" ) {
        FGGarmin *garmin = new FGGarmin;
        io = garmin;
+    } else if ( protocol == "joyclient" ) {
+       FGJoyClient *joyclient = new FGJoyClient;
+       io = joyclient;
+    } else if ( protocol == "native" ) {
+       FGNative *native = new FGNative;
+       io = native;
     } else if ( protocol == "nmea" ) {
        FGNMEA *nmea = new FGNMEA;
        io = nmea;
@@ -94,9 +100,6 @@ static FGProtocol *parse_port_config( const string& config )
     } else if ( protocol == "rul" ) {
        FGRUL *rul = new FGRUL;
        io = rul;
-    } else if ( protocol == "joyclient" ) {
-       FGJoyClient *joyclient = new FGJoyClient;
-       io = joyclient;
     } else {
        return NULL;
     }
@@ -194,9 +197,11 @@ static FGProtocol *parse_port_config( const string& config )
 // step through the port config streams (from fgOPTIONS) and setup
 // serial port channels for each
 void fgIOInit() {
+    // FG_LOG( FG_IO, FG_INFO, "I/O Channel initialization, " << 
+    //         globals->get_channel_options_list()->size() << " requests." );
+
     FGProtocol *p;
-    string_list channel_options_list = 
-       current_options.get_channel_options_list();
+    string_list *channel_options_list = globals->get_channel_options_list();
 
     // we could almost do this in a single step except pushing a valid
     // port onto the port list copies the structure and destroys the
@@ -204,13 +209,14 @@ void fgIOInit() {
 
     // parse the configuration strings and store the results in the
     // appropriate FGIOChannel structures
-    for ( int i = 0; i < (int)channel_options_list.size(); ++i ) {
-       p = parse_port_config( channel_options_list[i] );
+    for ( int i = 0; i < (int)channel_options_list->size(); ++i ) {
+       p = parse_port_config( (*channel_options_list)[i] );
        if ( p != NULL ) {
            p->open();
            global_io_list.push_back( p );
            if ( !p->is_enabled() ) {
-               FG_LOG( FG_IO, FG_INFO, "I/O Channel config failed." );
+               FG_LOG( FG_IO, FG_ALERT, "I/O Channel config failed." );
+               exit(-1);
            }
        } else {
            FG_LOG( FG_IO, FG_INFO, "I/O Channel parse failed." );
@@ -227,8 +233,8 @@ void fgIOProcess() {
 
     static int inited = 0;
     int interval;
-    static FGTimeStamp last;
-    FGTimeStamp current;
+    static SGTimeStamp last;
+    SGTimeStamp current;
 
     if ( ! inited ) {
        inited = 1;
@@ -253,3 +259,20 @@ void fgIOProcess() {
        }
     }
 }
+
+
+// shutdown all I/O connections
+void fgIOShutdownAll() {
+    FGProtocol *p;
+
+    // cout << "processing I/O channels" << endl;
+
+    for ( int i = 0; i < (int)global_io_list.size(); ++i ) {
+       // cout << "  channel = " << i << endl;
+       p = global_io_list[i];
+
+       if ( p->is_enabled() ) {
+           p->close();
+       }
+    }
+}