diff --git a/src/gui/Makefile.am b/src/gui/Makefile.am index 3c9715b7c..0a12511b6 100644 --- a/src/gui/Makefile.am +++ b/src/gui/Makefile.am @@ -62,7 +62,6 @@ libneutrino_gui_a_SOURCES = \ epgplus.cpp \ epgview.cpp \ eventlist.cpp \ - ext_update.cpp \ favorites.cpp \ filebrowser.cpp \ imageinfo.cpp \ @@ -102,6 +101,7 @@ libneutrino_gui_a_SOURCES = \ themes.cpp \ timeosd.cpp \ update.cpp \ + update_ext.cpp \ update_menue.cpp \ update_settings.cpp \ user_menue.cpp \ diff --git a/src/gui/scan_setup.cpp b/src/gui/scan_setup.cpp index 7c648a57c..fb9431046 100644 --- a/src/gui/scan_setup.cpp +++ b/src/gui/scan_setup.cpp @@ -1030,7 +1030,7 @@ void CScanSetup::addScanMenuTempSat(CMenuWidget *temp_sat, sat_config_t & satcon temp_sat->addItem(unilnb); } - mf = new CMenuDForwarder(LOCALE_SATSETUP_LOFL, true, lofL->getValue(), lofL); + CMenuForwarder *mf = new CMenuDForwarder(LOCALE_SATSETUP_LOFL, true, lofL->getValue(), lofL); mf->setHint("", LOCALE_MENU_HINT_SCAN_LOFL); temp_sat->addItem(mf); mf = new CMenuDForwarder(LOCALE_SATSETUP_LOFH, true, lofH->getValue(), lofH); diff --git a/src/gui/update.cpp b/src/gui/update.cpp index 86a30055f..51ed5e007 100644 --- a/src/gui/update.cpp +++ b/src/gui/update.cpp @@ -35,7 +35,7 @@ #endif #include -#include +#include #include #include diff --git a/src/gui/ext_update.cpp b/src/gui/update_ext.cpp similarity index 99% rename from src/gui/ext_update.cpp rename to src/gui/update_ext.cpp index 4c4ffe169..50619921f 100644 --- a/src/gui/ext_update.cpp +++ b/src/gui/update_ext.cpp @@ -33,7 +33,7 @@ #endif #include -#include +#include #include #include diff --git a/src/gui/ext_update.h b/src/gui/update_ext.h similarity index 100% rename from src/gui/ext_update.h rename to src/gui/update_ext.h diff --git a/src/neutrino.cpp b/src/neutrino.cpp index 6ec300fc9..76e48e7ab 100644 --- a/src/neutrino.cpp +++ b/src/neutrino.cpp @@ -1782,8 +1782,7 @@ TIMER_START(); ZapStart_arg.volume = g_settings.current_volume; /* create decoders, read channels */ - CZapit::getInstance()->Start(&ZapStart_arg); - + bool zapit_init = CZapit::getInstance()->Start(&ZapStart_arg); // init audio settings audioDecoder->SetSRS(g_settings.srs_enable, g_settings.srs_nmgr_enable, g_settings.srs_algo, g_settings.srs_ref_volume); //audioDecoder->setVolume(g_settings.current_volume, g_settings.current_volume); @@ -1801,6 +1800,12 @@ TIMER_START(); g_RCInput = new CRCInput(); + /* later on, we'll crash anyway, so tell about it. */ + if (! zapit_init) + ShowMsgUTF(LOCALE_MESSAGEBOX_INFO, + "Zapit initialization failed.\nThis is a fatal error, sorry.", + CMessageBox::mbrBack, CMessageBox::mbBack); + InitZapitClient(); g_Zapit->setStandby(false); @@ -1825,10 +1830,7 @@ TIMER_START(); cpuFreq = new cCpuFreqManager(); cpuFreq->SetCpuFreq(g_settings.cpufreq * 1000 * 1000); - g_info.delivery_system = DVB_S; - if(CFEManager::getInstance()->getLiveFE() != NULL){ - g_info.delivery_system = CFEManager::getInstance()->getLiveFE()->getInfo()->type == FE_QPSK ? DVB_S : DVB_C; - } + g_info.delivery_system = CFEManager::getInstance()->getLiveFE()->getInfo()->type == FE_QPSK ? DVB_S : DVB_C; g_info.delivery_system = CFEManager::getInstance()->getLiveFE()->getInfo()->type == FE_QPSK ? DVB_S : DVB_C; #if HAVE_TRIPLEDRAGON diff --git a/src/nhttpd/web/Y_EPG.js b/src/nhttpd/web/Y_EPG.js index fbac42d1e..ba6db44ca 100644 --- a/src/nhttpd/web/Y_EPG.js +++ b/src/nhttpd/web/Y_EPG.js @@ -64,7 +64,7 @@ function show_epg_item(_index){ var logo =epg_data[_index][7]; $('d_logo').update( (logo!="")?"":"" ); var imdb_link = 'IMDb'; - var klack_link = 'klack.de'; + var klack_link = 'klack.de'; var tvinfo_link = 'tvinfo.de'; $('d_lookup').update(imdb_link+" "+klack_link+" "+tvinfo_link); diff --git a/src/nhttpd/web/Y_Settings_Timer.yhtm b/src/nhttpd/web/Y_Settings_Timer.yhtm index bd9a69344..e7897b78c 100644 --- a/src/nhttpd/web/Y_Settings_Timer.yhtm +++ b/src/nhttpd/web/Y_Settings_Timer.yhtm @@ -5,8 +5,8 @@ // @@ -31,6 +31,7 @@ function do_submit() { {=L:set.timer.password=} + {=L:set.timer.channel_name_replacelist=} diff --git a/src/nhttpd/web/Y_Tools_Timer_Sync.js b/src/nhttpd/web/Y_Tools_Timer_Sync.js index 2a049bdb4..b21a68398 100644 --- a/src/nhttpd/web/Y_Tools_Timer_Sync.js +++ b/src/nhttpd/web/Y_Tools_Timer_Sync.js @@ -72,44 +72,38 @@ function processReqChange() if (document.f.planer[0].checked == true) { var xml = g_req.responseXML; - var recProg_NodeList = xml.getElementsByTagName('recProg'); + var recProg_NodeList = xml.getElementsByTagName('epg_schedule')[0].childNodes; - for(i=0;i0) - sLog_addRow(sLog_body, "green", "Analyze "+recProg_NodeList.length+" Timers", "finished"); + if(counter > 0) + sLog_addRow(sLog_body, "green", "Analyze "+counter+" Timers", "finished"); else sLog_addRow(sLog_body, "yellow", "No Timers found", "finished"); } @@ -274,20 +268,24 @@ function do_set_timer() if(Ergebnis) channel_name = RegExp.$1; } + + var tmpTime = rowNode.childNodes[2].firstChild.nodeValue; + var alTime = tmpTime.replace(/:/gi,"."); + tmpTime = rowNode.childNodes[4].firstChild.nodeValue; + var stTime = tmpTime.replace(/:/gi,"."); + var _urlt = "/control/timer?action=new&alDate="+rowNode.childNodes[1].firstChild.nodeValue - +"&alTime="+rowNode.childNodes[2].firstChild.nodeValue + +"&alTime="+alTime +"&stDate="+rowNode.childNodes[3].firstChild.nodeValue - +"&stTime="+rowNode.childNodes[4].firstChild.nodeValue + +"&stTime="+stTime +"&channel_name="+channel_name +"&rec_dir="+document.f.rec_dir.value +"&rs=1" +"&update=1"; -// _url = _urlt.replace(/:/gi,"."); _url = encodeURI(_urlt); loadSyncURL(_url); channels++; if(document.f.debug.checked) - /*sLog_addRow(sLog_body, "green", "Sync Timer to box: "+channel_name+" "+rowNode.childNodes[6].firstChild.nodeValue, "added");*/ sLog_addRow(sLog_body, "green", "Sync Timer to box url: "+_url, "added"); } } diff --git a/src/nhttpd/web/Y_Tools_Timer_Sync.yhtm b/src/nhttpd/web/Y_Tools_Timer_Sync.yhtm index d4159530a..5b75bedd3 100644 --- a/src/nhttpd/web/Y_Tools_Timer_Sync.yhtm +++ b/src/nhttpd/web/Y_Tools_Timer_Sync.yhtm @@ -14,9 +14,8 @@
- TVInfo
- Klack - + TVInfo
+