From c930677a2769c04b32a105631c884b50337833ab Mon Sep 17 00:00:00 2001 From: beuc Date: Thu, 3 May 2012 07:58:00 +0000 Subject: [PATCH] Android: implement fgPlatformDeinitialiseInputDevices git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1288 7f0cb862-5218-0410-a997-914c9d46530a --- freeglut/freeglut/src/android/fg_init_android.c | 10 ++++++++++ freeglut/freeglut/src/android/fg_main_android.c | 5 ----- freeglut/freeglut/src/android/fg_main_android.h | 1 - 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/freeglut/freeglut/src/android/fg_init_android.c b/freeglut/freeglut/src/android/fg_init_android.c index a07cedd..98ddb03 100644 --- a/freeglut/freeglut/src/android/fg_init_android.c +++ b/freeglut/freeglut/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/freeglut/freeglut/src/android/fg_main_android.c b/freeglut/freeglut/src/android/fg_main_android.c index 597ae08..1ad6b38 100644 --- a/freeglut/freeglut/src/android/fg_main_android.c +++ b/freeglut/freeglut/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/freeglut/freeglut/src/android/fg_main_android.h b/freeglut/freeglut/src/android/fg_main_android.h index 7a00986..5900db2 100644 --- a/freeglut/freeglut/src/android/fg_main_android.h +++ b/freeglut/freeglut/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