X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/2c1f4947646d051133197a23a73ee985b56e1713..064515cf022f9ec6197c355b259960f5cb5d731e:/lib/service/listboxservice.cpp

diff --git a/lib/service/listboxservice.cpp b/lib/service/listboxservice.cpp
index 9d68a5e8..13538e99 100644
--- a/lib/service/listboxservice.cpp
+++ b/lib/service/listboxservice.cpp
@@ -3,12 +3,29 @@
 #include <lib/gdi/font.h>
 #include <lib/dvb/epgcache.h>
 #include <lib/dvb/pmt.h>
+#include <lib/python/connections.h>
 
-void eListboxServiceContent::setRoot(const eServiceReference &root)
+void eListboxServiceContent::addService(const eServiceReference &service)
+{
+	m_list.push_back(service);
+}
+
+void eListboxServiceContent::FillFinished()
+{
+	m_size = m_list.size();
+	cursorHome();
+
+	if (m_listbox)
+		m_listbox->entryReset();
+}
+
+void eListboxServiceContent::setRoot(const eServiceReference &root, bool justSet)
 {
 	m_list.clear();
 	m_root = root;
-	
+
+	if (justSet)
+		return;
 	assert(m_service_center);
 	
 	ePtr<iListableService> lst;
@@ -18,11 +35,7 @@ void eListboxServiceContent::setRoot(const eServiceReference &root)
 		if (lst->getContent(m_list))
 			eDebug("getContent failed");
 
-	m_size = m_list.size();
-	cursorHome();
-	
-	if (m_listbox)
-		m_listbox->entryReset();
+	FillFinished();
 }
 
 void eListboxServiceContent::setCurrent(const eServiceReference &ref)
@@ -35,6 +48,8 @@ void eListboxServiceContent::setCurrent(const eServiceReference &ref)
 			m_cursor_number = index;
 			break;
 		}
+	if (m_listbox)
+		m_listbox->moveSelectionTo(index);
 }
 
 void eListboxServiceContent::getCurrent(eServiceReference &ref)
@@ -129,7 +144,7 @@ void eListboxServiceContent::setVisualMode(int mode)
 	if (m_visual_mode == visModeSimple)
 	{
 		m_element_position[celServiceName] = eRect(ePoint(0, 0), m_itemsize);
-		m_element_font[celServiceName] = new gFont("Arial", 23);
+		m_element_font[celServiceName] = new gFont("Regular", 23);
 		m_element_position[celServiceNumber] = eRect();
 		m_element_font[celServiceNumber] = 0;
 		m_element_position[celIcon] = eRect();
@@ -166,18 +181,21 @@ void eListboxServiceContent::sort()
 DEFINE_REF(eListboxServiceContent);
 
 eListboxServiceContent::eListboxServiceContent()
-	:m_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);
-	if (eDVBResourceManager::getInstance(m_res_mgr))
-		eDebug("no resource manager");
 }
 
 void eListboxServiceContent::cursorHome()
 {
 	if (m_current_marked && m_saved_cursor == m_list.end())
 	{
+		if (m_cursor_number >= m_size)
+		{
+			m_cursor_number = m_size-1;
+			--m_cursor;
+		}
 		while (m_cursor_number)
 		{
 			std::iter_swap(m_cursor--, m_cursor);
@@ -337,30 +355,12 @@ void eListboxServiceContent::paint(gPainter &painter, eWindowStyle &style, const
 {
 	painter.clip(eRect(offset, m_itemsize));
 
-	bool tuneable=true;
-
-	if (m_res_mgr && cursorValid() && !((m_cursor->flags & eServiceReference::flagDirectory) == eServiceReference::flagDirectory))
-	{
-		if ( eDVBServicePMTHandler::getCount() > 1 )
-		{
-			eServiceReferenceDVB &ref = (eServiceReferenceDVB&) *m_cursor;
-			eUsePtr<iDVBChannel> channel;
-			eDVBChannelID chid;
-			ref.getChannelID(chid);
-			tuneable = !m_res_mgr->allocateChannel(chid, channel, true);  // no real allocate channel..just fake
-		}
-	}
-
 	if (m_current_marked && selected)
 		style.setStyle(painter, eWindowStyle::styleListboxMarked);
 	else if (cursorValid() && isMarked(*m_cursor))
 		style.setStyle(painter, eWindowStyle::styleListboxMarked);
 	else
-	{
 		style.setStyle(painter, selected ? eWindowStyle::styleListboxSelected : eWindowStyle::styleListboxNormal);
-		if (!tuneable)
-			painter.setForegroundColor(gRGB(0xbbbbbb));
-	}
 	painter.clear();
 	
 	if (cursorValid())
@@ -368,7 +368,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])
@@ -401,8 +404,7 @@ void eListboxServiceContent::paint(gPainter &painter, eWindowStyle &style, const
 			case celServiceInfo:
 			{
 				ePtr<eServiceEvent> evt;
-				time_t t=-1;
-				if ( !m_epgcache->lookupEventTime(*m_cursor, t, evt) )
+				if ( !service_info->getEvent(*m_cursor, evt) )
 					text = '(' + evt->getEventName() + ')';
 				else
 					continue;
@@ -452,3 +454,7 @@ void eListboxServiceContent::paint(gPainter &painter, eWindowStyle &style, const
 	painter.clippop();
 }
 
+void eListboxServiceContent::setIgnoreService( const eServiceReference &service )
+{
+	m_is_playable_ignore=service;
+}