From c090ee634cd1a228ea04836a742942d5ab1cf140 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Fri, 20 Jun 2014 07:03:06 +0200 Subject: [PATCH] (Android) Remove debug_input_enable --- android/phoenix/res/xml/input_preferences.xml | 9 ----- .../preferences/util/UserPreferences.java | 1 - config.def.h | 3 -- general.h | 1 - input/android_input.c | 38 ++----------------- retroarch.cfg | 3 -- settings.c | 3 -- settings_data.c | 1 - 8 files changed, 4 insertions(+), 55 deletions(-) diff --git a/android/phoenix/res/xml/input_preferences.xml b/android/phoenix/res/xml/input_preferences.xml index 937f387f0f..d7a534ecbe 100644 --- a/android/phoenix/res/xml/input_preferences.xml +++ b/android/phoenix/res/xml/input_preferences.xml @@ -19,15 +19,6 @@ android:disableDependentsState="true" /> - - - - - > 3] |= 1 << (bit & 7); } -static void engine_handle_dpad_default(android_input_t *android, AInputEvent *event, - int port, char *msg, size_t msg_sizeof, - int source, bool debug_enable) +static void engine_handle_dpad_default(android_input_t *android, AInputEvent *event, int port, int source) { size_t motion_pointer = AMotionEvent_getAction(event) >> AMOTION_EVENT_ACTION_POINTER_INDEX_SHIFT; float x = AMotionEvent_getX(event, motion_pointer); @@ -183,15 +181,9 @@ static void engine_handle_dpad_default(android_input_t *android, AInputEvent *ev android->analog_state[port][0] = (int16_t)(x * 32767.0f); android->analog_state[port][1] = (int16_t)(y * 32767.0f); - - if (debug_enable) - snprintf(msg, msg_sizeof, "Pad %d : x = %.2f, y = %.2f, src %d.\n", - port, x, y, source); } -static void engine_handle_dpad_getaxisvalue(android_input_t *android, AInputEvent *event, - int port, char *msg, size_t msg_sizeof, int source, - bool debug_enable) +static void engine_handle_dpad_getaxisvalue(android_input_t *android, AInputEvent *event, int port, int source) { size_t motion_pointer = AMotionEvent_getAction(event) >> AMOTION_EVENT_ACTION_POINTER_INDEX_SHIFT; float x = AMotionEvent_getAxisValue(event, AXIS_X, motion_pointer); @@ -219,10 +211,6 @@ static void engine_handle_dpad_getaxisvalue(android_input_t *android, AInputEven android->analog_state[port][7] = (int16_t)(rtrig * 32767.0f); android->analog_state[port][8] = (int16_t)(brake * 32767.0f); android->analog_state[port][9] = (int16_t)(gas * 32767.0f); - - if (debug_enable) - snprintf(msg, msg_sizeof, "Pad %d : x %.2f, y %.2f, z %.2f, rz %.2f, src %d.\n", - port, x, y, z, rz, source); } static void *android_input_init(void) @@ -577,7 +565,6 @@ static void android_input_poll(void *data) { if (ident == LOOPER_ID_INPUT) { - bool debug_enable = g_settings.input.debug_enable; AInputEvent *event = NULL; // Read all pending events. @@ -585,13 +572,10 @@ static void android_input_poll(void *data) { while (AInputQueue_getEvent(android_app->inputQueue, &event) >= 0) { - bool long_msg_enable = false; int32_t handled = 1; - char msg[128]; int source, id, keycode, type_event, port; int predispatched; - msg[0] = 0; predispatched = AInputQueue_preDispatchEvent(android_app->inputQueue, event); source = AInputEvent_getSource(event); @@ -625,26 +609,12 @@ static void android_input_poll(void *data) float y = 0.0f; if (android_input_poll_event_type_motion(android, event, &x, &y, port, source)) - engine_handle_dpad(android, event, port, msg, sizeof(msg), source, debug_enable); - else - { - if (debug_enable) - snprintf(msg, sizeof(msg), "Pad %d : x = %.2f, y = %.2f, src %d.\n", port, x, y, source); - } + engine_handle_dpad(android, event, port, source); } else if (type_event == AINPUT_EVENT_TYPE_KEY) { keycode = AKeyEvent_getKeyCode(event); android_input_poll_event_type_key(android, android_app, event, port, keycode, source, type_event, &handled); - if (debug_enable) - snprintf(msg, sizeof(msg), "Pad %d : %d, src = %d.\n", port, keycode, source); - } - - if (msg[0] != 0) - { - msg_queue_clear(g_extern.msg_queue); - msg_queue_push(g_extern.msg_queue, msg, 0, long_msg_enable ? 180 : 30); - RARCH_LOG("Input debug: %s\n", msg); } if (!predispatched) diff --git a/retroarch.cfg b/retroarch.cfg index c9d27d1dcf..b4edb420bf 100644 --- a/retroarch.cfg +++ b/retroarch.cfg @@ -288,9 +288,6 @@ # Requires input_autodetect_enable to be enabled. # joypad_autoconfig_dir = -# Enable debug input key reporting on-screen. -# input_debug_enable = false - # Sets which libretro device is used for a player. # Devices are indentified with a number. # This is normally saved by the menu. diff --git a/settings.c b/settings.c index f03016a6f1..b9002a0ec4 100644 --- a/settings.c +++ b/settings.c @@ -394,7 +394,6 @@ void config_set_defaults(void) g_settings.input.overlay_opacity = 0.7f; g_settings.input.overlay_scale = 1.0f; - g_settings.input.debug_enable = input_debug_enable; g_settings.input.autodetect_enable = input_autodetect_enable; *g_settings.input.keyboard_layout = '\0'; @@ -1094,8 +1093,6 @@ bool config_load_file(const char *path, bool set_defaults) CONFIG_GET_INT(input.turbo_period, "input_turbo_period"); CONFIG_GET_INT(input.turbo_duty_cycle, "input_duty_cycle"); - CONFIG_GET_BOOL(input.debug_enable, "input_debug_enable"); - CONFIG_GET_BOOL(input.autodetect_enable, "input_autodetect_enable"); CONFIG_GET_PATH(input.autoconfig_dir, "joypad_autoconfig_dir"); diff --git a/settings_data.c b/settings_data.c index 123856fceb..01543d725d 100644 --- a/settings_data.c +++ b/settings_data.c @@ -668,7 +668,6 @@ const rarch_setting_t* setting_data_get_list(void) START_SUB_GROUP("Misc") CONFIG_BOOL(g_settings.input.netplay_client_swap_input, "netplay_client_swap_input", "Swap Netplay Input", netplay_client_swap_input) - CONFIG_BOOL(g_settings.input.debug_enable, "input_debug_enable", "Enable Input Debugging", input_debug_enable) END_SUB_GROUP() #ifdef HAVE_OVERLAY