X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FInstrumentation%2Finstrument_mgr.cxx;h=b9f4c359b845be2f1ba083e8d9b50f379b89c94c;hb=863b0c943251fae620406ec8983e5f69e1424731;hp=8025a853079a0e2fe24fb81a8f6f4b97fd1ae602;hpb=8d5714084e76ab923c08aae431dbdb9e516aaf96;p=flightgear.git

diff --git a/src/Instrumentation/instrument_mgr.cxx b/src/Instrumentation/instrument_mgr.cxx
index 8025a8530..b9f4c359b 100644
--- a/src/Instrumentation/instrument_mgr.cxx
+++ b/src/Instrumentation/instrument_mgr.cxx
@@ -5,52 +5,41 @@
 
 
 #include "instrument_mgr.hxx"
-#include "altimeter.hxx"
+#include "airspeed_indicator.hxx"
+#include "annunciator.hxx"
 #include "attitude_indicator.hxx"
+#include "altimeter.hxx"
+#include "turn_indicator.hxx"
+#include "slip_skid_ball.hxx"
+#include "heading_indicator.hxx"
+#include "vertical_speed_indicator.hxx"
+#include "mag_compass.hxx"
+
+#include "dme.hxx"
+#include "adf.hxx"
+#include "gps.hxx"
+#include "clock.hxx"
 
 
 FGInstrumentMgr::FGInstrumentMgr ()
 {
-    // NO-OP
+    set_subsystem("asi", new AirspeedIndicator);
+    set_subsystem("annunciator", new Annunciator);
+    set_subsystem("ai", new AttitudeIndicator);
+    set_subsystem("alt", new Altimeter);
+    set_subsystem("ti", new TurnIndicator);
+    set_subsystem("ball", new SlipSkidBall);
+    set_subsystem("hi", new HeadingIndicator);
+    set_subsystem("vsi", new VerticalSpeedIndicator);
+    set_subsystem("compass", new MagCompass);
+    set_subsystem("dme", new DME, 1.0);
+    set_subsystem("adf", new ADF, 0.15);
+    set_subsystem("gps", new GPS, 0.45);
+    set_subsystem("clock", new Clock, 0.25);
 }
 
 FGInstrumentMgr::~FGInstrumentMgr ()
 {
-    for (unsigned int i = 0; i < _instruments.size(); i++) {
-        delete _instruments[i];
-        _instruments[i] = 0;
-    }
-}
-
-void
-FGInstrumentMgr::init ()
-{
-                                // TODO: replace with XML configuration
-    _instruments.push_back(new Altimeter);
-    _instruments.push_back(new AttitudeIndicator);
-
-                                // Initialize the individual instruments
-    for (unsigned int i = 0; i < _instruments.size(); i++)
-        _instruments[i]->init();
-}
-
-void
-FGInstrumentMgr::bind ()
-{
-    // NO-OP
-}
-
-void
-FGInstrumentMgr::unbind ()
-{
-    // NO-OP
-}
-
-void
-FGInstrumentMgr::update (double dt)
-{
-    for (unsigned int i = 0; i < _instruments.size(); i++)
-        _instruments[i]->update(dt);
 }
 
 // end of instrument_manager.cxx