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

neutrino.cpp: use g_InfoViewer->setUpdateTimer(),

Browse Source 
disable timer in standby
This commit is contained in:
[CST] Focus
2012-11-02 16:10:32 +04:00
parent af753fc4f1
commit e6afe59081
1 changed files with 7 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/neutrino.cpp
View File

@@ -1621,13 +1621,10 @@ void CNeutrinoApp::InitZapper()
channelsInit(); channelsInit();
if(tvmode) if(tvmode)
{
tvMode(true); tvMode(true);
} else { else
g_RCInput->killTimer(g_InfoViewer->lcdUpdateTimer);
g_InfoViewer->lcdUpdateTimer = g_RCInput->addTimer( LCD_UPDATE_TIME_RADIO_MODE, false );
radioMode(true); radioMode(true);
}
if(g_settings.cacheTXT) if(g_settings.cacheTXT)
tuxtxt_init(); tuxtxt_init();
@@ -3071,18 +3068,17 @@ void CNeutrinoApp::saveEpg(bool cvfd_mode)
void CNeutrinoApp::tvMode( bool rezap ) void CNeutrinoApp::tvMode( bool rezap )
{ {
INFO("rezap %d current mode %d", rezap, mode); INFO("rezap %d current mode %d", rezap, mode);
if(mode==mode_radio ) { if (mode == mode_radio) {
if (g_settings.radiotext_enable && g_Radiotext) { if (g_settings.radiotext_enable && g_Radiotext) {
delete g_Radiotext; delete g_Radiotext;
g_Radiotext = NULL; g_Radiotext = NULL;
} }
videoDecoder->StopPicture(); videoDecoder->StopPicture();
g_RCInput->killTimer(g_InfoViewer->lcdUpdateTimer);
g_InfoViewer->lcdUpdateTimer = g_RCInput->addTimer( LCD_UPDATE_TIME_TV_MODE, false );
CVFD::getInstance()->ShowIcon(VFD_ICON_RADIO, false); CVFD::getInstance()->ShowIcon(VFD_ICON_RADIO, false);
StartSubtitles(!rezap); StartSubtitles(!rezap);
} }
g_InfoViewer->setUpdateTimer(LCD_UPDATE_TIME_TV_MODE);
g_volume->Init(); g_volume->Init();
@@ -3160,6 +3156,7 @@ void CNeutrinoApp::standbyMode( bool bOnOff, bool fromDeepStandby )
if( mode == mode_scart ) { if( mode == mode_scart ) {
//g_Controld->setScartMode( 0 ); //g_Controld->setScartMode( 0 );
} }
g_InfoViewer->setUpdateTimer(0); // delete timer
StopSubtitles(); StopSubtitles();
if(SDTreloadChannels && !CRecordManager::getInstance()->RecordingStatus()){ if(SDTreloadChannels && !CRecordManager::getInstance()->RecordingStatus()){
SDT_ReloadChannels(); SDT_ReloadChannels();
@@ -3298,12 +3295,11 @@ void CNeutrinoApp::radioMode( bool rezap)
{ {
//printf("radioMode: rezap %s\n", rezap ? "yes" : "no"); //printf("radioMode: rezap %s\n", rezap ? "yes" : "no");
INFO("rezap %d current mode %d", rezap, mode); INFO("rezap %d current mode %d", rezap, mode);
if(mode==mode_tv ) { if (mode == mode_tv) {
g_RCInput->killTimer(g_InfoViewer->lcdUpdateTimer);
g_InfoViewer->lcdUpdateTimer = g_RCInput->addTimer( LCD_UPDATE_TIME_RADIO_MODE, false );
CVFD::getInstance()->ShowIcon(VFD_ICON_TV, false); CVFD::getInstance()->ShowIcon(VFD_ICON_TV, false);
StopSubtitles(); StopSubtitles();
} }
g_InfoViewer->setUpdateTimer(LCD_UPDATE_TIME_RADIO_MODE);
CVFD::getInstance()->setMode(CVFD::MODE_TVRADIO); CVFD::getInstance()->setMode(CVFD::MODE_TVRADIO);
CVFD::getInstance()->ShowIcon(VFD_ICON_RADIO, true); CVFD::getInstance()->ShowIcon(VFD_ICON_RADIO, true);