Merge branch 'merge-requests/1555' into next

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

diff --git a/src/Input/FGJoystickInput.hxx b/src/Input/FGJoystickInput.hxx
index ef1530ec025497194ce8559381abc70efe8bde27..45de33f94c6d04db6440fabf20ca0c08e47713f4 100644 (file)
--- a/src/Input/FGJoystickInput.hxx
+++ b/src/Input/FGJoystickInput.hxx
@@ -25,7 +25,7 @@
 #ifndef _FGJOYSTICKINPUT_HXX
 #define _FGJOYSTICKINPUT_HXX
 
-#ifndef __cplusplus                                                          
+#ifndef __cplusplus
 # error This library requires C++
 #endif
 
@@ -44,6 +44,7 @@ public:
 
   virtual void init();
   virtual void postinit();
+  virtual void reinit();
   virtual void update( double dt );
 
   static const int MAX_JOYSTICKS        = 10;
@@ -51,6 +52,8 @@ public:
   static const int MAX_JOYSTICK_BUTTONS = 32;
 
 private:
+   void _remove(bool all);
+
   /**
    * Settings for a single joystick axis.
    */
@@ -80,6 +83,7 @@ private:
     int nbuttons;
     axis * axes;
     FGButton * buttons;
+    bool predefined;
   };
   joystick bindings[MAX_JOYSTICKS];