From f7915ab55edc83148880990cc79219642a554fb5 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Mon, 20 Jan 2014 14:59:06 +0100 Subject: [PATCH] Change param for get_sensor_input --- android/native/jni/input_android.c | 4 ++-- driver.c | 4 ++-- libretro.h | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/android/native/jni/input_android.c b/android/native/jni/input_android.c index edddf4949c..4c97fbf548 100644 --- a/android/native/jni/input_android.c +++ b/android/native/jni/input_android.c @@ -2067,12 +2067,12 @@ static bool android_input_set_sensor_state(void *data, unsigned port, enum retro return false; } -static float android_input_get_sensor_input(void *data, unsigned port, enum retro_sensor_action action) +static float android_input_get_sensor_input(void *data, unsigned port, unsigned id) { android_input_t *android = (android_input_t*)data; struct android_app *android_app = (struct android_app*)g_android; - switch (action) + switch (id) { case RETRO_DEVICE_ID_SENSOR_ACCELEROMETER_X: return android->accelerometer_state.x; diff --git a/driver.c b/driver.c index 72dbc45e89..329dd1d393 100644 --- a/driver.c +++ b/driver.c @@ -601,10 +601,10 @@ bool driver_set_sensor_state(unsigned port, enum retro_sensor_action action, uns return false; } -float driver_sensor_get_input(unsigned port, enum retro_sensor_action action) +float driver_sensor_get_input(unsigned port, unsigned id) { if (driver.input && driver.input_data && driver.input->get_sensor_input) - return driver.input->get_sensor_input(driver.input_data, port, action); + return driver.input->get_sensor_input(driver.input_data, port, id); else return 0.0f; } diff --git a/libretro.h b/libretro.h index e1e952dc09..dbbb458e0b 100755 --- a/libretro.h +++ b/libretro.h @@ -700,7 +700,7 @@ enum retro_sensor_action }; typedef bool (*retro_set_sensor_state_t)(unsigned port, enum retro_sensor_action action, unsigned rate); -typedef float (*retro_sensor_get_input_t)(unsigned port, enum retro_sensor_action action); +typedef float (*retro_sensor_get_input_t)(unsigned port, unsigned id); struct retro_sensor_interface { retro_set_sensor_state_t set_sensor_state;