fly/flightgear
1
0
Fork 0
Code Activity

only start the sounds when the soundmanager becomes active

Browse source
This commit is contained in:
Erik Hofman 2017-01-12 11:44:53 +01:00
parent 2098593531
commit 9f6422b5e2
2 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/Sound/fg_fx.cxx
View file

@ -33,11 +33,11 @@
#include <Main/fg_props.hxx> #include <Main/fg_props.hxx>
#include <Main/globals.hxx> #include <Main/globals.hxx>
#include <Sound/soundmanager.hxx>
#include <simgear/props/props.hxx> #include <simgear/props/props.hxx>
#include <simgear/props/props_io.hxx> #include <simgear/props/props_io.hxx>
#include <simgear/misc/sg_path.hxx> #include <simgear/misc/sg_path.hxx>
#include <simgear/sound/soundmgr.hxx>
#include <simgear/sound/xmlsound.hxx> #include <simgear/sound/xmlsound.hxx>
FGFX::FGFX ( const std::string &refname, SGPropertyNode *props ) : FGFX::FGFX ( const std::string &refname, SGPropertyNode *props ) :
@ -61,10 +61,11 @@ FGFX::FGFX ( const std::string &refname, SGPropertyNode *props ) :
_avionics_ext = _props->getNode("sim/sound/avionics/external-view", true); _avionics_ext = _props->getNode("sim/sound/avionics/external-view", true);
_internal = _props->getNode("sim/current-view/internal", true); _internal = _props->getNode("sim/current-view/internal", true);
_smgr = globals->get_subsystem<SGSoundMgr>(); _smgr = globals->get_subsystem<FGSoundManager>();
if (!_smgr) { if (!_smgr) {
return; return;
} }
_active = _smgr->is_active();
_refname = refname; _refname = refname;
_smgr->add(this, refname); _smgr->add(this, refname);
@ -162,6 +163,15 @@ FGFX::update (double dt)
if (!_smgr) { if (!_smgr) {
return; return;
} }
if (!_active && _smgr->is_active())
{
_active = true;
for ( unsigned int i = 0; i < _sound.size(); i++ ) {
_sound[i]->start();
}
}
if ( _enabled->getBoolValue() ) { if ( _enabled->getBoolValue() ) {
if ( _avionics_enabled->getBoolValue()) if ( _avionics_enabled->getBoolValue())

1
src/Sound/fg_fx.hxx
View file

@ -59,6 +59,7 @@ public:
private: private:
bool _active;
bool _is_aimodel; bool _is_aimodel;
SGSharedPtr<SGSampleGroup> _avionics; SGSharedPtr<SGSampleGroup> _avionics;
std::vector<SGXmlSound *> _sound; std::vector<SGXmlSound *> _sound;