mirror of
https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git
synced 2025-09-09 06:38:28 +02:00
rcinput: use translation for some keys
Origin commit data
------------------
Commit: f633ff3b96
Author: GetAway <get-away@t-online.de>
Date: 2018-12-05 (Wed, 05 Dec 2018)
This commit is contained in:
@@ -1074,7 +1074,7 @@ start-block~rc_wwio_bre2ze4k
|
|||||||
<img src="images/rc_wwio_bre2ze4k.png" usemap="#rc"/>
|
<img src="images/rc_wwio_bre2ze4k.png" usemap="#rc"/>
|
||||||
<map name="rc" id="rc">
|
<map name="rc" id="rc">
|
||||||
<area shape="rect" coords="17,30,43,57" alt="KEY_POWER" href="javascript:rcsim('KEY_POWER')" />
|
<area shape="rect" coords="17,30,43,57" alt="KEY_POWER" href="javascript:rcsim('KEY_POWER')" />
|
||||||
<area shape="rect" coords="90,36,113,57" alt="KEY_SWITCHVIDEOMODE" href="javascript:rcsim('KEY_SWITCHVIDEOMODE')" />
|
<area shape="rect" coords="90,36,113,57" alt="KEY_MODE" href="javascript:rcsim('KEY_MODE')" />
|
||||||
<area shape="rect" coords="118,35,140,57" alt="KEY_MUTE" href="javascript:rcsim('KEY_MUTE')" />
|
<area shape="rect" coords="118,35,140,57" alt="KEY_MUTE" href="javascript:rcsim('KEY_MUTE')" />
|
||||||
<area shape="rect" coords="24,68,52,95" alt="KEY_1" href="javascript:rcsim('KEY_1')" />
|
<area shape="rect" coords="24,68,52,95" alt="KEY_1" href="javascript:rcsim('KEY_1')" />
|
||||||
<area shape="rect" coords="64,67,93,94" alt="KEY_2" href="javascript:rcsim('KEY_2')" />
|
<area shape="rect" coords="64,67,93,94" alt="KEY_2" href="javascript:rcsim('KEY_2')" />
|
||||||
|
@@ -1733,6 +1733,8 @@ int CRCInput::translate(int code)
|
|||||||
{
|
{
|
||||||
switch(code)
|
switch(code)
|
||||||
{
|
{
|
||||||
|
case KEY_EXIT:
|
||||||
|
return RC_home;
|
||||||
case 0x100: // FIXME -- needed?
|
case 0x100: // FIXME -- needed?
|
||||||
return RC_up;
|
return RC_up;
|
||||||
case 0x101: // FIXME -- needed?
|
case 0x101: // FIXME -- needed?
|
||||||
@@ -1742,6 +1744,8 @@ int CRCInput::translate(int code)
|
|||||||
case KEY_CHANNELDOWN:
|
case KEY_CHANNELDOWN:
|
||||||
return RC_page_down;
|
return RC_page_down;
|
||||||
#ifdef HAVE_ARM_HARDWARE
|
#ifdef HAVE_ARM_HARDWARE
|
||||||
|
case KEY_SWITCHVIDEOMODE:
|
||||||
|
return RC_mode;
|
||||||
case KEY_VIDEO:
|
case KEY_VIDEO:
|
||||||
return RC_favorites;
|
return RC_favorites;
|
||||||
case KEY_FASTFORWARD:
|
case KEY_FASTFORWARD:
|
||||||
|
@@ -202,7 +202,7 @@ class CRCInput
|
|||||||
RC_plus = KEY_VOLUMEUP, /* /include/linux/input.h: #define KEY_VOLUMEUP 115 */
|
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_standby = KEY_POWER, /* /include/linux/input.h: #define KEY_POWER 116 */
|
||||||
RC_help = KEY_HELP, /* /include/linux/input.h: #define KEY_HELP 138 */
|
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_setup = KEY_MENU, /* /include/linux/input.h: #define KEY_SETUP 141 */
|
||||||
RC_topleft = KEY_TOPLEFT,
|
RC_topleft = KEY_TOPLEFT,
|
||||||
RC_topright = KEY_TOPRIGHT,
|
RC_topright = KEY_TOPRIGHT,
|
||||||
@@ -241,11 +241,8 @@ class CRCInput
|
|||||||
RC_rewind = KEY_REWIND,
|
RC_rewind = KEY_REWIND,
|
||||||
RC_stop = KEY_STOP,
|
RC_stop = KEY_STOP,
|
||||||
RC_timeshift = KEY_TIME,
|
RC_timeshift = KEY_TIME,
|
||||||
#if BOXMODEL_BRE2ZE4K
|
|
||||||
RC_mode = KEY_SWITCHVIDEOMODE,
|
|
||||||
#else
|
|
||||||
RC_mode = KEY_MODE,
|
RC_mode = KEY_MODE,
|
||||||
#endif
|
RC_switchvideomode = KEY_SWITCHVIDEOMODE,
|
||||||
RC_games = KEY_GAMES,
|
RC_games = KEY_GAMES,
|
||||||
RC_next = KEY_NEXT,
|
RC_next = KEY_NEXT,
|
||||||
RC_prev = KEY_PREVIOUS,
|
RC_prev = KEY_PREVIOUS,
|
||||||
|
@@ -5144,6 +5144,10 @@ void CNeutrinoApp::loadKeys(const char * fname)
|
|||||||
g_settings.key_pageup = tconfig.getInt32( "key_channelList_pageup", CRCInput::RC_page_up );
|
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_pagedown = tconfig.getInt32( "key_channelList_pagedown", CRCInput::RC_page_down );
|
||||||
g_settings.key_channelList_cancel = tconfig.getInt32( "key_channelList_cancel", CRCInput::RC_home );
|
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_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_addrecord = tconfig.getInt32( "key_channelList_addrecord", CRCInput::RC_red );
|
||||||
g_settings.key_channelList_addremind = tconfig.getInt32( "key_channelList_addremind", CRCInput::RC_yellow );
|
g_settings.key_channelList_addremind = tconfig.getInt32( "key_channelList_addremind", CRCInput::RC_yellow );
|
||||||
|
@@ -895,11 +895,15 @@ unsigned int revert_translate(unsigned int code)
|
|||||||
{
|
{
|
||||||
switch(code)
|
switch(code)
|
||||||
{
|
{
|
||||||
|
case RC_home:
|
||||||
|
return KEY_EXIT;
|
||||||
case RC_page_up:
|
case RC_page_up:
|
||||||
return KEY_CHANNELUP;
|
return KEY_CHANNELUP;
|
||||||
case RC_page_down:
|
case RC_page_down:
|
||||||
return KEY_CHANNELDOWN;
|
return KEY_CHANNELDOWN;
|
||||||
#ifdef HAVE_ARM_HARDWARE
|
#ifdef HAVE_ARM_HARDWARE
|
||||||
|
case RC_mode:
|
||||||
|
return KEY_SWITCHVIDEOMODE;
|
||||||
case RC_play:
|
case RC_play:
|
||||||
case RC_pause:
|
case RC_pause:
|
||||||
return KEY_PLAYPAUSE;
|
return KEY_PLAYPAUSE;
|
||||||
|
Reference in New Issue
Block a user