mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-09-17 10:23:42 +02:00
Code Issues Packages Projects Releases Wiki Activity

rcinput: use translation for some keys

Browse Source
This commit is contained in:
GetAway
2018-12-05 14:08:48 +01:00
parent 72b33c9520
commit db31e98c8c
5 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/driver/rcinput.cpp
View File

@@ -1723,6 +1723,8 @@ int CRCInput::translate(int code)
{
switch(code)
{
case KEY_EXIT:
return RC_home;
case 0x100: // FIXME -- needed?
return RC_up;
case 0x101: // FIXME -- needed?
@@ -1734,6 +1736,8 @@ int CRCInput::translate(int code)
case KEY_CHANNELDOWN:
return RC_page_down;
#ifdef HAVE_ARM_HARDWARE
case KEY_SWITCHVIDEOMODE:
return RC_mode;
case KEY_VIDEO:
return RC_favorites;
case KEY_FASTFORWARD:

7
src/driver/rcinput.h
View File

@@ -202,7 +202,7 @@ class CRCInput
RC_plus = KEY_VOLUMEUP, /* /include/linux/input.h: #define KEY_VOLUMEUP 115 */
RC_standby = KEY_POWER, /* /include/linux/input.h: #define KEY_POWER 116 */
RC_help = KEY_HELP, /* /include/linux/input.h: #define KEY_HELP 138 */
RC_home = KEY_EXIT, /* /include/linux/input.h: #define KEY_HOME 102 */
RC_home = KEY_HOME, /* /include/linux/input.h: #define KEY_HOME 102 */
RC_setup = KEY_MENU, /* /include/linux/input.h: #define KEY_SETUP 141 */
RC_topleft = KEY_TOPLEFT,
RC_topright = KEY_TOPRIGHT,
@@ -241,11 +241,8 @@ class CRCInput
RC_rewind = KEY_REWIND,
RC_stop = KEY_STOP,
RC_timeshift = KEY_TIME,
#if BOXMODEL_BRE2ZE4K
RC_mode = KEY_SWITCHVIDEOMODE,
#else
RC_mode = KEY_MODE,
#endif
RC_switchvideomode = KEY_SWITCHVIDEOMODE,
RC_games = KEY_GAMES,
RC_next = KEY_NEXT,
RC_prev = KEY_PREVIOUS,

4
src/neutrino.cpp
View File

@@ -4813,6 +4813,10 @@ void CNeutrinoApp::loadKeys(const char * fname)
g_settings.key_pageup = tconfig.getInt32( "key_channelList_pageup", CRCInput::RC_page_up );
g_settings.key_pagedown = tconfig.getInt32( "key_channelList_pagedown", CRCInput::RC_page_down );
g_settings.key_channelList_cancel = tconfig.getInt32( "key_channelList_cancel", CRCInput::RC_home );
// backward-compatible check
if (g_settings.key_channelList_cancel == 174) { /* KEY_EXIT */
g_settings.key_channelList_cancel = 102; /* KEY_HOME */
}
g_settings.key_channelList_sort = tconfig.getInt32( "key_channelList_sort", CRCInput::RC_blue );
g_settings.key_channelList_addrecord = tconfig.getInt32( "key_channelList_addrecord", CRCInput::RC_red );
g_settings.key_channelList_addremind = tconfig.getInt32( "key_channelList_addremind", CRCInput::RC_yellow );

4
src/nhttpd/tuxboxapi/controlapi.cpp
View File

@@ -885,11 +885,15 @@ unsigned int revert_translate(unsigned int code)
{
switch(code)
{
case RC_home:
return KEY_EXIT;
case RC_page_up:
return KEY_CHANNELUP;
case RC_page_down:
return KEY_CHANNELDOWN;
#ifdef HAVE_ARM_HARDWARE
case RC_mode:
return KEY_SWITCHVIDEOMODE;
case RC_play:
case RC_pause:
return KEY_PLAYPAUSE;