#include <simgear/misc/sg_path.hxx>
#include <simgear/scene/material/mat.hxx>
#include <simgear/sound/soundmgr_openal.hxx>
+#include <simgear/misc/strutils.hxx>
#include <Autopilot/route_mgr.hxx>
#include <GUI/gui.h>
return ::atoi( str.c_str() );
}
+static int fgSetupProxy( const char *arg );
+
/**
* Set a few fail-safe default property values.
*
fgSetString("/sim/version/revision", REVISION);
fgSetInt("/sim/version/build-number", HUDSON_BUILD_NUMBER);
fgSetString("/sim/version/build-id", HUDSON_BUILD_ID);
+ if( (envp = ::getenv( "http_proxy" )) != NULL )
+ fgSetupProxy( envp );
}
static bool
static int
fgSetupProxy( const char *arg )
{
- string options = arg;
+ string options = simgear::strutils::strip( arg );
string host, port, auth;
string::size_type pos;
+ // this is NURLP - NURLP is not an url parser
+ if( simgear::strutils::starts_with( options, "http://" ) )
+ options = options.substr( 7 );
+ if( simgear::strutils::ends_with( options, "/" ) )
+ options = options.substr( 0, options.length() - 1 );
+
host = port = auth = "";
if ((pos = options.find("@")) != string::npos)
auth = options.substr(0, pos++);
}
static int
-fgOptADF( const char * arg )
+fgOptADF1( const char * arg )
+{
+ double rot, freq;
+ if (parse_colon(arg, &rot, &freq))
+ fgSetDouble("/instrumentation/adf[0]/rotation-deg", rot);
+ fgSetDouble("/instrumentation/adf[0]/frequencies/selected-khz", freq);
+ return FG_OPTIONS_OK;
+}
+
+static int
+fgOptADF2( const char * arg )
{
double rot, freq;
if (parse_colon(arg, &rot, &freq))
- fgSetDouble("/instrumentation/adf/rotation-deg", rot);
- fgSetDouble("/instrumentation/adf/frequencies/selected-khz", freq);
+ fgSetDouble("/instrumentation/adf[1]/rotation-deg", rot);
+ fgSetDouble("/instrumentation/adf[1]/frequencies/selected-khz", freq);
return FG_OPTIONS_OK;
}
{"com2", true, OPTION_DOUBLE, "/instrumentation/comm[1]/frequencies/selected-mhz", false, "", 0 },
{"nav1", true, OPTION_FUNC, "", false, "", fgOptNAV1 },
{"nav2", true, OPTION_FUNC, "", false, "", fgOptNAV2 },
- {"adf", true, OPTION_FUNC, "", false, "", fgOptADF },
+ {"adf", /*legacy*/ true, OPTION_FUNC, "", false, "", fgOptADF1 },
+ {"adf1", true, OPTION_FUNC, "", false, "", fgOptADF1 },
+ {"adf2", true, OPTION_FUNC, "", false, "", fgOptADF2 },
{"dme", true, OPTION_FUNC, "", false, "", fgOptDME },
{"min-status", true, OPTION_STRING, "/sim/aircraft-min-status", false, "all", 0 },
{"livery", true, OPTION_FUNC, "", false, "", fgOptLivery },