mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-29 08:21:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

neutrino.cpp, gui/scan.cpp: force re-zap without setSelected()

Browse Source
This commit is contained in:
[CST] Focus
2013-03-13 18:59:44 +04:00
parent c60b8fc741
commit b3923a7d5d
2 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/gui/scan.cpp
View File

@@ -345,8 +345,7 @@ int CScanTs::exec(CMenuTarget* /*parent*/, const std::string & actionKey)
videoDecoder->StopPicture(); videoDecoder->StopPicture();
frameBuffer->Clear(); frameBuffer->Clear();
g_Sectionsd->setPauseScanning(false); g_Sectionsd->setPauseScanning(false);
CNeutrinoApp::getInstance()->channelList->setSelected(0xfffffff); CNeutrinoApp::getInstance()->channelList->zapTo_ChannelID(CZapit::getInstance()->GetCurrentChannelID(), true); /* force re-zap */
CNeutrinoApp::getInstance()->channelList->zapTo_ChannelID(CZapit::getInstance()->GetCurrentChannelID());
CVFD::getInstance()->setMode(CVFD::MODE_TVRADIO); CVFD::getInstance()->setMode(CVFD::MODE_TVRADIO);
return menu_return::RETURN_REPAINT; return menu_return::RETURN_REPAINT;

13
src/neutrino.cpp
View File

@@ -3116,11 +3116,10 @@ void CNeutrinoApp::tvMode( bool rezap )
SetChannelMode(g_settings.channel_mode); SetChannelMode(g_settings.channel_mode);
if( rezap ) { if( rezap ) {
t_channel_id last_chid = CZapit::getInstance()->GetLastTVChannel(); t_channel_id last_chid = CZapit::getInstance()->GetLastTVChannel();
channelList->setSelected(0xfffffff); /* make sure that zapTo_ChannelID will zap */
if(CServiceManager::getInstance()->FindChannel(last_chid)) if(CServiceManager::getInstance()->FindChannel(last_chid))
channelList->zapTo_ChannelID(last_chid); channelList->zapTo_ChannelID(last_chid, true); /* force re-zap */
else else
channelList->zapTo(0); channelList->zapTo(0, true);
} }
#ifdef USEACTIONLOG #ifdef USEACTIONLOG
g_ActionLog->println("mode: tv"); g_ActionLog->println("mode: tv");
@@ -3285,8 +3284,7 @@ void CNeutrinoApp::standbyMode( bool bOnOff, bool fromDeepStandby )
if(!recordingstatus) { //only switch to standby_channel_id when not recording if(!recordingstatus) { //only switch to standby_channel_id when not recording
live_channel_id = standby_channel_id; live_channel_id = standby_channel_id;
} }
channelList->setSelected(0xfffffff); /* make sure that zapTo_ChannelID will zap */ channelList->zapTo_ChannelID(live_channel_id, true); /* force re-zap */
channelList->zapTo_ChannelID(live_channel_id);
g_Sectionsd->setPauseScanning(false); g_Sectionsd->setPauseScanning(false);
//g_Sectionsd->setServiceChanged(live_channel_id, true ); //g_Sectionsd->setServiceChanged(live_channel_id, true );
@@ -3328,11 +3326,10 @@ void CNeutrinoApp::radioMode( bool rezap)
if( rezap ) { if( rezap ) {
t_channel_id last_chid = CZapit::getInstance()->GetLastRADIOChannel(); t_channel_id last_chid = CZapit::getInstance()->GetLastRADIOChannel();
channelList->setSelected(0xfffffff); /* make sure that zapTo_ChannelID will zap */
if(CServiceManager::getInstance()->FindChannel(last_chid)) if(CServiceManager::getInstance()->FindChannel(last_chid))
channelList->zapTo_ChannelID(last_chid); channelList->zapTo_ChannelID(last_chid, true); /* force re-zap */
else else
channelList->zapTo(0); channelList->zapTo(0, true); /* force re-zap */
} }
videoDecoder->ShowPicture(DATADIR "/neutrino/icons/radiomode.jpg"); videoDecoder->ShowPicture(DATADIR "/neutrino/icons/radiomode.jpg");
} }