CTCaer/RetroArch
1
0
Fork 0
mirror of https://github.com/CTCaer/RetroArch.git synced 2025-02-12 06:51:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

(Android) Buildfix

Browse Source
This commit is contained in:
twinaphex 2015-03-18 20:26:55 +01:00
parent 5976da19c4
commit 1e9725a302
3 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gfx/drivers_context/androidegl_ctx.c
View File

@ -86,7 +86,7 @@ static void android_gfx_ctx_destroy_resources(gfx_ctx_android_data_t *android)
static void android_gfx_ctx_destroy(void *data)
{
driver_t *driver = driver_get_ptr;
driver_t *driver = driver_get_ptr();
gfx_ctx_android_data_t *android = NULL;
android = (gfx_ctx_android_data_t*)driver->video_context_data;

8
input/drivers/android_input.c
View File

@ -632,9 +632,10 @@ static void android_input_poll(void *data)
int ident;
struct android_app *android_app = (struct android_app*)g_android;
android_input_t *android = (android_input_t*)data;
driver_t *driver = driver_get_ptr();
while ((ident =
ALooper_pollAll((driver.input->key_pressed(driver.input_data, RARCH_PAUSE_TOGGLE))
ALooper_pollAll((driver->input->key_pressed(driver->input_data, RARCH_PAUSE_TOGGLE))
? -1 : 0,
NULL, NULL, NULL)) >= 0)
{
@ -693,7 +694,7 @@ static void android_input_poll(void *data)
}
}
else if (ident == LOOPER_ID_MAIN)
engine_handle_cmd(driver.input_data);
engine_handle_cmd(driver->input_data);
}
}
@ -743,10 +744,11 @@ static int16_t android_input_state(void *data,
static bool android_input_key_pressed(void *data, int key)
{
driver_t *driver = driver_get_ptr();
android_input_t *android = (android_input_t*)data;
if (!android)
return false;
return ((g_extern.lifecycle_state | driver.overlay_state.buttons)
return ((g_extern.lifecycle_state | driver->overlay_state.buttons)
& (1ULL << key)) || input_joypad_pressed(android->joypad,
0, g_settings.input.binds[0], key);
}

9
input/drivers_joypad/android_input_joypad.c
View File

@ -55,8 +55,9 @@ static bool android_joypad_init(void)
static bool android_joypad_button(unsigned port, uint16_t joykey)
{
android_input_t *android = (android_input_t*)driver.input_data;
uint8_t *buf = NULL;
driver_t *driver = driver_get_ptr();
android_input_t *android = (android_input_t*)driver->input_data;
if (!android || port >= MAX_PADS)
return false;
@ -93,7 +94,8 @@ static int16_t android_joypad_axis(unsigned port, uint32_t joyaxis)
int axis = -1;
bool is_neg = false;
bool is_pos = false;
android_input_t *android = (android_input_t*)driver.input_data;
driver_t *driver = driver_get_ptr();
android_input_t *android = (android_input_t*)driver->input_data;
if (!android || joyaxis == AXIS_NONE || port >= MAX_PADS)
return 0;
@ -125,7 +127,8 @@ static void android_joypad_poll(void)
static bool android_joypad_query_pad(unsigned pad)
{
android_input_t *android = (android_input_t*)driver.input_data;
driver_t *driver = driver_get_ptr();
android_input_t *android = (android_input_t*)driver->input_data;
return (pad < MAX_USERS && pad < android->pads_connected);
}