neutrino: add additional key to leave standby mode; unify standby locales

This re-adds an old feature from dbox2, but uses a more configurable way


Origin commit data
------------------
Branch: ni/coolstream
Commit: cd6d3bcad1
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-07-20 (Fri, 20 Jul 2018)

Origin message was:
------------------
- neutrino: add additional key to leave standby mode; unify standby locales

This re-adds an old feature from dbox2, but uses a more configurable way


------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2018-07-20 00:27:11 +02:00
parent d2d59fd648
commit e6e1a29063
8 changed files with 35 additions and 15 deletions

View File

@@ -3477,6 +3477,9 @@ int CNeutrinoApp::handleMsg(const neutrino_msg_t _msg, neutrino_msg_data_t data)
}
/* ================================== KEYS ================================================ */
if (msg == (neutrino_msg_t) g_settings.key_standby_off_add && mode == NeutrinoModes::mode_standby)
msg = CRCInput::RC_standby_off;
if( msg == CRCInput::RC_ok || msg == (neutrino_msg_t) g_settings.key_zaphistory || msg == (neutrino_msg_t) g_settings.key_current_transponder
|| (!g_InfoViewer->getSwitchMode() && CNeutrinoApp::getInstance()->listModeKey(msg))) {
if( (mode == NeutrinoModes::mode_tv) || (mode == NeutrinoModes::mode_radio) || (mode == NeutrinoModes::mode_ts) || (mode == NeutrinoModes::mode_webtv) || (mode == NeutrinoModes::mode_webradio)) {
@@ -5054,6 +5057,7 @@ void CNeutrinoApp::loadKeys(const char * fname)
//rc-key configuration
g_settings.key_tvradio_mode = tconfig.getInt32( "key_tvradio_mode", (unsigned int)CRCInput::RC_nokey );
g_settings.key_power_off = tconfig.getInt32( "key_power_off", CRCInput::RC_standby );
g_settings.key_standby_off_add = tconfig.getInt32( "key_standby_off_add", CRCInput::RC_ok );
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 );
@@ -5146,6 +5150,7 @@ void CNeutrinoApp::saveKeys(const char * fname)
//rc-key configuration
tconfig.setInt32( "key_tvradio_mode", g_settings.key_tvradio_mode );
tconfig.setInt32( "key_power_off", g_settings.key_power_off );
tconfig.setInt32( "key_standby_off_add", g_settings.key_standby_off_add );
tconfig.setInt32( "key_channelList_pageup", g_settings.key_pageup );
tconfig.setInt32( "key_channelList_pagedown", g_settings.key_pagedown );