libretro/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch.git synced 2024-11-25 08:59:58 +00:00
Code Issues Actions 23 Packages Projects Releases Wiki Activity

(Android) Cleanups

Browse Source
This commit is contained in:
twinaphex 2015-05-02 00:43:24 +02:00
parent a9aab62169
commit 2f08c143ec
2 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
frontend/drivers/platform_android.c
View File

@ -68,7 +68,7 @@ void android_main(struct android_app *android_app)
{
char *argv[1];
int argc = 0;
int ret_iterate;
int ret_iterate, ret_poll;
g_android = android_app;
g_android_userdata = (struct android_app_userdata*)calloc(1, sizeof(*g_android_userdata));
@ -77,8 +77,9 @@ void android_main(struct android_app *android_app)
goto end;
do{
ret_poll = 0;
ret_iterate = rarch_main_iterate();
}while(ret_iterate != 1);
}while(ret_iterate != -1 && ret_poll != -1);
end:
main_exit(android_app);

16
input/drivers/android_input.c
View File

@ -113,7 +113,7 @@ static void engine_handle_dpad_getaxisvalue(
state->analog_state[port][9] = (int16_t)(gas * 32767.0f);
}
static void engine_handle_cmd(void)
void engine_handle_cmd(void)
{
struct android_app *android_app = (struct android_app*)g_android;
struct android_app_userdata *userdata = (struct android_app_userdata*)g_android_userdata;
@ -586,7 +586,7 @@ static void android_input_handle_input(android_input_state_t *android)
}
}
static void android_input_handle_user(android_input_state_t *state)
void android_input_handle_user(android_input_state_t *state)
{
struct android_app_userdata *userdata = (struct android_app_userdata*)g_android_userdata;
@ -604,15 +604,14 @@ static void android_input_handle_user(android_input_state_t *state)
}
}
/* Handle all events. If our activity is in pause state,
* block until we're unpaused.
*/
static void android_input_poll(void *data)
void android_main_poll(void *data)
{
int ident;
android_input_t *android = (android_input_t*)data;
struct android_app_userdata *userdata = (struct android_app_userdata*)g_android_userdata;
/* Handle all events. If our activity is in pause state,
* block until we're unpaused. */
while ((ident =
ALooper_pollAll((input_driver_key_pressed(RARCH_PAUSE_TOGGLE))
? -1 : 0,
@ -635,6 +634,11 @@ static void android_input_poll(void *data)
memcpy(&android->copy, &userdata->thread_state, sizeof(android->copy));
}
static void android_input_poll(void *data)
{
android_main_poll(data);
}
bool android_run_events(void *data)
{
global_t *global = global_get_ptr();