Moved some of the low level scene graph construction code over to simgear.

[flightgear.git] / src / Input / input.hxx

diff --git a/src/Input/input.hxx b/src/Input/input.hxx
index 7c545d05ff91fe124f7cfc205aa4a4ff26f3b426..2ca5568a68d72bdb8739d75e4a37a5433ec855a5 100644 (file)
--- a/src/Input/input.hxx
+++ b/src/Input/input.hxx
@@ -33,9 +33,11 @@
 #include <simgear/compiler.h>
 
 #include <simgear/misc/commands.hxx>
-#include <simgear/misc/props.hxx>
+#include <simgear/props/condition.hxx>
+#include <simgear/props/props.hxx>
 
 #include <Main/fgfs.hxx>
+#include <Main/fg_props.hxx>
 #include <Main/globals.hxx>
 
 #include <map>
@@ -45,6 +47,8 @@ SG_USING_STD(map);
 SG_USING_STD(vector);
 
 
+
+
 \f
 ////////////////////////////////////////////////////////////////////////
 // General binding support.
@@ -58,7 +62,7 @@ SG_USING_STD(vector);
  * keyboard key, a joystick button or axis, or even a panel
  * instrument.</p>
  */
-class FGBinding : public FGConditional
+class FGBinding : public SGConditional
 {
 public:
 
@@ -142,9 +146,8 @@ private:
                                 // just to be safe.
   FGBinding (const FGBinding &binding);
 
-
   string _command_name;
-  SGCommandMgr::command_t _command;
+  mutable SGCommandMgr::command_t _command;
   mutable SGPropertyNode * _arg;
   mutable SGPropertyNode_ptr _setting;
 };
@@ -192,9 +195,10 @@ public:
   // Implementation of FGSubsystem.
   //
   virtual void init ();
-  virtual void bind ();
-  virtual void unbind ();
   virtual void update (double dt);
+  virtual void suspend ();
+  virtual void resume ();
+  virtual bool is_suspended () const;
 
 
   /**