Minor renaming issue.

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

diff --git a/src/Input/FGJoystickInput.hxx b/src/Input/FGJoystickInput.hxx
index a59f9bbe20dc4142e889bc23640b1bc9773a3dec..1ab5a6f59ed5d82a0925319f80542cc4660ae97f 100644 (file)
--- a/src/Input/FGJoystickInput.hxx
+++ b/src/Input/FGJoystickInput.hxx
@@ -25,15 +25,14 @@
 #ifndef _FGJOYSTICKINPUT_HXX
 #define _FGJOYSTICKINPUT_HXX
 
-#ifndef __cplusplus                                                          
+#ifndef __cplusplus
 # error This library requires C++
 #endif
 
 #include "FGCommonInput.hxx"
 #include "FGButton.hxx"
-#include "FGjs.hxx"
 #include <simgear/structure/subsystem_mgr.hxx>
-
+#include <plib/js.h>
 
 ////////////////////////////////////////////////////////////////////////
 // The Joystick Input Class
@@ -45,6 +44,7 @@ public:
 
   virtual void init();
   virtual void postinit();
+  virtual void reinit();
   virtual void update( double dt );
 
   static const int MAX_JOYSTICKS        = 10;
@@ -52,6 +52,9 @@ public:
   static const int MAX_JOYSTICK_BUTTONS = 32;
 
 private:
+   void _remove(bool all);
+   SGPropertyNode_ptr status_node;
+
   /**
    * Settings for a single joystick axis.
    */
@@ -81,6 +84,7 @@ private:
     int nbuttons;
     axis * axes;
     FGButton * buttons;
+    bool predefined;    
   };
   joystick bindings[MAX_JOYSTICKS];