Pull Sound-manager out of FGGlobals

diff --git a/src/Instrumentation/adf.cxx b/src/Instrumentation/adf.cxx
index 62302c92bd97b2d4a5416c4ee7c09b6fed91eb51..bb28216b473d9de62372e4f68c177f5387b0b201 100644 (file)
--- a/src/Instrumentation/adf.cxx
+++ b/src/Instrumentation/adf.cxx
@@ -113,7 +113,7 @@ ADF::init ()
       _power_btn_node->setBoolValue(true); // front end didn't implement a power button
 
     // sound support (audible ident code)
-    SGSoundMgr *smgr = globals->get_soundmgr();
+    SGSoundMgr *smgr = globals->get_subsystem<SGSoundMgr>();
     _sgr = smgr->find("avionics", true);
     _sgr->tie_to_listener();
 

diff --git a/src/Instrumentation/commradio.cxx b/src/Instrumentation/commradio.cxx
index 3fdd62956c7414e64b9845e6ebb6f50887e9314d..102cca5f1a1cb76167288894c83c578665f295b2 100644 (file)
--- a/src/Instrumentation/commradio.cxx
+++ b/src/Instrumentation/commradio.cxx
@@ -126,7 +126,7 @@ void AtisSpeaker::valueChanged(SGPropertyNode * node)
   }
 
 
-  FGSoundManager * smgr = dynamic_cast<FGSoundManager*>(globals->get_soundmgr());
+    FGSoundManager * smgr = globals->get_subsystem<FGSoundManager>();
   assert(smgr != NULL);
 
   SG_LOG(SG_INSTR,SG_INFO,"AtisSpeaker voice is " << voice );
@@ -571,7 +571,7 @@ void CommRadioImpl::unbind()
 #if defined(ENABLE_FLITE)
   _atis.node()->removeChangeListener(&_atisSpeaker);
   if (_sampleGroup.valid()) {
-    globals->get_soundmgr()->remove(getSampleGroupRefname());
+      globals->get_subsystem<SGSoundMgr>()->remove(getSampleGroupRefname());
   }
 #endif
   _metarBridge->unbind();
@@ -617,7 +617,9 @@ void CommRadioImpl::update(double dt)
       // the speaker has created a new atis sample
       if (!_sampleGroup.valid()) {
         // create a sample group for our instrument on the fly
-        _sampleGroup = globals->get_soundmgr()->find(getSampleGroupRefname(), true);
+          SGSoundMgr * smgr = globals->get_subsystem<SGSoundMgr>();
+
+        _sampleGroup = smgr->find(getSampleGroupRefname(), true);
         _sampleGroup->tie_to_listener();
         if (_addNoise) {
           SGSharedPtr<SGSoundSample> noise = new SGSoundSample("Sounds/radionoise.wav", globals->get_fg_root());

diff --git a/src/Instrumentation/kr_87.cxx b/src/Instrumentation/kr_87.cxx
index 79f45809e4907532c239ea8e82b474ea4e8da5ef..4f84d821e2802edde3356b60903019cc3c96ac77 100644 (file)
--- a/src/Instrumentation/kr_87.cxx
+++ b/src/Instrumentation/kr_87.cxx
@@ -114,7 +114,7 @@ FGKR_87::~FGKR_87() {
 
 
 void FGKR_87::init () {
-    SGSoundMgr *smgr = globals->get_soundmgr();
+    SGSoundMgr *smgr = globals->get_subsystem<SGSoundMgr>();
     _sgr = smgr->find("avionics", true);
     _sgr->tie_to_listener();
 }

diff --git a/src/Instrumentation/marker_beacon.cxx b/src/Instrumentation/marker_beacon.cxx
index 52b3c67789b4f3b17bfb717717db8abf8a431cb4..ea9ffb9e3d89ad34f893de45ffb2a0f1c65227a6 100644 (file)
--- a/src/Instrumentation/marker_beacon.cxx
+++ b/src/Instrumentation/marker_beacon.cxx
@@ -101,7 +101,7 @@ FGMarkerBeacon::init ()
     if (serviceable->getType() == simgear::props::NONE)
         serviceable->setBoolValue( true );
 
-    SGSoundMgr *smgr = globals->get_soundmgr();
+    SGSoundMgr *smgr = globals->get_subsystem<SGSoundMgr>();
     _sgr = smgr->find("avionics", true);
     _sgr->tie_to_listener();
 

diff --git a/src/Main/fg_commands.cxx b/src/Main/fg_commands.cxx
index 0e9dc485b45d1144f30624a17483a6fb5f6911a0..3151b2bf6a2e0be48d0aacf316126662a8f69114 100644 (file)
--- a/src/Main/fg_commands.cxx
+++ b/src/Main/fg_commands.cxx
@@ -1070,7 +1070,7 @@ do_add_model (const SGPropertyNode * arg)
 static bool
 do_play_audio_sample (const SGPropertyNode * arg)
 {
-    SGSoundMgr *smgr = globals->get_soundmgr();
+    SGSoundMgr *smgr = globals->get_subsystem<SGSoundMgr>();
     if (!smgr) {
         SG_LOG(SG_GENERAL, SG_WARN, "play-audio-sample: sound-manager not running");
         return false;

diff --git a/src/Main/fg_props.cxx b/src/Main/fg_props.cxx
index 141c3ef0731c292ccf354521018738fd4576d499..501a5959213b62850aee99e08bf943abce472069 100644 (file)
--- a/src/Main/fg_props.cxx
+++ b/src/Main/fg_props.cxx
@@ -231,7 +231,7 @@ setFreeze (bool f)
     frozen = f;
 
     // Stop sound on a pause
-    SGSoundMgr *smgr = globals->get_soundmgr();
+    SGSoundMgr *smgr = globals->get_subsystem<SGSoundMgr>();
     if ( smgr != NULL ) {
         if ( f ) {
             smgr->suspend();

diff --git a/src/Main/globals.cxx b/src/Main/globals.cxx
index ff86ee15bd9779626fc94876bb830327b3afdad4..8e8a346a705a911bf371d1fdd21ff510fc252d80 100644 (file)
--- a/src/Main/globals.cxx
+++ b/src/Main/globals.cxx
@@ -508,12 +508,6 @@ FGGlobals::add_subsystem (const char * name,
     subsystem_mgr->add(name, subsystem, type, min_time_sec);
 }
 
-SGSoundMgr *
-FGGlobals::get_soundmgr () const
-{
-    return get_subsystem<SGSoundMgr>();
-}
-
 SGEventMgr *
 FGGlobals::get_event_mgr () const
 {

diff --git a/src/Main/globals.hxx b/src/Main/globals.hxx
index e08da98918f17a5929d08a4df9185444243e8075..5c82b364a88c6fa2c2997b1b41a68cf73ca780a3 100644 (file)
--- a/src/Main/globals.hxx
+++ b/src/Main/globals.hxx
@@ -53,7 +53,6 @@ class SGTime;
 class SGEventMgr;
 class SGSubsystemMgr;
 class SGSubsystem;
-class SGSoundMgr;
 
 class FGControls;
 class FGTACANList;
@@ -190,8 +189,6 @@ public:
 
     SGEventMgr *get_event_mgr () const;
 
-    SGSoundMgr *get_soundmgr () const;
-
     inline double get_sim_time_sec () const { return sim_time_sec; }
     inline void inc_sim_time_sec (double dt) { sim_time_sec += dt; }
     inline void set_sim_time_sec (double t) { sim_time_sec = t; }

diff --git a/src/Sound/audioident.cxx b/src/Sound/audioident.cxx
index c205287f2e97720b7dbd64dfea75e6d95c936a2f..aa8a97ac7b9e482cd3114e705bc20e3b480d56ab 100644 (file)
--- a/src/Sound/audioident.cxx
+++ b/src/Sound/audioident.cxx
@@ -40,7 +40,7 @@ void AudioIdent::init()
     _timer = 0.0;
     _ident = "";
     _running = false;
-    _sgr = globals->get_soundmgr()->find("avionics", true);
+    _sgr = globals->get_subsystem<SGSoundMgr>()->find("avionics", true);
     _sgr->tie_to_listener();
 }
 

diff --git a/src/Sound/fg_fx.cxx b/src/Sound/fg_fx.cxx
index d3a050426b62c903b35a230c72520b2f493ebbc3..3aa7a1d2077961f8d499c4e8ac51b26ea3934989 100644 (file)
--- a/src/Sound/fg_fx.cxx
+++ b/src/Sound/fg_fx.cxx
@@ -61,7 +61,7 @@ FGFX::FGFX ( const std::string &refname, SGPropertyNode *props ) :
     _avionics_ext = _props->getNode("sim/sound/avionics/external-view", true);
     _internal = _props->getNode("sim/current-view/internal", true);
 
-    _smgr = globals->get_soundmgr();
+    _smgr = globals->get_subsystem<SGSoundMgr>();
     if (!_smgr) {
       return;
     }

diff --git a/src/Sound/flitevoice.cxx b/src/Sound/flitevoice.cxx
index ee8b19795bd4fea26d1b249f0bde21c3fa7dcb12..2c98edd5a2628acb612a8ac5419c7fc2f2ff3ff5 100644 (file)
--- a/src/Sound/flitevoice.cxx
+++ b/src/Sound/flitevoice.cxx
@@ -43,7 +43,7 @@ FGFLITEVoice::FGFLITEVoice(FGVoiceMgr * mgr, const SGPropertyNode_ptr node, cons
 
   _synthesizer = new FLITEVoiceSynthesizer(voice.c_str());
 
-  SGSoundMgr *smgr = globals->get_soundmgr();
+  SGSoundMgr *smgr = globals->get_subsystem<SGSoundMgr>();
   _sgr = smgr->find(sampleGroupRefName, true);
   _sgr->tie_to_listener();
 

diff --git a/src/Sound/voiceplayer.cxx b/src/Sound/voiceplayer.cxx
index ab839cca6ffec20c59284a1ce551a58f88956989..c4ca5d2bdb33e2b54df71be1c9d729d977ad540b 100644 (file)
--- a/src/Sound/voiceplayer.cxx
+++ b/src/Sound/voiceplayer.cxx
@@ -208,7 +208,7 @@ FGVoicePlayer::bind (SGPropertyNode *node, const char* default_dir_prefix)
 void
 FGVoicePlayer::init ()
 {
-    SGSoundMgr *smgr = globals->get_soundmgr();
+    SGSoundMgr *smgr = globals->get_subsystem<SGSoundMgr>();
     _sgr = smgr->find("avionics", true);
     _sgr->tie_to_listener();
     speaker.update_configuration();