Change param for get_sensor_input

This commit is contained in:
twinaphex 2014-01-20 14:59:06 +01:00
parent 460670f074
commit f7915ab55e
3 changed files with 5 additions and 5 deletions

View File

@ -2067,12 +2067,12 @@ static bool android_input_set_sensor_state(void *data, unsigned port, enum retro
return false; 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; android_input_t *android = (android_input_t*)data;
struct android_app *android_app = (struct android_app*)g_android; struct android_app *android_app = (struct android_app*)g_android;
switch (action) switch (id)
{ {
case RETRO_DEVICE_ID_SENSOR_ACCELEROMETER_X: case RETRO_DEVICE_ID_SENSOR_ACCELEROMETER_X:
return android->accelerometer_state.x; return android->accelerometer_state.x;

View File

@ -601,10 +601,10 @@ bool driver_set_sensor_state(unsigned port, enum retro_sensor_action action, uns
return false; 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) 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 else
return 0.0f; return 0.0f;
} }

View File

@ -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 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 struct retro_sensor_interface
{ {
retro_set_sensor_state_t set_sensor_state; retro_set_sensor_state_t set_sensor_state;