From e54f7edaff4726c40011857d4144c95c3715b8e9 Mon Sep 17 00:00:00 2001 From: Garrett Brown Date: Wed, 14 Feb 2024 12:18:01 -0800 Subject: Revert "[Android][Peripherals] Extend range of keycodes being logged" This reverts commit 9e72049ee374f52a1100220f2f40329a7f922151. --- .../peripherals/AndroidJoystickTranslator.cpp | 60 ---------------------- .../android/peripherals/PeripheralBusAndroid.cpp | 2 +- 2 files changed, 1 insertion(+), 61 deletions(-) diff --git a/xbmc/platform/android/peripherals/AndroidJoystickTranslator.cpp b/xbmc/platform/android/peripherals/AndroidJoystickTranslator.cpp index a665f45a9c..be919ab70e 100644 --- a/xbmc/platform/android/peripherals/AndroidJoystickTranslator.cpp +++ b/xbmc/platform/android/peripherals/AndroidJoystickTranslator.cpp @@ -630,66 +630,6 @@ const char* CAndroidJoystickTranslator::TranslateKeyCode(int keyCode) return "AKEYCODE_TV_TIMER_PROGRAMMING"; case AKEYCODE_HELP: return "AKEYCODE_HELP"; - case AKEYCODE_NAVIGATE_PREVIOUS: - return "AKEYCODE_NAVIGATE_PREVIOUS"; - case AKEYCODE_NAVIGATE_NEXT: - return "AKEYCODE_NAVIGATE_NEXT"; - case AKEYCODE_NAVIGATE_IN: - return "AKEYCODE_NAVIGATE_IN"; - case AKEYCODE_NAVIGATE_OUT: - return "AKEYCODE_NAVIGATE_OUT"; - case AKEYCODE_STEM_PRIMARY: - return "AKEYCODE_STEM_PRIMARY"; - case AKEYCODE_STEM_1: - return "AKEYCODE_STEM_1"; - case AKEYCODE_STEM_2: - return "AKEYCODE_STEM_2"; - case AKEYCODE_STEM_3: - return "AKEYCODE_STEM_3"; - case AKEYCODE_DPAD_UP_LEFT: - return "AKEYCODE_DPAD_UP_LEFT"; - case AKEYCODE_DPAD_DOWN_LEFT: - return "AKEYCODE_DPAD_DOWN_LEFT"; - case AKEYCODE_DPAD_UP_RIGHT: - return "AKEYCODE_DPAD_UP_RIGHT"; - case AKEYCODE_DPAD_DOWN_RIGHT: - return "AKEYCODE_DPAD_DOWN_RIGHT"; - case AKEYCODE_MEDIA_SKIP_FORWARD: - return "AKEYCODE_MEDIA_SKIP_FORWARD"; - case AKEYCODE_MEDIA_SKIP_BACKWARD: - return "AKEYCODE_MEDIA_SKIP_BACKWARD"; - case AKEYCODE_MEDIA_STEP_FORWARD: - return "AKEYCODE_MEDIA_STEP_FORWARD"; - case AKEYCODE_MEDIA_STEP_BACKWARD: - return "AKEYCODE_MEDIA_STEP_BACKWARD"; - case AKEYCODE_SOFT_SLEEP: - return "AKEYCODE_SOFT_SLEEP"; - case AKEYCODE_CUT: - return "AKEYCODE_CUT"; - case AKEYCODE_COPY: - return "AKEYCODE_COPY"; - case AKEYCODE_PASTE: - return "AKEYCODE_PASTE"; - case AKEYCODE_SYSTEM_NAVIGATION_UP: - return "AKEYCODE_SYSTEM_NAVIGATION_UP"; - case AKEYCODE_SYSTEM_NAVIGATION_DOWN: - return "AKEYCODE_SYSTEM_NAVIGATION_DOWN"; - case AKEYCODE_SYSTEM_NAVIGATION_LEFT: - return "AKEYCODE_SYSTEM_NAVIGATION_LEFT"; - case AKEYCODE_SYSTEM_NAVIGATION_RIGHT: - return "AKEYCODE_SYSTEM_NAVIGATION_RIGHT"; - case AKEYCODE_ALL_APPS: - return "AKEYCODE_ALL_APPS"; - case AKEYCODE_REFRESH: - return "AKEYCODE_REFRESH"; - case AKEYCODE_THUMBS_UP: - return "AKEYCODE_THUMBS_UP"; - case AKEYCODE_THUMBS_DOWN: - return "AKEYCODE_THUMBS_DOWN"; - case AKEYCODE_PROFILE_SWITCH: - return "AKEYCODE_PROFILE_SWITCH"; - default: - break; } return "unknown"; diff --git a/xbmc/platform/android/peripherals/PeripheralBusAndroid.cpp b/xbmc/platform/android/peripherals/PeripheralBusAndroid.cpp index 6564c968f1..739d501861 100644 --- a/xbmc/platform/android/peripherals/PeripheralBusAndroid.cpp +++ b/xbmc/platform/android/peripherals/PeripheralBusAndroid.cpp @@ -31,7 +31,7 @@ using namespace PERIPHERALS; #define JOYSTICK_PROVIDER_ANDROID "android" // Set this to the final key code in android/keycodes.h -const unsigned int KEY_CODE_FINAL = AKEYCODE_PROFILE_SWITCH; +const unsigned int KEY_CODE_FINAL = AKEYCODE_HELP; static const std::string DeviceLocationPrefix = "android/inputdevice/"; -- cgit v1.2.3