A couple more straggling instrumentation clean ups.

[flightgear.git] / src / Instrumentation / instrument_mgr.hxx

diff --git a/src/Instrumentation/instrument_mgr.hxx b/src/Instrumentation/instrument_mgr.hxx
index 6e0bf4d12a072e0cd6bc48b3272aa7af30a48581..88a9c8bed656fd7a0a2dddd51103869aa9f8c524 100644 (file)
--- a/src/Instrumentation/instrument_mgr.hxx
+++ b/src/Instrumentation/instrument_mgr.hxx
@@ -16,12 +16,7 @@
 #endif
 
 #include <simgear/compiler.h>
-
-#include <Main/fgfs.hxx>
-
-#include <vector>
-
-SG_USING_STD(vector);
+#include <simgear/structure/subsystem_mgr.hxx>
 
 
 /**
@@ -30,20 +25,17 @@ SG_USING_STD(vector);
  * In the initial draft, the instruments present are hard-coded, but they
  * will soon be configurable for individual aircraft.
  */
-class FGInstrumentMgr : public FGSubsystem
+class FGInstrumentMgr : public SGSubsystemGroup
 {
 public:
 
     FGInstrumentMgr ();
     virtual ~FGInstrumentMgr ();
-
-    virtual void init ();
-    virtual void bind ();
-    virtual void unbind ();
-    virtual void update (double dt);
+    bool build ();
 
 private:
-    vector<FGSubsystem *> _instruments;
+    SGPropertyNode *config_props;
+    bool enabled;
 
 };