From: <be...@us...> - 2012-06-09 18:02:39
|
Revision: 1336 http://freeglut.svn.sourceforge.net/freeglut/?rev=1336&view=rev Author: beuc Date: 2012-06-09 18:02:33 +0000 (Sat, 09 Jun 2012) Log Message: ----------- Call Pause/Resume callbacks from Android Modified Paths: -------------- trunk/freeglut/freeglut/src/android/fg_main_android.c Modified: trunk/freeglut/freeglut/src/android/fg_main_android.c =================================================================== --- trunk/freeglut/freeglut/src/android/fg_main_android.c 2012-06-09 17:49:27 UTC (rev 1335) +++ trunk/freeglut/freeglut/src/android/fg_main_android.c 2012-06-09 18:02:33 UTC (rev 1336) @@ -452,6 +452,8 @@ /* If we're not in RESUME state, Android paused us, so wait */ struct android_app* app = fgDisplay.pDisplay.app; if (app->destroyRequested != 1 && app->activityState != APP_CMD_RESUME) { + INVOKE_WCB(*window, Pause, ()); + int FOREVER = -1; while (app->destroyRequested != 1 && (app->activityState != APP_CMD_RESUME)) { if ((ident=ALooper_pollOnce(FOREVER, NULL, &events, (void**)&source)) >= 0) { @@ -472,11 +474,12 @@ we'll be paused but not stopped, and keep the current surface; in which case fgPlatformOpenWindow will no-op. */ fgPlatformOpenWindow(window, "", GL_FALSE, 0, 0, GL_FALSE, 0, 0, GL_FALSE, GL_FALSE); - /* TODO: INVOKE_WCB(*window, Pause?); */ - /* TODO: INVOKE_WCB(*window, Resume?); */ + if (!FETCH_WCB(*window, InitContext)) fgWarning("Resuming application, but no callback to reload context resources (glutInitContextFunc)"); } + + INVOKE_WCB(*window, Resume, ()); } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |