Make sound audiable not until after the scenery is loaded.

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

diff --git a/src/Main/fg_io.cxx b/src/Main/fg_io.cxx
index 458f956c63f554e93a7e4e0726bcdef269fdfd39..efcef0d13ce396df206a5f30b186697db8da87a0 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
@@ -46,6 +46,7 @@
 #  include <Network/jpg-httpd.hxx>
 #endif
 #include <Network/joyclient.hxx>
+#include <Network/jsclient.hxx>
 #include <Network/native.hxx>
 #include <Network/native_ctrls.hxx>
 #include <Network/native_fdm.hxx>
@@ -105,10 +106,22 @@ FGIO::parse_port_config( const string& config )
 
     try
     {
-       if ( protocol == "atc610x" ) {
-            FGATC610x *atc610x = new FGATC610x;
-           atc610x->set_hz( 30 );
-           return atc610x;
+       if ( protocol == "atcsim" ) {
+            FGATC610x *atcsim = new FGATC610x;
+           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;
+            }
+            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;
@@ -133,6 +146,9 @@ FGIO::parse_port_config( const string& config )
        } else if ( protocol == "joyclient" ) {
            FGJoyClient *joyclient = new FGJoyClient;
            io = joyclient;
+        } else if ( protocol == "jsclient" ) {
+            FGJsClient *jsclient = new FGJsClient;
+            io = jsclient;
        } else if ( protocol == "native" ) {
            FGNative *native = new FGNative;
            io = native;
@@ -161,7 +177,10 @@ FGIO::parse_port_config( const string& config )
            FGRUL *rul = new FGRUL;
            io = rul;
         } else if ( protocol == "generic" ) {
-            FGGeneric *generic = new FGGeneric( tokens[6] );
+            int n = 6;
+            if (tokens[1] == "socket")  n++;
+            else if (tokens[1] == "file") n--;
+            FGGeneric *generic = new FGGeneric( tokens[n] );
             io = generic;
 
 #ifdef FG_MPLAYER_AS