X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FInstrumentation%2Fmarker_beacon.cxx;h=f7945722d1dbd22a0ed7869003eab149ff301e21;hb=db85ebff95b5e7bcb469d99ae25e062b733d090b;hp=e636704fb90ef686a7307f4bd9ec35ab074ce7dc;hpb=89010e6b0ac344970dfe3e802e4e51703fedc8ff;p=flightgear.git diff --git a/src/Instrumentation/marker_beacon.cxx b/src/Instrumentation/marker_beacon.cxx index e636704fb..f7945722d 100644 --- a/src/Instrumentation/marker_beacon.cxx +++ b/src/Instrumentation/marker_beacon.cxx @@ -31,7 +31,6 @@ #include #include -#include #include #include "marker_beacon.hxx" @@ -49,7 +48,8 @@ FGMarkerBeacon::FGMarkerBeacon(SGPropertyNode *node) : inner_blink(false), name("marker-beacon"), num(0), - _time_before_search_sec(0.0) + _time_before_search_sec(0.0), + _sgr(NULL) { SGPath path( globals->get_fg_root() ); SGPath term = path; @@ -63,8 +63,7 @@ FGMarkerBeacon::FGMarkerBeacon(SGPropertyNode *node) : low_tbl = new SGInterpTable( low.str() ); high_tbl = new SGInterpTable( high.str() ); - int i; - for ( i = 0; i < node->nChildren(); ++i ) { + for ( int i = 0; i < node->nChildren(); ++i ) { SGPropertyNode *child = node->getChild(i); string cname = child->getName(); string cval = child->getStringValue(); @@ -100,7 +99,7 @@ FGMarkerBeacon::init () SGPropertyNode *node = fgGetNode(branch.c_str(), num, true ); // Inputs - sound_pause = fgGetNode("/sim/sound/pause", false); + sound_working = fgGetNode("/sim/sound/working", true); lon_node = fgGetNode("/position/longitude-deg", true); lat_node = fgGetNode("/position/latitude-deg", true); alt_node = fgGetNode("/position/altitude-ft", true); @@ -110,9 +109,16 @@ FGMarkerBeacon::init () audio_vol = node->getChild("volume", 0, true); serviceable = node->getChild("serviceable", 0, true); - power_btn->setBoolValue( true ); - audio_btn->setBoolValue( true ); - serviceable->setBoolValue( true ); + if (power_btn->getType() == simgear::props::NONE) + power_btn->setBoolValue( true ); + if (audio_btn->getType() == simgear::props::NONE) + audio_btn->setBoolValue( true ); + if (serviceable->getType() == simgear::props::NONE) + serviceable->setBoolValue( true ); + + SGSoundMgr *smgr = globals->get_soundmgr(); + _sgr = smgr->find("avionics", true); + _sgr->tie_to_listener(); morse.init(); beacon.init(); @@ -165,23 +171,22 @@ FGMarkerBeacon::update(double dt) _time_before_search_sec -= dt; if ( _time_before_search_sec < 0 ) { - search(); + search(); } if ( has_power() && serviceable->getBoolValue() - && !sound_pause->getBoolValue()) { + && sound_working->getBoolValue()) { // marker beacon blinking bool light_on = ( outer_blink || middle_blink || inner_blink ); - SGTimeStamp current; - current.stamp(); + SGTimeStamp current = SGTimeStamp::now(); - if ( light_on && (current - blink > 400000) ) { + if ( light_on && blink + SGTimeStamp::fromUSec(400000) < current ) { light_on = false; - blink.stamp(); - } else if ( !light_on && (current - blink > 100000) ) { + blink = current; + } else if ( !light_on && blink + SGTimeStamp::fromUSec(100000) < current ) { light_on = true; - blink.stamp(); + blink = current; } if ( outer_marker ) { @@ -251,10 +256,14 @@ static bool check_beacon_range( const SGGeod& pos, class BeaconFilter : public FGPositioned::Filter { public: - virtual bool pass(FGPositioned* aPos) const - { - return (aPos->type() >= FGPositioned::OM) && (aPos->type() <= FGPositioned::IM); + virtual FGPositioned::Type minType() const { + return FGPositioned::OM; + } + + virtual FGPositioned::Type maxType() const { + return FGPositioned::IM; } + }; // Update current nav/adf radio stations based on current postition @@ -276,7 +285,7 @@ void FGMarkerBeacon::search() // get closest marker beacon - within a 1nm cutoff BeaconFilter filter; FGPositionedRef b = FGPositioned::findClosest(pos, 1.0, &filter); - + fgMkrBeacType beacon_type = NOBEACON; bool inrange = false; if ( b != NULL ) { @@ -295,9 +304,9 @@ void FGMarkerBeacon::search() 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" ); + _sgr->stop( "outer-marker" ); + _sgr->stop( "middle-marker" ); + _sgr->stop( "inner-marker" ); } else { string current_sound_name; @@ -307,63 +316,63 @@ void FGMarkerBeacon::search() current_sound_name = "outer-marker"; // cout << "OUTER MARKER" << endl; if ( last_beacon != OUTER ) { - if ( ! globals->get_soundmgr()->exists( current_sound_name ) ) { + if ( ! _sgr->exists( current_sound_name ) ) { SGSoundSample *sound = beacon.get_outer(); if ( sound ) { - globals->get_soundmgr()->add( sound, current_sound_name ); + _sgr->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 ); + if ( !_sgr->is_playing(current_sound_name) ) { + _sgr->play_looped( current_sound_name ); } } else { - globals->get_soundmgr()->stop( current_sound_name ); + _sgr->stop( current_sound_name ); } } 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 ) ) { + if ( ! _sgr->exists( current_sound_name ) ) { SGSoundSample *sound = beacon.get_middle(); if ( sound ) { - globals->get_soundmgr()->add( sound, current_sound_name ); + _sgr->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 ); + if ( !_sgr->is_playing(current_sound_name) ) { + _sgr->play_looped( current_sound_name ); } } else { - globals->get_soundmgr()->stop( current_sound_name ); + _sgr->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 ) ) { + if ( ! _sgr->exists( current_sound_name ) ) { SGSoundSample *sound = beacon.get_inner(); if ( sound ) { - globals->get_soundmgr()->add( sound, current_sound_name ); + _sgr->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 ); + if ( !_sgr->is_playing(current_sound_name) ) { + _sgr->play_looped( current_sound_name ); } } else { - globals->get_soundmgr()->stop( current_sound_name ); + _sgr->stop( current_sound_name ); } } // cout << "VOLUME " << audio_vol->getDoubleValue() << endl; - SGSoundSample * mkr = globals->get_soundmgr()->find( current_sound_name ); + SGSoundSample * mkr = _sgr->find( current_sound_name ); if (mkr) - mkr->set_volume( audio_vol->getDoubleValue() ); + mkr->set_volume( audio_vol->getFloatValue() ); } if ( inrange ) {