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

neutrino.cpp: save/load epg_scan option;

Browse Source 
process EVT_EIT_COMPLETE
This commit is contained in:
[CST] Focus
2013-06-12 18:33:37 +04:00
parent 680f684ce4
commit db40f59c84
1 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/neutrino.cpp
View File

@@ -57,6 +57,7 @@
#include <driver/screenshot.h> #include <driver/screenshot.h>
#include <driver/volume.h> #include <driver/volume.h>
#include <driver/streamts.h> #include <driver/streamts.h>
#include <driver/scanepg.h>
#include "gui/audiomute.h" #include "gui/audiomute.h"
#include "gui/audioplayer.h" #include "gui/audioplayer.h"
@@ -444,6 +445,7 @@ int CNeutrinoApp::loadSetup(const char * fname)
g_settings.epg_save = configfile.getBool("epg_save", false); g_settings.epg_save = configfile.getBool("epg_save", false);
g_settings.epg_save_standby = configfile.getBool("epg_save_standby", true); g_settings.epg_save_standby = configfile.getBool("epg_save_standby", true);
g_settings.epg_scan = configfile.getBool("epg_scan", false);
//widget settings //widget settings
g_settings.widget_fade = false; g_settings.widget_fade = false;
g_settings.widget_fade = configfile.getBool("widget_fade" , false ); g_settings.widget_fade = configfile.getBool("widget_fade" , false );
@@ -906,6 +908,7 @@ void CNeutrinoApp::saveSetup(const char * fname)
// epg // epg
configfile.setBool("epg_save", g_settings.epg_save); configfile.setBool("epg_save", g_settings.epg_save);
configfile.setBool("epg_save_standby", g_settings.epg_save_standby); configfile.setBool("epg_save_standby", g_settings.epg_save_standby);
configfile.setBool("epg_scan", g_settings.epg_scan);
configfile.setString("epg_cache_time" ,g_settings.epg_cache ); configfile.setString("epg_cache_time" ,g_settings.epg_cache );
configfile.setString("epg_extendedcache_time" ,g_settings.epg_extendedcache); configfile.setString("epg_extendedcache_time" ,g_settings.epg_extendedcache);
configfile.setString("epg_old_events" ,g_settings.epg_old_events ); configfile.setString("epg_old_events" ,g_settings.epg_old_events );
@@ -1710,6 +1713,7 @@ void CNeutrinoApp::InitSectiondClient()
g_Sectionsd = new CSectionsdClient; g_Sectionsd = new CSectionsdClient;
g_Sectionsd->registerEvent(CSectionsdClient::EVT_TIMESET, 222, NEUTRINO_UDS_NAME); g_Sectionsd->registerEvent(CSectionsdClient::EVT_TIMESET, 222, NEUTRINO_UDS_NAME);
g_Sectionsd->registerEvent(CSectionsdClient::EVT_GOT_CN_EPG, 222, NEUTRINO_UDS_NAME); g_Sectionsd->registerEvent(CSectionsdClient::EVT_GOT_CN_EPG, 222, NEUTRINO_UDS_NAME);
g_Sectionsd->registerEvent(CSectionsdClient::EVT_EIT_COMPLETE, 222, NEUTRINO_UDS_NAME);
g_Sectionsd->registerEvent(CSectionsdClient::EVT_WRITE_SI_FINISHED, 222, NEUTRINO_UDS_NAME); g_Sectionsd->registerEvent(CSectionsdClient::EVT_WRITE_SI_FINISHED, 222, NEUTRINO_UDS_NAME);
} }
@@ -2072,6 +2076,8 @@ void CNeutrinoApp::RealRun(CMenuWidget &mainMenu)
InfoClock->StartClock(); InfoClock->StartClock();
StartSubtitles(); StartSubtitles();
saveSetup(NEUTRINO_SETTINGS_FILE); saveSetup(NEUTRINO_SETTINGS_FILE);
if (!g_settings.epg_scan)
CEpgScan::getInstance()->Clear();
} }
} }
else if (((msg == CRCInput::RC_tv) || (msg == CRCInput::RC_radio)) && (g_settings.key_tvradio_mode == (int)CRCInput::RC_nokey)) { else if (((msg == CRCInput::RC_tv) || (msg == CRCInput::RC_radio)) && (g_settings.key_tvradio_mode == (int)CRCInput::RC_nokey)) {
@@ -2329,6 +2335,7 @@ int CNeutrinoApp::handleMsg(const neutrino_msg_t _msg, neutrino_msg_data_t data)
/* update scan settings for manual scan to current channel */ /* update scan settings for manual scan to current channel */
CScanSetup::getInstance()->updateManualSettings(); CScanSetup::getInstance()->updateManualSettings();
CEpgScan::getInstance()->handleMsg(msg, data);
} }
if ((msg == NeutrinoMessages::EVT_TIMER)) { if ((msg == NeutrinoMessages::EVT_TIMER)) {
if(data == scrambled_timer) { if(data == scrambled_timer) {
@@ -2340,6 +2347,10 @@ int CNeutrinoApp::handleMsg(const neutrino_msg_t _msg, neutrino_msg_data_t data)
return messages_return::handled; return messages_return::handled;
} }
} }
if ((msg == NeutrinoMessages::EVT_EIT_COMPLETE)) {
CEpgScan::getInstance()->handleMsg(msg, data);
return messages_return::handled;
}
res = res | g_RemoteControl->handleMsg(msg, data); res = res | g_RemoteControl->handleMsg(msg, data);
res = res | g_InfoViewer->handleMsg(msg, data); res = res | g_InfoViewer->handleMsg(msg, data);