sunpos.hxx is no more

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

diff --git a/src/Main/fg_io.cxx b/src/Main/fg_io.cxx
index 2e06e16b9f23583f1983cfe98c5ee8619375b7e8..dea77dec26267cb311226963910e9825a394009c 100644 (file)
--- a/src/Main/fg_io.cxx
+++ b/src/Main/fg_io.cxx
@@ -2,7 +2,7 @@
 //
 // Written by Curtis Olson, started November 1999.
 //
-// Copyright (C) 1999  Curtis L. Olson - curt@flightgear.org
+// Copyright (C) 1999  Curtis L. Olson - http://www.flightgear.org/~curt
 //
 // This program is free software; you can redistribute it and/or
 // modify it under the terms of the GNU General Public License as
@@ -38,7 +38,7 @@
 #include <simgear/misc/strutils.hxx>
 
 #include <Network/protocol.hxx>
-#include <Network/atc610x.hxx>
+#include <Network/ATC-Main.hxx>
 #include <Network/atlas.hxx>
 #include <Network/garmin.hxx>
 #include <Network/httpd.hxx>
@@ -106,15 +106,22 @@ FGIO::parse_port_config( const string& config )
 
     try
     {
-       if ( protocol == "atc610x" ) {
-            FGATC610x *atc610x = new FGATC610x;
-           atc610x->set_hz( 30 );
-            if ( tokens.size() > 1 ) {
-                if ( tokens[1] == "no-rudder" ) {
-                    atc610x->set_use_rudder( false );
-                }
+       if ( protocol == "atcsim" ) {
+            FGATCMain *atcsim = new FGATCMain;
+           atcsim->set_hz( 30 );
+            if ( tokens.size() != 6 ) {
+                SG_LOG( SG_IO, SG_ALERT, "Usage: --atcsim=[no-]pedals,"
+                        << "input0_config,input1_config,"
+                        << "output0_config,output1_config,file.nas" );
+                return NULL;
             }
-           return atc610x;
+            if ( tokens[1] == "no-pedals" ) {
+                fgSetBool( "/input/atcsim/ignore-pedal-controls", true );
+            } else {
+                fgSetBool( "/input/atcsim/ignore-pedal-controls", false );
+            }
+            atcsim->set_path_names(tokens[2], tokens[3], tokens[4], tokens[5]);
+           return atcsim;
        } else if ( protocol == "atlas" ) {
            FGAtlas *atlas = new FGAtlas;
            io = atlas;
@@ -172,6 +179,7 @@ FGIO::parse_port_config( const string& config )
         } else if ( protocol == "generic" ) {
             int n = 6;
             if (tokens[1] == "socket")  n++;
+            else if (tokens[1] == "file") n--;
             FGGeneric *generic = new FGGeneric( tokens[n] );
             io = generic;
 
@@ -312,7 +320,7 @@ void
 FGIO::shutdown_all() {
     FGProtocol *p;
 
-    // cout << "processing I/O channels" << endl;
+    // cout << "shutting down all I/O channels" << endl;
 
     typedef vector< FGProtocol* > container;
     container::iterator i = io_channels.begin();