#include <simgear/math/sg_random.h>
#include <simgear/misc/sg_path.hxx>
-#include <Aircraft/aircraft.hxx>
#include <Navaids/navlist.hxx>
#include "marker_beacon.hxx"
+#include <Sound/beacon.hxx>
#include <string>
using std::string;
// Constructor
FGMarkerBeacon::FGMarkerBeacon(SGPropertyNode *node) :
audio_vol(NULL),
- need_update(true),
outer_blink(false),
middle_blink(false),
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;
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);
audio_vol = node->getChild("volume", 0, true);
serviceable = node->getChild("serviceable", 0, true);
- if (power_btn->getType() == SGPropertyNode::NONE)
+ if (power_btn->getType() == simgear::props::NONE)
power_btn->setBoolValue( true );
- if (audio_btn->getType() == SGPropertyNode::NONE)
+ if (audio_btn->getType() == simgear::props::NONE)
audio_btn->setBoolValue( true );
- if (serviceable->getType() == SGPropertyNode::NONE)
+ if (serviceable->getType() == simgear::props::NONE)
serviceable->setBoolValue( true );
- morse.init();
- beacon.init();
- blink.stamp();
+ SGSoundMgr *smgr = globals->get_soundmgr();
+ _sgr = smgr->find("avionics", true);
+ _sgr->tie_to_listener();
- outer_marker = middle_marker = inner_marker = false;
+ reinit();
}
+void
+FGMarkerBeacon::reinit ()
+{
+ blink.stamp();
+ outer_marker = middle_marker = inner_marker = false;
+ _time_before_search_sec = 0.0;
+}
void
FGMarkerBeacon::bind ()
void
FGMarkerBeacon::update(double dt)
{
- need_update = false;
-
// On timeout, scan again, this needs to run every iteration no
// matter what the power or serviceable state. If power is turned
// off or the unit becomes unserviceable while a beacon sound is
}
if ( has_power() && serviceable->getBoolValue()
- && !sound_pause->getBoolValue()) {
+ && sound_working->getBoolValue()) {
// marker beacon blinking
bool light_on = ( outer_blink || middle_blink || inner_blink );
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;
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 ( ! _sgr->exists( current_sound_name ) ) {
+ SGSoundSample *sound = FGBeacon::instance()->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 ) ) {
- SGSoundSample *sound = beacon.get_middle();
+ if ( ! _sgr->exists( current_sound_name ) ) {
+ SGSoundSample *sound = FGBeacon::instance()->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 ) ) {
- SGSoundSample *sound = beacon.get_inner();
+ if ( ! _sgr->exists( current_sound_name ) ) {
+ SGSoundSample *sound = FGBeacon::instance()->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 ) {