From 94e1148d511d0bc213b55d6efe06f458b8305991 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Wed, 9 Dec 2015 20:15:55 +0100 Subject: [PATCH] Cleanups --- frontend/drivers/platform_linux.c | 25 +++++-------------------- 1 file changed, 5 insertions(+), 20 deletions(-) diff --git a/frontend/drivers/platform_linux.c b/frontend/drivers/platform_linux.c index 9ebd83e3ee..51495bdd43 100644 --- a/frontend/drivers/platform_linux.c +++ b/frontend/drivers/platform_linux.c @@ -529,10 +529,8 @@ char ext_dir[PATH_MAX_LENGTH]; /* forward declaration */ bool android_run_events(void *data); -static INLINE void android_app_write_cmd(void *data, int8_t cmd) +static INLINE void android_app_write_cmd(struct android_app *android_app, int8_t cmd) { - struct android_app *android_app = (struct android_app*)data; - if (!android_app) return; @@ -540,10 +538,8 @@ static INLINE void android_app_write_cmd(void *data, int8_t cmd) RARCH_ERR("Failure writing android_app cmd: %s\n", strerror(errno)); } -static void android_app_set_input(void *data, AInputQueue* inputQueue) +static void android_app_set_input(struct android_app *android_app, AInputQueue* inputQueue) { - struct android_app *android_app = (struct android_app*)data; - if (!android_app) return; @@ -557,10 +553,8 @@ static void android_app_set_input(void *data, AInputQueue* inputQueue) slock_unlock(android_app->mutex); } -static void android_app_set_window(void *data, ANativeWindow* window) +static void android_app_set_window(struct android_app *android_app, ANativeWindow* window) { - struct android_app *android_app = (struct android_app*)data; - if (!android_app) return; @@ -672,21 +666,14 @@ static void onStop(ANativeActivity* activity) static void onConfigurationChanged(ANativeActivity *activity) { - struct android_app* android_app = (struct android_app*) - activity->instance; - - if (!android_app) - return; - RARCH_LOG("ConfigurationChanged: %p\n", activity); - android_app_write_cmd(android_app, APP_CMD_CONFIG_CHANGED); + android_app_write_cmd((struct android_app*)activity->instance, APP_CMD_CONFIG_CHANGED); } static void onLowMemory(ANativeActivity* activity) { - struct android_app* android_app = (struct android_app*)activity->instance; RARCH_LOG("LowMemory: %p\n", activity); - android_app_write_cmd(android_app, APP_CMD_LOW_MEMORY); + android_app_write_cmd((struct android_app*)activity->instance, APP_CMD_LOW_MEMORY); } static void onWindowFocusChanged(ANativeActivity* activity, int focused) @@ -857,8 +844,6 @@ void ANativeActivity_onCreate(ANativeActivity* activity, activity->instance = android_app_create(activity, savedState, savedStateSize); } - - static void frontend_android_get_name(char *s, size_t len) { system_property_get("getprop", "ro.product.model", s);