X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=Joystick%2Fjoystick.hxx;h=23bebedc634f58746564b3f427d6fb9f39c81894;hb=12b31bb051e84e9a081895cda15c8a9d9c2eba8c;hp=d264283560e37dabdccc703c0346dd284c6dbe75;hpb=b17f3b1b289afc352fd91fe4408c7ff1c0d47c24;p=flightgear.git

diff --git a/Joystick/joystick.hxx b/Joystick/joystick.hxx
index d26428356..23bebedc6 100644
--- a/Joystick/joystick.hxx
+++ b/Joystick/joystick.hxx
@@ -1,62 +1,66 @@
-/**************************************************************************
- * joystick.h -- joystick support
- *
- * Written by Michele America, started September 1997.
- *
- * Copyright (C) 1997  Michele F. America  - nomimarketing@mail.telepac.pt
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- * $Id$
- * (Log is kept at end of this file)
- **************************************************************************/
-
-
-#ifndef _JOYSTICK_H
-#define _JOYSTICK_H
-
-
-#ifdef __cplusplus                                                          
-extern "C" {                            
-#endif                                   
-
-
-int fgJoystickInit( int joy_num );
-int fgJoystickRead( double *joy_x, double *joy_y, int *joy_b1, int *joy_b2 );
-
-
-#ifdef __cplusplus
-}
+// joystick.cxx -- joystick support
+//
+// Written by Curtis Olson, started October 1998.
+//
+// Copyright (C) 1998  Curtis L. Olson - curt@me.umn.edu
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License as
+// published by the Free Software Foundation; either version 2 of the
+// License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful, but
+// WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+//
+// $Id$
+// (Log is kept at end of this file)
+
+
+#ifndef _JOYSTICK_HXX
+#define _JOYSTICK_HXX
+
+
+#ifndef __cplusplus
+# error This library requires C++
 #endif
 
 
-#endif /* _JOYSTICK_H */
-
-
-/* $Log$
-/* Revision 1.1  1998/10/24 22:28:18  curt
-/* Renamed joystick.[ch] to joystick.[ch]xx
-/* Added js.hxx which is Steve's joystick interface class.
-/*
- * Revision 1.3  1998/04/22 13:26:21  curt
- * C++ - ifing the code a bit.
- *
- * Revision 1.2  1998/01/22 02:59:36  curt
- * Changed #ifdef FILE_H to #ifdef _FILE_H
- *
- * Revision 1.1  1997/08/29 18:06:55  curt
- * Initial revision.
- *
- */
+// Initialize the joystick(s)
+int fgJoystickInit( void );
+
+#if defined( ENABLE_LINUX_JOYSTICK )
+    // update the control parameters based on joystick intput
+    int fgJoystickRead( void );
+#endif // ENABLE_LINUX_JOYSTICK
+
+
+#endif // _JOYSTICK_HXX
+
+
+// $Log$
+// Revision 1.3  1998/10/27 02:14:33  curt
+// Changes to support GLUT joystick routines as fall back.
+//
+// Revision 1.2  1998/10/25 10:56:27  curt
+// Completely rewritten to use Steve Baker's joystick interface class.
+//
+// Revision 1.1  1998/10/24 22:28:18  curt
+// Renamed joystick.[ch] to joystick.[ch]xx
+// Added js.hxx which is Steve's joystick interface class.
+//
+// Revision 1.3  1998/04/22 13:26:21  curt
+// C++ - ifing the code a bit.
+//
+// Revision 1.2  1998/01/22 02:59:36  curt
+// Changed #ifdef FILE_H to #ifdef _FILE_H
+//
+// Revision 1.1  1997/08/29 18:06:55  curt
+// Initial revision.
+//
+