// Constructor
FGMarkerBeacon::FGMarkerBeacon(SGPropertyNode *node) :
+ audio_vol(NULL),
need_update(true),
outer_blink(false),
middle_blink(false),
} else if ( cname == "number" ) {
num = child->getIntValue();
} else {
- SG_LOG( SG_INSTR, SG_WARN,
+ SG_LOG( SG_INSTR, SG_WARN,
"Error in marker beacon config logic" );
if ( name.length() ) {
SG_LOG( SG_INSTR, SG_WARN, "Section = " << name );
// Destructor
-FGMarkerBeacon::~FGMarkerBeacon()
+FGMarkerBeacon::~FGMarkerBeacon()
{
delete term_tbl;
delete low_tbl;
bus_power = fgGetNode("/systems/electrical/outputs/nav[0]", true);
power_btn = node->getChild("power-btn", 0, true);
audio_btn = node->getChild("audio-btn", 0, true);
+ audio_vol = node->getChild("volume", 0, true);
serviceable = node->getChild("serviceable", 0, true);
power_btn->setBoolValue( true );
branch = "/instrumentation/" + name;
fgTie((branch + "/inner").c_str(), this,
- &FGMarkerBeacon::get_inner_blink);
+ &FGMarkerBeacon::get_inner_blink);
fgTie((branch + "/middle").c_str(), this,
- &FGMarkerBeacon::get_middle_blink);
+ &FGMarkerBeacon::get_middle_blink);
fgTie((branch + "/outer").c_str(), this,
- &FGMarkerBeacon::get_outer_blink);
+ &FGMarkerBeacon::get_outer_blink);
}
// Update the various nav values based on position and valid tuned in navs
-void
-FGMarkerBeacon::update(double dt)
+void
+FGMarkerBeacon::update(double dt)
{
need_update = false;
if ( has_power() && serviceable->getBoolValue()
&& !sound_pause->getBoolValue()) {
- // On timeout, scan again
- _time_before_search_sec -= dt;
- if ( _time_before_search_sec < 0 ) {
- search();
- }
+ // On timeout, scan again
+ _time_before_search_sec -= dt;
+ if ( _time_before_search_sec < 0 ) {
+ search();
+ }
// marker beacon blinking
bool light_on = ( outer_blink || middle_blink || inner_blink );
SGTimeStamp current;
static bool check_beacon_range( const SGGeod& pos,
FGNavRecord *b )
{
- SGVec3d aircraft = SGVec3d::fromGeod(pos);
- SGVec3d station = b->get_cart();
- // cout << " aircraft = " << aircraft << " station = " << station
- // << endl;
-
- SGVec3d tmp = station - aircraft;
- double d = dot(tmp, tmp);
- // cout << " distance = " << d << " ("
- // << FG_ILS_DEFAULT_RANGE * SG_NM_TO_METER
+ double d = distSqr(b->get_cart(), SGVec3d::fromGeod(pos));
+ // cout << " distance = " << d << " ("
+ // << FG_ILS_DEFAULT_RANGE * SG_NM_TO_METER
// * FG_ILS_DEFAULT_RANGE * SG_NM_TO_METER
// << ")" << endl;
-
+
// cout << " range = " << sqrt(d) << endl;
// cout << "elev = " << elev * SG_METER_TO_FEET
}
// Update current nav/adf radio stations based on current postition
-void FGMarkerBeacon::search()
+void FGMarkerBeacon::search()
{
// reset search time
if ( b == NULL || !inrange || !has_power() || !serviceable->getBoolValue() )
{
- // cout << "no marker" << endl;
- globals->get_soundmgr()->stop( "outer-marker" );
- globals->get_soundmgr()->stop( "middle-marker" );
- globals->get_soundmgr()->stop( "inner-marker" );
- } else if ( beacon_type == OUTER ) {
- outer_marker = true;
- // cout << "OUTER MARKER" << endl;
- if ( last_beacon != OUTER ) {
- if ( ! globals->get_soundmgr()->exists( "outer-marker" ) ) {
- SGSoundSample *sound = beacon.get_outer();
- if ( sound ) {
- sound->set_volume( 0.3 );
- globals->get_soundmgr()->add( sound, "outer-marker" );
+ // cout << "no marker" << endl;
+ globals->get_soundmgr()->stop( "outer-marker" );
+ globals->get_soundmgr()->stop( "middle-marker" );
+ globals->get_soundmgr()->stop( "inner-marker" );
+ } else {
+
+ string current_sound_name;
+
+ if ( beacon_type == OUTER ) {
+ outer_marker = true;
+ current_sound_name = "outer-marker";
+ // cout << "OUTER MARKER" << endl;
+ if ( last_beacon != OUTER ) {
+ if ( ! globals->get_soundmgr()->exists( current_sound_name ) ) {
+ SGSoundSample *sound = beacon.get_outer();
+ if ( sound ) {
+ globals->get_soundmgr()->add( sound, current_sound_name );
+ }
}
}
- }
- if ( audio_btn->getBoolValue() ) {
- if ( !globals->get_soundmgr()->is_playing("outer-marker") ) {
- globals->get_soundmgr()->play_looped( "outer-marker" );
+ if ( audio_btn->getBoolValue() ) {
+ if ( !globals->get_soundmgr()->is_playing(current_sound_name) ) {
+ globals->get_soundmgr()->play_looped( current_sound_name );
+ }
+ } else {
+ globals->get_soundmgr()->stop( current_sound_name );
}
- } else {
- globals->get_soundmgr()->stop( "outer-marker" );
- }
- } else if ( beacon_type == MIDDLE ) {
- middle_marker = true;
- // cout << "MIDDLE MARKER" << endl;
- if ( last_beacon != MIDDLE ) {
- if ( ! globals->get_soundmgr()->exists( "middle-marker" ) ) {
- SGSoundSample *sound = beacon.get_middle();
- if ( sound ) {
- sound->set_volume( 0.3 );
- globals->get_soundmgr()->add( sound, "middle-marker" );
+ } else if ( beacon_type == MIDDLE ) {
+ middle_marker = true;
+ current_sound_name = "middle-marker";
+ // cout << "MIDDLE MARKER" << endl;
+ if ( last_beacon != MIDDLE ) {
+ if ( ! globals->get_soundmgr()->exists( current_sound_name ) ) {
+ SGSoundSample *sound = beacon.get_middle();
+ if ( sound ) {
+ globals->get_soundmgr()->add( sound, current_sound_name );
+ }
}
- }
- }
- if ( audio_btn->getBoolValue() ) {
- if ( !globals->get_soundmgr()->is_playing("middle-marker") ) {
- globals->get_soundmgr()->play_looped( "middle-marker" );
}
- } else {
- globals->get_soundmgr()->stop( "middle-marker" );
- }
- } else if ( beacon_type == INNER ) {
- inner_marker = true;
- // cout << "INNER MARKER" << endl;
- if ( last_beacon != INNER ) {
- if ( ! globals->get_soundmgr()->exists( "inner-marker" ) ) {
- SGSoundSample *sound = beacon.get_inner();
- if ( sound ) {
- sound->set_volume( 0.3 );
- globals->get_soundmgr()->add( sound, "inner-marker" );
+ if ( audio_btn->getBoolValue() ) {
+ if ( !globals->get_soundmgr()->is_playing(current_sound_name) ) {
+ globals->get_soundmgr()->play_looped( current_sound_name );
}
- }
- }
- if ( audio_btn->getBoolValue() ) {
- if ( !globals->get_soundmgr()->is_playing("inner-marker") ) {
- globals->get_soundmgr()->play_looped( "inner-marker" );
+ } else {
+ globals->get_soundmgr()->stop( current_sound_name );
+ }
+ } else if ( beacon_type == INNER ) {
+ inner_marker = true;
+ current_sound_name = "inner-marker";
+ // cout << "INNER MARKER" << endl;
+ if ( last_beacon != INNER ) {
+ if ( ! globals->get_soundmgr()->exists( current_sound_name ) ) {
+ SGSoundSample *sound = beacon.get_inner();
+ if ( sound ) {
+ globals->get_soundmgr()->add( sound, current_sound_name );
+ }
+ }
+ }
+ if ( audio_btn->getBoolValue() ) {
+ if ( !globals->get_soundmgr()->is_playing(current_sound_name) ) {
+ globals->get_soundmgr()->play_looped( current_sound_name );
+ }
+ } else {
+ globals->get_soundmgr()->stop( current_sound_name );
}
- } else {
- globals->get_soundmgr()->stop( "inner-marker" );
}
+ // cout << "VOLUME " << audio_vol->getDoubleValue() << endl;
+ SGSoundSample * mkr = globals->get_soundmgr()->find( current_sound_name );
+ if (mkr)
+ mkr->set_volume( audio_vol->getDoubleValue() );
}
if ( inrange ) {