fly/flightgear
1
0
Fork 0
Code Activity

Activate external-view checkbox for avionics

Browse source
This commit is contained in:
ehofman 2009-12-08 14:43:29 +00:00 • committed by Tim Moore
parent 168dc6ff92
commit 641f000860
2 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/Sound/fg_fx.cxx
View file

@ -42,7 +42,9 @@ FGFX::FGFX ( SGSoundMgr *smgr, const string &refname ) :
_enabled( fgGetNode("/sim/sound/effects/enabled", true) ), _enabled( fgGetNode("/sim/sound/effects/enabled", true) ),
_volume( fgGetNode("/sim/sound/effects/volume", true) ), _volume( fgGetNode("/sim/sound/effects/volume", true) ),
_avionics_enabled( fgGetNode("/sim/sound/avionics/enabled", true) ), _avionics_enabled( fgGetNode("/sim/sound/avionics/enabled", true) ),
_avionics_volume( fgGetNode("/sim/sound/avionics/volume", true) ) _avionics_volume( fgGetNode("/sim/sound/avionics/volume", true) ),
_avionics_external( fgGetNode("/sim/sound/avionics/external-view", true) ),
_internal( fgGetNode("/sim/current-view/internal", true) )
{ {
SGSampleGroup::_smgr = smgr; SGSampleGroup::_smgr = smgr;
SGSampleGroup::_refname = refname; SGSampleGroup::_refname = refname;
@ -116,12 +118,14 @@ FGFX::reinit()
void void
FGFX::update (double dt) FGFX::update (double dt)
{ {
if ( _avionics_enabled->getBoolValue() ) bool active = _avionics_external->getBoolValue() ||
_internal->getBoolValue();
if ( active && _avionics_enabled->getBoolValue() )
_avionics->resume(); // no-op if already in resumed state _avionics->resume(); // no-op if already in resumed state
else else
_avionics->suspend(); _avionics->suspend();
_avionics->set_volume( _avionics_volume->getDoubleValue() ); _avionics->set_volume( _avionics_volume->getFloatValue() );
if ( _enabled->getBoolValue() ) { if ( _enabled->getBoolValue() ) {
set_volume( _volume->getDoubleValue() ); set_volume( _volume->getDoubleValue() );

2
src/Sound/fg_fx.hxx
View file

@ -64,6 +64,8 @@ private:
SGPropertyNode_ptr _volume; SGPropertyNode_ptr _volume;
SGPropertyNode_ptr _avionics_enabled; SGPropertyNode_ptr _avionics_enabled;
SGPropertyNode_ptr _avionics_volume; SGPropertyNode_ptr _avionics_volume;
SGPropertyNode_ptr _avionics_external;
SGPropertyNode_ptr _internal;
}; };