neutrino.cpp: change lastChannelRadio/lastChannelTV from number to channel_id

This commit is contained in:
[CST] Focus
2012-03-13 14:07:15 +04:00
parent 866b7e7b45
commit 3468fffd75

View File

@@ -1146,7 +1146,7 @@ void CNeutrinoApp::saveSetup(const char * fname)
**************************************************************************************/ **************************************************************************************/
void CNeutrinoApp::firstChannel() void CNeutrinoApp::firstChannel()
{ {
g_Zapit->getLastChannel(firstchannel.channelNumber, firstchannel.mode); g_Zapit->getLastChannel(firstchannel.channel_id, firstchannel.mode);
} }
/************************************************************************************** /**************************************************************************************
@@ -3291,7 +3291,10 @@ void CNeutrinoApp::tvMode( bool rezap )
if( rezap ) { if( rezap ) {
firstChannel(); firstChannel();
channelList->setSelected(0xfffffff); /* make sure that zapTo_ChannelID will zap */ channelList->setSelected(0xfffffff); /* make sure that zapTo_ChannelID will zap */
channelList->zapTo( firstchannel.channelNumber -1 ); if(CServiceManager::getInstance()->FindChannel(firstchannel.channel_id))
channelList->zapTo_ChannelID( firstchannel.channel_id );
else
channelList->zapTo(0);
} }
#ifdef USEACTIONLOG #ifdef USEACTIONLOG
g_ActionLog->println("mode: tv"); g_ActionLog->println("mode: tv");
@@ -3495,7 +3498,10 @@ void CNeutrinoApp::radioMode( bool rezap)
if( rezap ) { if( rezap ) {
firstChannel(); firstChannel();
channelList->setSelected(0xfffffff); /* make sure that zapTo_ChannelID will zap */ channelList->setSelected(0xfffffff); /* make sure that zapTo_ChannelID will zap */
channelList->zapTo( firstchannel.channelNumber -1 ); if(CServiceManager::getInstance()->FindChannel(firstchannel.channel_id))
channelList->zapTo_ChannelID( firstchannel.channel_id );
else
channelList->zapTo(0);
} }
videoDecoder->ShowPicture(DATADIR "/neutrino/icons/radiomode.jpg"); videoDecoder->ShowPicture(DATADIR "/neutrino/icons/radiomode.jpg");