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 397ec166dacd59667d97afab2e0c8effb953aebb..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>
@@ -56,6 +57,11 @@
 #include <Network/pve.hxx>
 #include <Network/ray.hxx>
 #include <Network/rul.hxx>
+#include <Network/generic.hxx>
+
+#ifdef FG_MPLAYER_AS
+#include <Network/multiplay.hxx>
+#endif
 
 #include "globals.hxx"
 #include "fg_io.hxx"
@@ -100,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;
@@ -128,16 +146,19 @@ 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;
-       } else if ( protocol == "native_ctrls" ) {
+       } else if ( protocol == "native-ctrls" ) {
            FGNativeCtrls *native_ctrls = new FGNativeCtrls;
            io = native_ctrls;
-       } else if ( protocol == "native_fdm" ) {
+       } else if ( protocol == "native-fdm" ) {
            FGNativeFDM *native_fdm = new FGNativeFDM;
            io = native_fdm;
-       } else if ( protocol == "native_gui" ) {
+       } else if ( protocol == "native-gui" ) {
            FGNativeGUI *net_gui = new FGNativeGUI;
            io = net_gui;
        } else if ( protocol == "nmea" ) {
@@ -155,6 +176,23 @@ FGIO::parse_port_config( const string& config )
        } else if ( protocol == "rul" ) {
            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] );
+            io = generic;
+
+#ifdef FG_MPLAYER_AS
+       } else if ( protocol == "multiplay" ) {\
+           //Determine dir, rate, host & port
+           string dir = tokens[1];
+           string rate = tokens[2];
+           string host = tokens[3];
+           string port = tokens[4];
+           return new FGMultiplay(dir, atoi(rate.c_str()), host, atoi(port.c_str()));
+#endif
+
        } else {
            return NULL;
        }
@@ -204,7 +242,7 @@ FGIO::parse_port_config( const string& config )
        SG_LOG( SG_IO, SG_INFO, "  hostname = " << hostname );
        SG_LOG( SG_IO, SG_INFO, "  port = " << port );
        SG_LOG( SG_IO, SG_INFO, "  style = " << style );
-            
+
        io->set_io_channel( new SGSocket( hostname, port, style ) );
     }
 
@@ -217,7 +255,7 @@ FGIO::parse_port_config( const string& config )
 void
 FGIO::init()
 {
-    // SG_LOG( SG_IO, SG_INFO, "I/O Channel initialization, " << 
+    // SG_LOG( SG_IO, SG_INFO, "I/O Channel initialization, " <<
     //         globals->get_channel_options_list()->size() << " requests." );
 
     FGProtocol *p;
@@ -248,17 +286,12 @@ FGIO::init()
 }
 
 
-// process any serial port work
+// process any IO channel work
 void
 FGIO::update( double delta_time_sec )
 {
     // cout << "processing I/O channels" << endl;
-
-    // SGTimeStamp current_time;
-    // current_time.stamp();
-    // static SGTimeStamp start_time = current_time;
-    // double elapsed_time = (current_time - start_time) / 1000000.0;
-    // cout << " Elapsed time = " << elapsed_time << endl;
+    // cout << "  Elapsed time = " << delta_time_sec << endl;
 
     typedef vector< FGProtocol* > container;
     container::iterator i = io_channels.begin();
@@ -268,14 +301,16 @@ FGIO::update( double delta_time_sec )
 
        if ( p->is_enabled() ) {
            p->dec_count_down( delta_time_sec );
-            double dt = 1 / p->get_hz();
-           while ( p->get_count_down() < 0.33 * dt ) {
-               p->process();
+           double dt = 1 / p->get_hz();
+           if ( p->get_count_down() < 0.33 * dt ) {
+             p->process();
+             p->inc_count();
+             while ( p->get_count_down() < 0.33 * dt ) {
                p->inc_count_down( dt );
-                p->inc_count();
+             }
+             // double ave = elapsed_time / p->get_count();
+             // cout << "  ave rate = " << ave << endl;
            }
-            // double ave = elapsed_time / p->get_count();
-            // cout << "  ave rate = " << ave << endl;
        }
     }
 }