X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/494169d25068e3d3dd2dcc8b37b42d32df6935e7..821d8204a00c544ff56a7ac80da22bb0d1e5c81d:/lib/service/listboxservice.cpp

diff --git a/lib/service/listboxservice.cpp b/lib/service/listboxservice.cpp
index e336dc17..035658ee 100644
--- a/lib/service/listboxservice.cpp
+++ b/lib/service/listboxservice.cpp
@@ -2,6 +2,7 @@
 #include <lib/service/service.h>
 #include <lib/gdi/font.h>
 #include <lib/dvb/epgcache.h>
+#include <lib/dvb/pmt.h>
 
 void eListboxServiceContent::setRoot(const eServiceReference &root)
 {
@@ -55,8 +56,18 @@ int eListboxServiceContent::getNextBeginningWithChar(char c)
 		m_service_center->info(*i, service_info);
 		service_info->getName(*i, text);
 //		printf("%c\n", text.c_str()[0]);
-		if (text.c_str()[0] == c)
-			return index;
+		int idx=0;
+		int len=text.length();
+		while ( idx <= len )
+		{
+			char cc = text[idx++];
+			if ( cc >= 33 && cc < 127)
+			{
+				if (cc == c)
+					return index;
+				break;
+			}
+		}
 	}
 	return 0;
 }
@@ -142,8 +153,8 @@ void eListboxServiceContent::setElementFont(int element, gFont *font)
 void eListboxServiceContent::sort()
 {
 	ePtr<iListableService> lst;
-  if (!m_service_center->list(m_root, lst))
-  {
+	if (!m_service_center->list(m_root, lst))
+	{
 		m_list.sort(iListableServiceCompare(lst));
 			/* FIXME: is this really required or can we somehow keep the current entry? */
 		cursorHome();
@@ -155,7 +166,7 @@ void eListboxServiceContent::sort()
 DEFINE_REF(eListboxServiceContent);
 
 eListboxServiceContent::eListboxServiceContent()
-	:epgcache(eEPGCache::getInstance()), m_visual_mode(visModeSimple), m_size(0), m_current_marked(false), m_numberoffset(0)
+	:m_visual_mode(visModeSimple), m_size(0), m_current_marked(false), m_numberoffset(0)
 {
 	cursorHome();
 	eServiceCenter::getInstance(m_service_center);
@@ -288,7 +299,6 @@ int eListboxServiceContent::cursorSet(int n)
 {
 	cursorHome();
 	cursorMove(n);
-	
 	return 0;
 }
 
@@ -338,7 +348,10 @@ void eListboxServiceContent::paint(gPainter &painter, eWindowStyle &style, const
 			/* get service information */
 		ePtr<iStaticServiceInformation> service_info;
 		m_service_center->info(*m_cursor, service_info);
-		
+
+		if (m_is_playable_ignore.valid() && !service_info->isPlayable(*m_cursor, m_is_playable_ignore))
+			painter.setForegroundColor(gRGB(0xbbbbbb));
+
 		for (int e = 0; e < celElements; ++e)
 		{
 			if (!m_element_font[e])
@@ -371,8 +384,7 @@ void eListboxServiceContent::paint(gPainter &painter, eWindowStyle &style, const
 			case celServiceInfo:
 			{
 				ePtr<eServiceEvent> evt;
-				time_t t=-1;
-				if ( !epgcache->lookupEventTime(*m_cursor, t, evt) )
+				if ( !service_info->getEvent(*m_cursor, evt) )
 					text = '(' + evt->getEventName() + ')';
 				else
 					continue;
@@ -422,3 +434,7 @@ void eListboxServiceContent::paint(gPainter &painter, eWindowStyle &style, const
 	painter.clippop();
 }
 
+void eListboxServiceContent::setIgnoreService( const eServiceReference &service )
+{
+	m_is_playable_ignore=service;
+}