From 735b6e734e6d4b2794f82be1d0665a4eb4268670 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Fri, 27 Oct 2017 22:05:11 +0200 Subject: [PATCH] rcinput: add some new keys ... and translate KEY_VIDEO (list-key) to RC_favorites for ARM_HARDWARE Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/92fe6973a25b9292eb5b3baa730ce60baf58ee9e Author: vanhofen Date: 2017-10-27 (Fri, 27 Oct 2017) Origin message was: ------------------ - rcinput: add some new keys ... and translate KEY_VIDEO (list-key) to RC_favorites for ARM_HARDWARE ------------------ This commit was generated by Migit --- src/driver/rcinput.cpp | 22 ++++++++++++++-------- src/driver/rcinput.h | 3 +++ 2 files changed, 17 insertions(+), 8 deletions(-) diff --git a/src/driver/rcinput.cpp b/src/driver/rcinput.cpp index 4e810cd27..1dfa519d4 100644 --- a/src/driver/rcinput.cpp +++ b/src/driver/rcinput.cpp @@ -1682,6 +1682,12 @@ const char * CRCInput::getSpecialKeyName(const unsigned int key) return "pos"; case RC_sleep: return "sleep"; + case RC_nextsong: + return "next song"; + case RC_previoussong: + return "previous song"; + case RC_bookmarks: + return "bookmarks"; default: printf("unknown key: %d (0x%x) \n", key, key); return "unknown"; @@ -1725,10 +1731,14 @@ int CRCInput::translate(int code) return RC_play; case KEY_PROGRAM: return RC_timer; - case KEY_NEXTSONG: - return RC_next; - case KEY_PREVIOUSSONG: - return RC_prev; + case KEY_CHANNELUP: + return RC_page_up; + case KEY_CHANNELDOWN: + return RC_page_down; +#ifdef HAVE_ARM_HARDWARE + case KEY_VIDEO: + return RC_favorites; +#endif #ifdef HAVE_AZBOX_HARDWARE case KEY_HOME: return RC_favorites; @@ -1738,10 +1748,6 @@ int CRCInput::translate(int code) return RC_record; case KEY_PLAY: return RC_pause; - case KEY_CHANNELUP: - return RC_page_up; - case KEY_CHANNELDOWN: - return RC_page_down; #endif default: break; diff --git a/src/driver/rcinput.h b/src/driver/rcinput.h index d2c29e50f..44692a4b2 100644 --- a/src/driver/rcinput.h +++ b/src/driver/rcinput.h @@ -249,6 +249,9 @@ class CRCInput RC_sub = KEY_SUBTITLE, RC_pos = KEY_MOVE, RC_sleep = KEY_SLEEP, + RC_nextsong = KEY_NEXTSONG, + RC_previoussong = KEY_PREVIOUSSONG, + RC_bookmarks = KEY_BOOKMARKS, RC_power_on = KEY_POWERON, RC_power_off = KEY_POWEROFF,