Android: implement fgPlatformDeinitialiseInputDevices

git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1288 7f0cb862-5218-0410-a997-914c9d46530a

diff --git a/src/android/fg_init_android.c b/src/android/fg_init_android.c
index a07cedd..98ddb03 100644 (file)
--- a/src/android/fg_init_android.c
+++ b/src/android/fg_init_android.c
@@ -37,3 +37,13 @@ void fgPlatformCloseDisplay()
 {
   fghPlatformCloseDisplayEGL();
 }
+
+/**
+ * Close joystick and serial input devices
+ */
+void fgPlatformDeinitialiseInputDevices ( void )
+{
+    fghCloseInputDevices ();
+    fgState.JoysticksInitialised = GL_FALSE;
+    fgState.InputDevsInitialised = GL_FALSE;
+}

diff --git a/src/android/fg_main_android.c b/src/android/fg_main_android.c
index 597ae08..1ad6b38 100644 (file)
--- a/src/android/fg_main_android.c
+++ b/src/android/fg_main_android.c
@@ -401,8 +401,3 @@ void fgPlatformMainLoopPreliminaryWork ( void )
   /* JNI entry points need to be bundled even when linking statically */
   app_dummy();
 }
-
-void fgPlatformDeinitialiseInputDevices ( void )
-{
-  fprintf(stderr, "fgPlatformDeinitialiseInputDevices: STUB\n");
-}

diff --git a/src/android/fg_main_android.h b/src/android/fg_main_android.h
index 7a00986..5900db2 100644 (file)
--- a/src/android/fg_main_android.h
+++ b/src/android/fg_main_android.h
@@ -32,6 +32,5 @@ extern void fgPlatformDisplayWindow(SFG_Window *window);
 extern unsigned long fgPlatformSystemTime(void);
 extern void fgPlatformSleepForEvents(long msec);
 extern void fgPlatformMainLoopPreliminaryWork(void);
-extern void fgPlatformDeinitialiseInputDevices(void);
 
 #endif