X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=src%2FInstrumentation%2Finstrument_mgr.hxx;h=58d92afbef858250a9ce1746b4f825901db5d2d6;hb=ef1ec369dbd422e17efb3959821069867f58dba4;hp=6e0bf4d12a072e0cd6bc48b3272aa7af30a48581;hpb=682feb8f2d4803444b5a95d956de3979a7a7fcc7;p=flightgear.git

diff --git a/src/Instrumentation/instrument_mgr.hxx b/src/Instrumentation/instrument_mgr.hxx
index 6e0bf4d12..58d92afbe 100644
--- 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,21 +25,22 @@ 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);
+    
+    virtual void init();
+    virtual InitStatus incrementalInit();
 
 private:
-    vector<FGSubsystem *> _instruments;
-
+    bool build (SGPropertyNode* config_props);
+    
+    bool _explicitGps;
+    
+    std::vector<std::string> _instruments;
 };
 
 #endif // __INSTRUMENT_MGR_HXX