merge public git

Origin commit data
------------------
Branch: ni/coolstream
Commit: 8971fdf843
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-01-16 (Wed, 16 Jan 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit

src/gui/Makefile.am

@@ -57,7 +57,6 @@ libneutrino_gui_a_SOURCES = \
 	epgplus.cpp \
 	epgview.cpp \
 	eventlist.cpp \
-	ext_update.cpp \
 	favorites.cpp \
 	filebrowser.cpp \
 	imageinfo.cpp \
@@ -97,6 +96,7 @@ libneutrino_gui_a_SOURCES = \
 	themes.cpp \
 	timeosd.cpp \
 	update.cpp \
+	update_ext.cpp \
 	update_menue.cpp \
 	update_settings.cpp \
 	user_menue.cpp \

src/gui/scan_setup.cpp

@@ -633,7 +633,7 @@ int CScanSetup::showUnicableSetup()
 	uni_setup->addIntroItems();
 
 	uni_setup->addItem(uniscr);
-	CMenuForwarder *mf = new CMenuForwarder(LOCALE_UNICABLE_QRG, true, uniqrg->getValue(), uniqrg);
+	CMenuForwarder *mf = new CMenuDForwarder(LOCALE_UNICABLE_QRG, true, uniqrg->getValue(), uniqrg);
 	uni_setup->addItem(mf);
 	res = uni_setup->exec(NULL, "");
 	delete uni_setup;
@@ -864,7 +864,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);

src/gui/update.cpp

@@ -35,7 +35,7 @@
 #endif
 
 #include <gui/update.h>
-#include <gui/ext_update.h>
+#include <gui/update_ext.h>
 
 #include <global.h>
 #include <neutrino.h>

src/gui/update_ext.cpp

@@ -33,7 +33,7 @@
 #endif
 
 #include <gui/update.h>
-#include <gui/ext_update.h>
+#include <gui/update_ext.h>
 
 #include <global.h>
 #include <neutrino.h>

src/neutrino.cpp

@@ -1777,8 +1777,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);
@@ -1796,6 +1795,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);
 
@@ -1820,10 +1825,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;
 #if HAVE_TRIPLEDRAGON

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!="")?"<img class=\"channel_logos\" src=\""+logo+"\">":"" );
 	var imdb_link = '<a target="_blank" class="exlink" href="http://german.imdb.com/find?s=all&q='+(epg_data[_index][0]).gsub(" ","+")+'">IMDb</a>';
-	var klack_link = '<a target="_blank" class="exlink" href="http://www.klack.de/index.php?page=Programfinder2.php&TITLE='+(epg_data[_index][0]).gsub(" ","+")+'">klack.de</a>';
+	var klack_link = '<a target="_blank" class="exlink" href="http://www.klack.de/programmsuche.html?search=1&title='+(epg_data[_index][0]).gsub(" ","+")+'">klack.de</a>';
 	var tvinfo_link = '<a target="_blank" class="exlink" href="http://www.tvinfo.de/exe.php3?quicksearch=1&volltext='+(epg_data[_index][0]).gsub(" ","+")+'&tpk=&showall=&genretipp=&target=list.inc">tvinfo.de</a>';
 	$('d_lookup').update(imdb_link+" "+klack_link+" "+tvinfo_link);
 	

src/nhttpd/web/Y_Settings_Timer.yhtm

@@ -5,8 +5,8 @@
 //<![CDATA[
 function do_submit() {
 	show_waitbox(true);
-	var t = document.f.klack_url.value.replace(/&/gi,";");
+//	var t = document.f.klack_url.value.replace(/&/gi,";");
-	document.f.klack_url.value = t;
+//	document.f.klack_url.value = t;
 	document.f.submit();
 }
 //]]>
@@ -31,6 +31,7 @@ function do_submit() {
 				<td>{=L:set.timer.password=}</td>
 				<td><input type="password" name="tvinfo_password" size="15" value="{=ini-get:/var/tuxbox/config/Y-Web.conf;tvinfo_password=}"/></td>
 			</tr>
+<!--
 			<tr>
 				<td colspan="2" class="y_form_header">klack.de (V2)</td>
 			</tr>
@@ -43,6 +44,7 @@ function do_submit() {
 				<td>{=L:set.timer.klack.security_code=}</td>
 				<td><input type="password" name="klack_securitycode" size="15" value="{=ini-get:/var/tuxbox/config/Y-Web.conf;klack_securitycode=}" title="{=L:set.timer.klack.security_code_desc=}"/></td>
 			</tr>
+// -->
 			<tr>
 				<td colspan="2" class="y_form_header">{=L:set.timer.channel_name_replacelist=}</td>
 			</tr>

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;i<recProg_NodeList.length;i++)
+				var counter = 0;
+				for(i = 0; i < recProg_NodeList.length; i++)
 				{
 					var recProg_Node = recProg_NodeList[i];
-
+					if ((recProg_Node.nodeName == 'epg_schedule_entry') && (recProg_Node.getAttribute('eventtype') == 'rec'))
-					var sender		= getXMLNodeItemValue(recProg_Node, 'sender');
+					{
-					var progName 		= getXMLNodeItemValue(recProg_Node, 'progName');
+						var sender		= recProg_Node.getAttribute('channel');
-					var progStartDate 	= getXMLNodeItemValue(recProg_Node, 'progStartDate');
+						var progStartTime 	= recProg_Node.getAttribute('starttime');
-					var progStartTime 	= getXMLNodeItemValue(recProg_Node, 'progStartTime');
+						var progEndTime 	= recProg_Node.getAttribute('endtime');
-					var progEndDate 	= getXMLNodeItemValue(recProg_Node, 'progEndDate');
+						var progName	 	= getXMLNodeItemValue(recProg_Node, 'title');
-					var progEndTime 	= getXMLNodeItemValue(recProg_Node, 'progEndTime');
 
 						progName = decodeURI(progName);
+						var Ausdruck = /(.*)-(.*)-(.*) (.*):(.*):(.*) +(.*)*$/;
 						/*convert startdate*/
-					var Ausdruck = /(.*)-(.*)-(.*).*$/;
-					Ausdruck.exec(progStartDate);
-					var alDate = RegExp.$3+"."+RegExp.$2+"."+RegExp.$1;
-
-					Ausdruck = /(.*):(.*):(.*).*$/;
 						Ausdruck.exec(progStartTime);
-					var alTime = RegExp.$1+":"+RegExp.$2;
+						var alDate = RegExp.$3+"."+RegExp.$2+"."+RegExp.$1;
-
+						var alTime = RegExp.$4+":"+RegExp.$5;
 						/*convert enddate*/
-					Ausdruck = /(.*)-(.*)-(.*).*$/;
-					Ausdruck.exec(progEndDate);
-					var stDate = RegExp.$3+"."+RegExp.$2+"."+RegExp.$1;
-
-					Ausdruck = /(.*):(.*):(.*).*$/;
 						Ausdruck.exec(progEndTime);
-					var stTime = RegExp.$1+":"+RegExp.$2;
+						var stDate = RegExp.$3+"."+RegExp.$2+"."+RegExp.$1;
+						var stTime = RegExp.$4+":"+RegExp.$5;
 
 						timer_list_addRow(timer_body, i, alDate, alTime, stDate, stTime, sender, progName, "TVInfo");
 						if(document.f.debug.checked == true)
 							sLog_addRow(sLog_body, "green", "- Timer "+i+": "+alDate+" "+alTime+" "+sender+" "+progName, "analyzed");
+						counter++;
 					}
-				if(recProg_NodeList.length>0)
+				}
-					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");
 		}
 	}

src/nhttpd/web/Y_Tools_Timer_Sync.yhtm

@@ -14,9 +14,8 @@
 		<table border="0" cellspacing="0" cellpadding="4" width="100%">
 		<tr>
 		<td>
-			<input type="radio" name="planer" value="TVInfo" {=if-empty:{=ini-get:/var/tuxbox/config/Y-Web.conf;tvinfo_username=}~disabled~=}/>TVInfo<br/>
+			<input type="radio" name="planer" value="TVInfo" checked="checked" {=if-empty:{=ini-get:/var/tuxbox/config/Y-Web.conf;tvinfo_username=}~disabled~=}/>TVInfo<br/>
-			<input type="radio" name="planer" value="Klack" {=if-empty:{=ini-get:/var/tuxbox/config/Y-Web.conf;klack_url=}~disabled~=}/>Klack
+			<input type="radio" name="planer" value="Klack" disabled="disabled" style="display: none;" {=if-empty:{=ini-get:/var/tuxbox/config/Y-Web.conf;klack_url=}~disabled~=}/><!--Klack// -->&nbsp;
-
 		</td>
 		<td>
 		<!--

src/nhttpd/web/scripts/Y_Tools.sh

@@ -560,7 +560,7 @@ case "$1" in
 	timer_get_tvinfo)
 		shift 1
 		rm -r /tmp/tvinfo.xml
-		res=`wget -O /tmp/tvinfo.xml "http://www.tvinfo.de/share/vidac/rec_info.php?username=$1&password=$2" 2>&1`
+		res=$(wget -O /tmp/tvinfo.xml "http://www.tvinfo.de/share/openepg/schedule.php?username=$1&password=$2" 2>&1)
 		if  ! [ -s /tmp/tvinfo.xml ]
 		then
 			res="$res File empty!"

src/system/helpers.cpp

@@ -37,7 +37,7 @@
 #include <zapit/debug.h>
 
 #include <system/helpers.h>
-#include <gui/ext_update.h>
+#include <gui/update_ext.h>
 
 bool file_exists(const char *filename)
 {

src/zapit/src/zapit.cpp

@@ -2023,6 +2023,10 @@ bool CZapit::Start(Z_start_arg *ZapStart_arg)
 
 	CFEManager::getInstance()->Init();
 	live_fe = CFEManager::getInstance()->getFE(0);
+
+	if (live_fe == NULL) /* no frontend found? */
+		return false;
+
 	/* load configuration or set defaults if no configuration file exists */
 	video_mode = ZapStart_arg->video_mode;
 	current_volume = ZapStart_arg->volume;