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

Expand android_app

Browse Source
This commit is contained in:
twinaphex 2015-12-02 19:28:15 +01:00
parent cfe5491b05
commit b7d7dcef1c
2 changed files with 44 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
frontend/drivers/platform_linux.h
View File

@ -71,8 +71,37 @@ bool test_permissions(const char *path);
char sdcard_dir[PATH_MAX_LENGTH];
struct android_app;
struct android_poll_source
{
/* The identifier of this source. May be LOOPER_ID_MAIN or
* LOOPER_ID_INPUT. */
int32_t id;
/* The android_app this ident is associated with. */
struct android_app* app;
/* Function to call to perform the standard processing of data from
* this source. */
void (*process)(struct android_app* app, struct android_poll_source* source);
};
struct android_app
{
/* The application can place a pointer to its own state object
* here if it likes. */
void* userData;
/* Fill this in with the function to process main app commands (APP_CMD_*) */
void (*onAppCmd)(struct android_app* app, int32_t cmd);
/* Fill this in with the function to process input events. At this point
* the event has already been pre-dispatched, and it will be finished upon
* return. Return 1 if you have handled the event, 0 for any default
* dispatching. */
int32_t (*onInputEvent)(struct android_app* app, AInputEvent* event);
/* The ANativeActivity object instance that this app is running in. */
ANativeActivity* activity;
@ -98,33 +127,37 @@ struct android_app
* receive user input events. */
AInputQueue* inputQueue;
AInputQueue* pendingInputQueue;
/* When non-NULL, this is the window surface that the app can draw in. */
ANativeWindow* window;
ANativeWindow* pendingWindow;
/* Current state of the app's activity. May be either APP_CMD_START,
* APP_CMD_RESUME, APP_CMD_PAUSE, or APP_CMD_STOP; see below. */
int activityState;
/* This is non-zero when the application's NativeActivity is being
* destroyed and waiting for the app thread to complete. */
int destroyRequested;
/* Below are "private" implementation of the glue code. */
slock_t *mutex;
scond_t *cond;
/* Current state of the app's activity. May be either APP_CMD_START,
* APP_CMD_RESUME, APP_CMD_PAUSE, or APP_CMD_STOP; see below. */
int activityState;
int msgread;
int msgwrite;
sthread_t *thread;
struct android_poll_source cmdPollSource;
struct android_poll_source inputPollSource;
int running;
int stateSaved;
int destroyed;
AInputQueue* pendingInputQueue;
ANativeWindow* pendingWindow;
/* Below are "private" implementation of RA code. */
bool unfocused;
unsigned accelerometer_event_rate;
const ASensor* accelerometerSensor;
@ -144,6 +177,7 @@ struct android_app
jmethodID getPendingIntentScreenshotsLocation;
};
enum
{
LOOPER_ID_MAIN = 1,

4
input/drivers/android_input.c
View File

@ -912,6 +912,10 @@ static void android_input_free_input(void *data)
ASensorManager_destroyEventQueue(android->sensorManager,
android->sensorEventQueue);
if (android->joypad)
android->joypad->destroy();
android->joypad = NULL;
android_keyboard_free();
free(data);
}