ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

(Android) Rewrite activity_paused logic

This commit is contained in:
twinaphex 2012-12-17 20:07:08 +01:00
parent 74ae6ecf57
commit 918052f5ba
3 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
android/native/jni/android_general.h
View File

@ -34,7 +34,6 @@ struct droid
unsigned height; unsigned height;
struct saved_state state; struct saved_state state;
int32_t last_orient; int32_t last_orient;
unsigned activity_paused;
float disp_refresh_rate; float disp_refresh_rate;
}; };

7
android/native/jni/main.c
View File

@ -163,8 +163,7 @@ void engine_handle_cmd(struct android_app* android_app, int32_t cmd)
/* POSTEXEC */ /* POSTEXEC */
free_saved_state(android_app); free_saved_state(android_app);
g_android.activity_paused = false; g_extern.lifecycle_state &= ~(1ULL << RARCH_PAUSE_TOGGLE);
break; break;
case APP_CMD_START: case APP_CMD_START:
RARCH_LOG("engine_handle_cmd: APP_CMD_START.\n"); RARCH_LOG("engine_handle_cmd: APP_CMD_START.\n");
@ -191,7 +190,7 @@ void engine_handle_cmd(struct android_app* android_app, int32_t cmd)
/* Setting reentrancy */ /* Setting reentrancy */
RARCH_LOG("Setting up RetroArch re-entrancy...\n"); RARCH_LOG("Setting up RetroArch re-entrancy...\n");
g_extern.lifecycle_state |= (1ULL << RARCH_REENTRANT); g_extern.lifecycle_state |= (1ULL << RARCH_REENTRANT);
g_android.activity_paused = true; g_extern.lifecycle_state |= (1ULL << RARCH_PAUSE_TOGGLE);
} }
break; break;
case APP_CMD_STOP: case APP_CMD_STOP:
@ -260,7 +259,7 @@ bool android_run_events(struct android_app* android_app)
RARCH_LOG("RetroArch Android paused.\n"); RARCH_LOG("RetroArch Android paused.\n");
// Block forever waiting for events. // Block forever waiting for events.
while ((id = ALooper_pollOnce(g_android.activity_paused ? -1 : 100, NULL, 0, NULL)) >= 0) while ((id = ALooper_pollOnce(input_key_pressed_func(RARCH_PAUSE_TOGGLE) ? -1 : 100, NULL, 0, NULL)) >= 0)
{ {
// Process this event. // Process this event.
if (id) if (id)

2
retroarch.c
View File

@ -2776,7 +2776,7 @@ bool rarch_main_iterate(void)
} }
#ifdef ANDROID #ifdef ANDROID
if (g_android.activity_paused) if (input_key_pressed_func(RARCH_PAUSE_TOGGLE))
return android_run_events(g_android.app); return android_run_events(g_android.app);
#endif #endif