Merge branch 'maint'

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

diff --git a/src/Instrumentation/vertical_speed_indicator.hxx b/src/Instrumentation/vertical_speed_indicator.hxx
index 007d8ace5ba9bd289d54973cbaf565d5dc2e7e05..2b6a930d432a9c2dd285ac04f191e34bcd548024 100644 (file)
--- a/src/Instrumentation/vertical_speed_indicator.hxx
+++ b/src/Instrumentation/vertical_speed_indicator.hxx
@@ -12,8 +12,7 @@
 #endif
 
 #include <simgear/props/props.hxx>
-
-#include <Main/fgfs.hxx>
+#include <simgear/structure/subsystem_mgr.hxx>
 
 
 /**
@@ -21,19 +20,19 @@
  *
  * Input properties:
  *
- * /instrumentation/vertical-speed-indicator/serviceable
- * /systems/static[0]/pressure-inhg
+ * /instrumentation/"name"/serviceable
+ * "static_port"/pressure-inhg
  *
  * Output properties:
  *
- * /instrumentation/vertical-speed-indicator/indicated-speed-fpm
+ * /instrumentation/"name"/indicated-speed-fpm
  */
-class VerticalSpeedIndicator : public FGSubsystem
+class VerticalSpeedIndicator : public SGSubsystem
 {
 
 public:
 
-    VerticalSpeedIndicator ();
+    VerticalSpeedIndicator ( SGPropertyNode *node );
     virtual ~VerticalSpeedIndicator ();
 
     virtual void init ();
@@ -43,6 +42,10 @@ private:
 
     double _internal_pressure_inhg;
 
+    string _name;
+    int _num;
+    string _static_pressure;
+
     SGPropertyNode_ptr _serviceable_node;
     SGPropertyNode_ptr _pressure_node;
     SGPropertyNode_ptr _speed_node;