NavDisplay enhancements for Syd.

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

diff --git a/src/Instrumentation/clock.hxx b/src/Instrumentation/clock.hxx
index 0e35f0441dca13211fdc359fef955aa4d1b92ef4..f4fcba84641a48d1e85fa79fb1ba6ee61ab26888 100644 (file)
--- a/src/Instrumentation/clock.hxx
+++ b/src/Instrumentation/clock.hxx
@@ -9,10 +9,6 @@
 #ifndef __INSTRUMENTS_CLOCK_HXX
 #define __INSTRUMENTS_CLOCK_HXX 1
 
-#ifndef __cplusplus
-# error This library requires C++
-#endif
-
 #include <simgear/props/props.hxx>
 #include <simgear/structure/subsystem_mgr.hxx>
 
@@ -30,31 +26,39 @@
  * /instrumentation/clock/indicated-sec
  * /instrumentation/clock/indicated-string
  */
-class Clock : public SGSubsystem
-{
-
+class Clock : public SGSubsystem {
 public:
+    Clock(SGPropertyNode *node);
+    virtual ~Clock();
 
-    Clock ();
-    virtual ~Clock ();
-
-    virtual void init ();
-    virtual void update (double dt);
+    virtual void init();
+    virtual void update(double dt);
 
 private:
+    std::string _name;
+    unsigned int _num;
 
     bool _is_serviceable;
     long _gmt_time_sec;
     long _offset_sec;
     long _indicated_sec;
+    long _indicated_min;
+    long _indicated_hour;
+    long _local_hour;
     char _indicated_string[16];
+    char _indicated_short_string[16];
+    char _local_short_string[16];
     long _standstill_offset;
 
     SGPropertyNode_ptr _serviceable_node;
     SGPropertyNode_ptr _offset_node;
     SGPropertyNode_ptr _sec_node;
+    SGPropertyNode_ptr _hour_node;
+    SGPropertyNode_ptr _lhour_node;
+    SGPropertyNode_ptr _min_node;
     SGPropertyNode_ptr _string_node;
-
+    SGPropertyNode_ptr _string_node1;
+    SGPropertyNode_ptr _string_node2;
 };
 
 #endif // __INSTRUMENTS_CLOCK_HXX