From e03eec891df57f8c44b8c7fcfe741ca7b0a9010e Mon Sep 17 00:00:00 2001 From: Jacek Jendrzej Date: Sun, 19 Sep 2010 21:42:57 +0000 Subject: [PATCH] show with cool rc current transponder list git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@782 e54a6e83-5905-42d5-8d5c-058d10e6a962 Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/953b1d801079302f482c905231be7b2fa39549eb Author: Jacek Jendrzej Date: 2010-09-19 (Sun, 19 Sep 2010) ------------------ This commit was generated by Migit --- src/gui/channellist.cpp | 7 ++++--- src/neutrino.cpp | 6 ++++++ 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/src/gui/channellist.cpp b/src/gui/channellist.cpp index 951738200..fcf4fa6da 100644 --- a/src/gui/channellist.cpp +++ b/src/gui/channellist.cpp @@ -1104,13 +1104,14 @@ int CChannelList::numericZap(int key) } return res; } - - if (key == g_settings.key_zaphistory) { - if(!autoshift && CNeutrinoApp::getInstance()->recordingstatus) { + if ((key == g_settings.key_zaphistory) || (key == CRCInput::RC_games)) { + if((!autoshift && CNeutrinoApp::getInstance()->recordingstatus) || (key == CRCInput::RC_games)) { //CChannelList * orgList = bouquetList->orgChannelList; CChannelList * orgList = CNeutrinoApp::getInstance()->channelList; CChannelList * channelList = new CChannelList(g_Locale->getText(LOCALE_CHANNELLIST_CURRENT_TP), false, true); t_channel_id recid = rec_channel_id >> 16; + if(key == CRCInput::RC_games) + recid = chanlist[selected]->channel_id >> 16; for ( unsigned int i = 0 ; i < orgList->chanlist.size(); i++) { if((orgList->chanlist[i]->channel_id >> 16) == recid) { channelList->addChannel(orgList->chanlist[i]); diff --git a/src/neutrino.cpp b/src/neutrino.cpp index e80454604..c2d1ee15a 100644 --- a/src/neutrino.cpp +++ b/src/neutrino.cpp @@ -2840,6 +2840,12 @@ void CNeutrinoApp::RealRun(CMenuWidget &mainMenu) StartSubtitles(); } } + else if (msg == CRCInput::RC_games){ + StopSubtitles(); + int res = channelList->numericZap( msg ); + if(res < 0) + StartSubtitles(); + } else if( msg == (neutrino_msg_t) g_settings.key_lastchannel ) { // Quick Zap StopSubtitles();