mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-28 07:51:11 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix latest key changes (KEY_EXIT => KEY_HOME)

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: a4918cdca8
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-12-16 (Sun, 16 Dec 2018)

Origin message was:
------------------
- fix latest key changes (KEY_EXIT => KEY_HOME)

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2018-12-16 01:17:01 +01:00
parent 4a7ff01dd5
commit 77285da0a8
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/neutrino.cpp
View File

@@ -1301,6 +1301,14 @@ void CNeutrinoApp::upgradeSetup(const char * fname)
if (g_settings.ttx_font_file == FONTDIR "/DejaVuLGCSansMono-Bold.ttf")
g_settings.ttx_font_file = FONTDIR "/tuxtxt.ttf";
}
if (g_settings.version_pseudo < "20181216000000")
{
// apply key changes; KEY_EXIT => KEY_HOME
if (g_settings.key_channelList_cancel == 174)
g_settings.key_channelList_cancel = 102;
if (g_settings.key_zaphistory == 174)
g_settings.key_zaphistory = 102;
}
g_settings.version_pseudo = NEUTRINO_VERSION_PSEUDO;
configfile.setString("version_pseudo", g_settings.version_pseudo);
@@ -5152,10 +5160,6 @@ 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 );

2
version_pseudo.h
View File

@@ -1 +1 @@
#define NEUTRINO_VERSION_PSEUDO "20180123160000"
#define NEUTRINO_VERSION_PSEUDO "20181216000000"