From 6e25596e76550911ec90b28b812d19700dc124ba Mon Sep 17 00:00:00 2001 From: vanhofen Date: Sun, 26 Mar 2023 22:34:09 +0200 Subject: [PATCH] rcinput: fix tv2 key for edhdultra and protek4k Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/5644d14b1b914f9214613b4ddc5267e00f3c5a2c Author: vanhofen Date: 2023-03-26 (Sun, 26 Mar 2023) Origin message was: ------------------ - rcinput: fix tv2 key for edhdultra and protek4k ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- src/driver/rcinput.cpp | 2 +- src/neutrino.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/driver/rcinput.cpp b/src/driver/rcinput.cpp index b80b8cacc..29be6c0c3 100644 --- a/src/driver/rcinput.cpp +++ b/src/driver/rcinput.cpp @@ -1780,7 +1780,7 @@ int CRCInput::translate(int code) case KEY_CHANNELDOWN: return RC_page_down; #if HAVE_ARM_HARDWARE || HAVE_MIPS_HARDWARE -#if BOXMODEL_HD51 || BOXMODEL_BRE2ZE4K || BOXMODEL_H7 || BOXMODEL_HD60 || BOXMODEL_HD61 || BOXMODEL_MULTIBOX || BOXMODEL_MULTIBOXSE +#if BOXMODEL_HD51 || BOXMODEL_BRE2ZE4K || BOXMODEL_H7 || BOXMODEL_E4HDULTRA || BOXMODEL_PROTEK4K || BOXMODEL_HD60 || BOXMODEL_HD61 || BOXMODEL_MULTIBOX || BOXMODEL_MULTIBOXSE case KEY_VIDEO: return RC_favorites; case KEY_TV2: diff --git a/src/neutrino.cpp b/src/neutrino.cpp index 6a9a48d58..2231e87f1 100644 --- a/src/neutrino.cpp +++ b/src/neutrino.cpp @@ -5824,14 +5824,14 @@ void CNeutrinoApp::loadKeys(const char *fname) g_settings.key_subchannel_down = tconfig->getInt32("key_subchannel_down", CRCInput::RC_left); g_settings.key_subchannel_up = tconfig->getInt32("key_subchannel_up", CRCInput::RC_right); g_settings.key_switchformat = tconfig->getInt32("key_switchformat", CRCInput::RC_nokey); -#if BOXMODEL_HD51 || BOXMODEL_BRE2ZE4K || BOXMODEL_H7 || BOXMODEL_PROTEK4K || BOXMODEL_HD60 || BOXMODEL_HD61 || BOXMODEL_MULTIBOX || BOXMODEL_MULTIBOXSE || BOXMODEL_OSMIO4K || BOXMODEL_OSMIO4KPLUS +#if BOXMODEL_HD51 || BOXMODEL_BRE2ZE4K || BOXMODEL_H7 || BOXMODEL_E4HDULTRA || BOXMODEL_PROTEK4K || BOXMODEL_HD60 || BOXMODEL_HD61 || BOXMODEL_MULTIBOX || BOXMODEL_MULTIBOXSE || BOXMODEL_OSMIO4K || BOXMODEL_OSMIO4KPLUS g_settings.key_timeshift = tconfig->getInt32("key_timeshift", CRCInput::RC_nokey); // FIXME #elif BOXMODEL_VUPLUS_ALL g_settings.key_timeshift = tconfig->getInt32("key_timeshift", CRCInput::RC_playpause); #else g_settings.key_timeshift = tconfig->getInt32("key_timeshift", CRCInput::RC_pause); #endif -#if BOXMODEL_HD61 +#if BOXMODEL_E4HDULTRA || BOXMODEL_PROTEK4K || BOXMODEL_HD61 g_settings.key_tvradio_mode = tconfig->getInt32("key_tvradio_mode", CRCInput::RC_tv); #else g_settings.key_tvradio_mode = tconfig->getInt32("key_tvradio_mode", CRCInput::RC_nokey);