//
// 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
# 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>
+#include <Network/native_gui.hxx>
#include <Network/opengc.hxx>
#include <Network/nmea.hxx>
#include <Network/props.hxx>
#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"
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;
} 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" ) {
+ FGNativeGUI *net_gui = new FGNativeGUI;
+ io = net_gui;
} else if ( protocol == "nmea" ) {
FGNMEA *nmea = new FGNMEA;
io = nmea;
} 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;
}
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 ) );
}
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;
// parse the configuration strings and store the results in the
// appropriate FGIOChannel structures
- vector< string >::iterator i = globals->get_channel_options_list()->begin();
- vector< string >::iterator end = globals->get_channel_options_list()->end();
+ typedef vector<string> container;
+ container::iterator i = globals->get_channel_options_list()->begin();
+ container::iterator end = globals->get_channel_options_list()->end();
for (; i != end; ++i )
{
p = parse_port_config( *i );
}
-// process any serial port work
+// process any IO channel work
void
FGIO::update( double delta_time_sec )
{
// cout << "processing I/O channels" << endl;
+ // cout << " Elapsed time = " << delta_time_sec << endl;
- static int inited = 0;
- int interval;
- static SGTimeStamp last;
- SGTimeStamp current;
-
- if ( ! inited ) {
- inited = 1;
- last.stamp();
- interval = 0;
- } else {
- current.stamp();
- interval = current - last;
- last = current;
- }
-
- vector< FGProtocol* >::iterator i = io_channels.begin();
- vector< FGProtocol* >::iterator end = io_channels.end();
- for (; i != end; ++i )
- {
+ typedef vector< FGProtocol* > container;
+ container::iterator i = io_channels.begin();
+ container::iterator end = io_channels.end();
+ for (; i != end; ++i ) {
FGProtocol* p = *i;
if ( p->is_enabled() ) {
- p->dec_count_down( interval );
- while ( p->get_count_down() < 0 ) {
- p->process();
- p->dec_count_down(int( -1000000.0 / p->get_hz()));
+ p->dec_count_down( delta_time_sec );
+ 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 );
+ }
+ // double ave = elapsed_time / p->get_count();
+ // cout << " ave rate = " << ave << endl;
}
}
}
// cout << "processing I/O channels" << endl;
- vector< FGProtocol* >::iterator i = io_channels.begin();
- vector< FGProtocol* >::iterator end = io_channels.end();
+ typedef vector< FGProtocol* > container;
+ container::iterator i = io_channels.begin();
+ container::iterator end = io_channels.end();
for (; i != end; ++i )
{
p = *i;