mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-02-22 03:40:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

(Android) Move engine_handle_cmd from input_android.c to platform_android.c

Browse Source
This commit is contained in:
twinaphex 2013-11-22 21:12:13 +01:00
parent b20e086194
commit 37fce3c56e
3 changed files with 132 additions and 132 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

146
android/native/jni/input_android.c
View File

@ -16,7 +16,6 @@
*/ */
#include <android/keycodes.h> #include <android/keycodes.h>
#include <android/sensor.h>
#include <unistd.h> #include <unistd.h>
#include <dlfcn.h> #include <dlfcn.h>
#include "input_autodetect.h" #include "input_autodetect.h"
@ -72,14 +71,11 @@ typedef struct android_input
uint64_t keycode_lut[LAST_KEYCODE]; uint64_t keycode_lut[LAST_KEYCODE];
analog_t analog_state[MAX_PADS]; analog_t analog_state[MAX_PADS];
sensor_t accelerometer_state; sensor_t accelerometer_state;
unsigned accelerometer_event_rate;
unsigned dpad_emulation[MAX_PLAYERS]; unsigned dpad_emulation[MAX_PLAYERS];
struct input_pointer pointer[MAX_TOUCH]; struct input_pointer pointer[MAX_TOUCH];
unsigned pointer_count; unsigned pointer_count;
ASensorManager* sensorManager; ASensorManager* sensorManager;
const ASensor* accelerometerSensor;
ASensorEventQueue* sensorEventQueue; ASensorEventQueue* sensorEventQueue;
uint64_t sensor_state_mask;
} android_input_t; } android_input_t;
void (*engine_handle_dpad)(void *data, AInputEvent*, size_t, int, char*, size_t, int, bool, unsigned); void (*engine_handle_dpad)(void *data, AInputEvent*, size_t, int, char*, size_t, int, bool, unsigned);
@ -92,121 +88,6 @@ static typeof(AMotionEvent_getAxisValue) *p_AMotionEvent_getAxisValue;
#define AMotionEvent_getAxisValue (*p_AMotionEvent_getAxisValue) #define AMotionEvent_getAxisValue (*p_AMotionEvent_getAxisValue)
void engine_handle_cmd(void *data)
{
struct android_app *android_app = (struct android_app*)g_android;
android_input_t *android = (android_input_t*)data;
int8_t cmd;
if (read(android_app->msgread, &cmd, sizeof(cmd)) != sizeof(cmd))
cmd = -1;
switch (cmd)
{
case APP_CMD_INPUT_CHANGED:
slock_lock(android_app->mutex);
if (android_app->inputQueue != NULL)
AInputQueue_detachLooper(android_app->inputQueue);
android_app->inputQueue = android_app->pendingInputQueue;
if (android_app->inputQueue != NULL)
{
RARCH_LOG("Attaching input queue to looper");
AInputQueue_attachLooper(android_app->inputQueue,
android_app->looper, LOOPER_ID_INPUT, NULL,
NULL);
}
scond_broadcast(android_app->cond);
slock_unlock(android_app->mutex);
break;
case APP_CMD_INIT_WINDOW:
slock_lock(android_app->mutex);
android_app->window = android_app->pendingWindow;
scond_broadcast(android_app->cond);
slock_unlock(android_app->mutex);
if (g_extern.lifecycle_state & (1ULL << RARCH_PAUSE_TOGGLE))
init_drivers();
break;
case APP_CMD_RESUME:
slock_lock(android_app->mutex);
android_app->activityState = cmd;
scond_broadcast(android_app->cond);
slock_unlock(android_app->mutex);
break;
case APP_CMD_START:
slock_lock(android_app->mutex);
android_app->activityState = cmd;
scond_broadcast(android_app->cond);
slock_unlock(android_app->mutex);
break;
case APP_CMD_PAUSE:
slock_lock(android_app->mutex);
android_app->activityState = cmd;
scond_broadcast(android_app->cond);
slock_unlock(android_app->mutex);
if (!(g_extern.lifecycle_state & (1ULL << RARCH_QUIT_KEY)))
{
RARCH_LOG("Pausing RetroArch.\n");
g_extern.lifecycle_state |= (1ULL << RARCH_PAUSE_TOGGLE);
}
break;
case APP_CMD_STOP:
slock_lock(android_app->mutex);
android_app->activityState = cmd;
scond_broadcast(android_app->cond);
slock_unlock(android_app->mutex);
break;
case APP_CMD_CONFIG_CHANGED:
break;
case APP_CMD_TERM_WINDOW:
slock_lock(android_app->mutex);
/* The window is being hidden or closed, clean it up. */
/* terminate display/EGL context here */
if (g_extern.lifecycle_state & (1ULL << RARCH_PAUSE_TOGGLE))
uninit_drivers();
else
RARCH_WARN("Window is terminated outside PAUSED state.\n");
android_app->window = NULL;
scond_broadcast(android_app->cond);
slock_unlock(android_app->mutex);
break;
case APP_CMD_GAINED_FOCUS:
g_extern.lifecycle_state &= ~(1ULL << RARCH_PAUSE_TOGGLE);
if ((android->sensor_state_mask & (1ULL << RETRO_SENSOR_ACCELEROMETER_ENABLE))
&& android->accelerometerSensor == NULL)
android_input_set_sensor_state(android, 0, RETRO_SENSOR_ACCELEROMETER_ENABLE,
android->accelerometer_event_rate);
break;
case APP_CMD_LOST_FOCUS:
// Avoid draining battery while app is not being used
if ((android->sensor_state_mask & (1ULL << RETRO_SENSOR_ACCELEROMETER_ENABLE))
&& android->accelerometerSensor != NULL)
android_input_set_sensor_state(android, 0, RETRO_SENSOR_ACCELEROMETER_DISABLE,
android->accelerometer_event_rate);
break;
case APP_CMD_DESTROY:
g_extern.lifecycle_state |= (1ULL << RARCH_QUIT_KEY);
break;
}
}
static void engine_handle_dpad_default(void *data, AInputEvent *event, static void engine_handle_dpad_default(void *data, AInputEvent *event,
size_t motion_pointer, int state_id, char *msg, size_t msg_sizeof, size_t motion_pointer, int state_id, char *msg, size_t msg_sizeof,
int source, bool debug_enable, unsigned emulation) int source, bool debug_enable, unsigned emulation)
@ -1733,6 +1614,7 @@ static void android_input_poll(void *data)
int ident; int ident;
uint64_t lifecycle_mask = (1ULL << RARCH_RESET) | (1ULL << RARCH_REWIND) | (1ULL << RARCH_FAST_FORWARD_KEY) | (1ULL << RARCH_FAST_FORWARD_HOLD_KEY) | (1ULL << RARCH_MUTE) | (1ULL << RARCH_SAVE_STATE_KEY) | (1ULL << RARCH_LOAD_STATE_KEY) | (1ULL << RARCH_STATE_SLOT_PLUS) | (1ULL << RARCH_STATE_SLOT_MINUS) | (1ULL << RARCH_QUIT_KEY) | (1ULL << RARCH_MENU_TOGGLE); uint64_t lifecycle_mask = (1ULL << RARCH_RESET) | (1ULL << RARCH_REWIND) | (1ULL << RARCH_FAST_FORWARD_KEY) | (1ULL << RARCH_FAST_FORWARD_HOLD_KEY) | (1ULL << RARCH_MUTE) | (1ULL << RARCH_SAVE_STATE_KEY) | (1ULL << RARCH_LOAD_STATE_KEY) | (1ULL << RARCH_STATE_SLOT_PLUS) | (1ULL << RARCH_STATE_SLOT_MINUS) | (1ULL << RARCH_QUIT_KEY) | (1ULL << RARCH_MENU_TOGGLE);
uint64_t *lifecycle_state = &g_extern.lifecycle_state; uint64_t *lifecycle_state = &g_extern.lifecycle_state;
struct android_app *android_app = (struct android_app*)g_android;
android_input_t *android = (android_input_t*)data; android_input_t *android = (android_input_t*)data;
*lifecycle_state &= ~lifecycle_mask; *lifecycle_state &= ~lifecycle_mask;
@ -1742,7 +1624,6 @@ static void android_input_poll(void *data)
if (ident == LOOPER_ID_INPUT) if (ident == LOOPER_ID_INPUT)
{ {
bool debug_enable = g_settings.input.debug_enable; bool debug_enable = g_settings.input.debug_enable;
struct android_app *android_app = (struct android_app*)g_android;
AInputEvent* event = NULL; AInputEvent* event = NULL;
// Read all pending events. // Read all pending events.
@ -1958,7 +1839,7 @@ static void android_input_poll(void *data)
} }
else if (ident == LOOPER_ID_USER) else if (ident == LOOPER_ID_USER)
{ {
if (android->sensor_state_mask & (1ULL << RETRO_SENSOR_ACCELEROMETER_ENABLE)) if (android_app->sensor_state_mask & (1ULL << RETRO_SENSOR_ACCELEROMETER_ENABLE))
{ {
ASensorEvent event; ASensorEvent event;
while (ASensorEventQueue_getEvents(android->sensorEventQueue, &event, 1) > 0) while (ASensorEventQueue_getEvents(android->sensorEventQueue, &event, 1) > 0)
@ -2070,7 +1951,7 @@ static void android_input_enable_sensor_manager(void *data)
struct android_app *android_app = (struct android_app*)g_android; struct android_app *android_app = (struct android_app*)g_android;
android->sensorManager = ASensorManager_getInstance(); android->sensorManager = ASensorManager_getInstance();
android->accelerometerSensor = ASensorManager_getDefaultSensor(android->sensorManager, android_app->accelerometerSensor = ASensorManager_getDefaultSensor(android->sensorManager,
ASENSOR_TYPE_ACCELEROMETER); ASENSOR_TYPE_ACCELEROMETER);
android->sensorEventQueue = ASensorManager_createEventQueue(android->sensorManager, android->sensorEventQueue = ASensorManager_createEventQueue(android->sensorManager,
android_app->looper, LOOPER_ID_USER, NULL, NULL); android_app->looper, LOOPER_ID_USER, NULL, NULL);
@ -2079,6 +1960,7 @@ static void android_input_enable_sensor_manager(void *data)
static bool android_input_set_sensor_state(void *data, unsigned port, enum retro_sensor_action action, unsigned event_rate) static bool android_input_set_sensor_state(void *data, unsigned port, enum retro_sensor_action action, unsigned event_rate)
{ {
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;
if (event_rate == 0) if (event_rate == 0)
event_rate = 60; event_rate = 60;
@ -2086,34 +1968,34 @@ static bool android_input_set_sensor_state(void *data, unsigned port, enum retro
switch (action) switch (action)
{ {
case RETRO_SENSOR_ACCELEROMETER_ENABLE: case RETRO_SENSOR_ACCELEROMETER_ENABLE:
if (android->sensor_state_mask & if (android_app->sensor_state_mask &
(1ULL << RETRO_SENSOR_ACCELEROMETER_ENABLE)) (1ULL << RETRO_SENSOR_ACCELEROMETER_ENABLE))
return true; return true;
if (android->accelerometerSensor == NULL) if (android_app->accelerometerSensor == NULL)
android_input_enable_sensor_manager(android); android_input_enable_sensor_manager(android);
ASensorEventQueue_enableSensor(android->sensorEventQueue, ASensorEventQueue_enableSensor(android->sensorEventQueue,
android->accelerometerSensor); android_app->accelerometerSensor);
// events per second (in us). // events per second (in us).
ASensorEventQueue_setEventRate(android->sensorEventQueue, ASensorEventQueue_setEventRate(android->sensorEventQueue,
android->accelerometerSensor, (1000L / event_rate) * 1000); android_app->accelerometerSensor, (1000L / event_rate) * 1000);
android->sensor_state_mask &= ~(1ULL << RETRO_SENSOR_ACCELEROMETER_DISABLE); android_app->sensor_state_mask &= ~(1ULL << RETRO_SENSOR_ACCELEROMETER_DISABLE);
android->sensor_state_mask |= (1ULL << RETRO_SENSOR_ACCELEROMETER_ENABLE); android_app->sensor_state_mask |= (1ULL << RETRO_SENSOR_ACCELEROMETER_ENABLE);
return true; return true;
case RETRO_SENSOR_ACCELEROMETER_DISABLE: case RETRO_SENSOR_ACCELEROMETER_DISABLE:
if (android->sensor_state_mask & if (android_app->sensor_state_mask &
(1ULL << RETRO_SENSOR_ACCELEROMETER_DISABLE)) (1ULL << RETRO_SENSOR_ACCELEROMETER_DISABLE))
return true; return true;
ASensorEventQueue_disableSensor(android->sensorEventQueue, ASensorEventQueue_disableSensor(android->sensorEventQueue,
android->accelerometerSensor); android_app->accelerometerSensor);
android->sensor_state_mask &= ~(1ULL << RETRO_SENSOR_ACCELEROMETER_ENABLE); android_app->sensor_state_mask &= ~(1ULL << RETRO_SENSOR_ACCELEROMETER_ENABLE);
android->sensor_state_mask |= (1ULL << RETRO_SENSOR_ACCELEROMETER_DISABLE); android_app->sensor_state_mask |= (1ULL << RETRO_SENSOR_ACCELEROMETER_DISABLE);
return true; return true;
default: default:

114
frontend/platform/platform_android.c
View File

@ -36,6 +36,120 @@ static void system_deinit(void *data);
static void system_shutdown(bool unused); static void system_shutdown(bool unused);
extern void android_app_entry(void *args); extern void android_app_entry(void *args);
void engine_handle_cmd(void *data)
{
struct android_app *android_app = (struct android_app*)g_android;
int8_t cmd;
if (read(android_app->msgread, &cmd, sizeof(cmd)) != sizeof(cmd))
cmd = -1;
switch (cmd)
{
case APP_CMD_INPUT_CHANGED:
slock_lock(android_app->mutex);
if (android_app->inputQueue)
AInputQueue_detachLooper(android_app->inputQueue);
android_app->inputQueue = android_app->pendingInputQueue;
if (android_app->inputQueue)
{
RARCH_LOG("Attaching input queue to looper");
AInputQueue_attachLooper(android_app->inputQueue,
android_app->looper, LOOPER_ID_INPUT, NULL,
NULL);
}
scond_broadcast(android_app->cond);
slock_unlock(android_app->mutex);
break;
case APP_CMD_INIT_WINDOW:
slock_lock(android_app->mutex);
android_app->window = android_app->pendingWindow;
scond_broadcast(android_app->cond);
slock_unlock(android_app->mutex);
if (g_extern.lifecycle_state & (1ULL << RARCH_PAUSE_TOGGLE))
init_drivers();
break;
case APP_CMD_RESUME:
slock_lock(android_app->mutex);
android_app->activityState = cmd;
scond_broadcast(android_app->cond);
slock_unlock(android_app->mutex);
break;
case APP_CMD_START:
slock_lock(android_app->mutex);
android_app->activityState = cmd;
scond_broadcast(android_app->cond);
slock_unlock(android_app->mutex);
break;
case APP_CMD_PAUSE:
slock_lock(android_app->mutex);
android_app->activityState = cmd;
scond_broadcast(android_app->cond);
slock_unlock(android_app->mutex);
if (!(g_extern.lifecycle_state & (1ULL << RARCH_QUIT_KEY)))
{
RARCH_LOG("Pausing RetroArch.\n");
g_extern.lifecycle_state |= (1ULL << RARCH_PAUSE_TOGGLE);
}
break;
case APP_CMD_STOP:
slock_lock(android_app->mutex);
android_app->activityState = cmd;
scond_broadcast(android_app->cond);
slock_unlock(android_app->mutex);
break;
case APP_CMD_CONFIG_CHANGED:
break;
case APP_CMD_TERM_WINDOW:
slock_lock(android_app->mutex);
/* The window is being hidden or closed, clean it up. */
/* terminate display/EGL context here */
if (g_extern.lifecycle_state & (1ULL << RARCH_PAUSE_TOGGLE))
uninit_drivers();
else
RARCH_WARN("Window is terminated outside PAUSED state.\n");
android_app->window = NULL;
scond_broadcast(android_app->cond);
slock_unlock(android_app->mutex);
break;
case APP_CMD_GAINED_FOCUS:
g_extern.lifecycle_state &= ~(1ULL << RARCH_PAUSE_TOGGLE);
if ((android_app->sensor_state_mask & (1ULL << RETRO_SENSOR_ACCELEROMETER_ENABLE))
&& android_app->accelerometerSensor == NULL)
android_input_set_sensor_state(driver.input_data, 0, RETRO_SENSOR_ACCELEROMETER_ENABLE,
android_app->accelerometer_event_rate);
break;
case APP_CMD_LOST_FOCUS:
// Avoid draining battery while app is not being used
if ((android_app->sensor_state_mask & (1ULL << RETRO_SENSOR_ACCELEROMETER_ENABLE))
&& android_app->accelerometerSensor != NULL)
android_input_set_sensor_state(driver.input_data, 0, RETRO_SENSOR_ACCELEROMETER_DISABLE,
android_app->accelerometer_event_rate);
break;
case APP_CMD_DESTROY:
g_extern.lifecycle_state |= (1ULL << RARCH_QUIT_KEY);
break;
}
}
static inline void android_app_write_cmd (void *data, int8_t cmd) static inline void android_app_write_cmd (void *data, int8_t cmd)
{ {
struct android_app *android_app = (struct android_app*)data; struct android_app *android_app = (struct android_app*)data;

4
frontend/platform/platform_android.h
View File

@ -24,6 +24,7 @@
#include <android/looper.h> #include <android/looper.h>
#include <android/native_activity.h> #include <android/native_activity.h>
#include <android/window.h> #include <android/window.h>
#include <android/sensor.h>
#include "../../thread.h" #include "../../thread.h"
@ -41,6 +42,9 @@ struct android_app
int msgread; int msgread;
int msgwrite; int msgwrite;
int running; int running;
unsigned accelerometer_event_rate;
const ASensor* accelerometerSensor;
uint64_t sensor_state_mask;
sthread_t *thread; sthread_t *thread;
char current_ime[PATH_MAX]; char current_ime[PATH_MAX];
}; };