X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/0ee9e6abfea296a1edced778f5c3ccd9d3f1e67b..2b557e7ef4b0518736c5162a501cd9bc743930b3:/lib/service/servicedvb.cpp?ds=inline

diff --git a/lib/service/servicedvb.cpp b/lib/service/servicedvb.cpp
index 56a18e48..0a7a6715 100644
--- a/lib/service/servicedvb.cpp
+++ b/lib/service/servicedvb.cpp
@@ -172,8 +172,8 @@ int eStaticServiceDVBBouquetInformation::isPlayable(const eServiceReference &ref
 		((const eServiceReferenceDVB&)ignore).getChannelID(chid_ignore);
 		for (std::list<eServiceReference>::iterator it(bouquet->m_services.begin()); it != bouquet->m_services.end(); ++it)
 		{
-			int tmp=res->canAllocateChannel(chid, chid_ignore);
 			((const eServiceReferenceDVB&)*it).getChannelID(chid);
+			int tmp=res->canAllocateChannel(chid, chid_ignore);
 			if (tmp > cur)
 			{
 				m_playable_service = *it;
@@ -192,6 +192,13 @@ int eStaticServiceDVBBouquetInformation::getLength(const eServiceReference &ref)
 	return -1;
 }
 
+#include <lib/dvb/epgcache.h>
+
+RESULT eStaticServiceDVBBouquetInformation::getEvent(const eServiceReference &ref, ePtr<eServiceEvent> &ptr, time_t start_time)
+{
+	return eEPGCache::getInstance()->lookupEventTime(ref, start_time, ptr);
+}
+
 class eStaticServiceDVBPVRInformation: public iStaticServiceInformation
 {
 	DECLARE_REF(eStaticServiceDVBPVRInformation);
@@ -202,7 +209,7 @@ public:
 	RESULT getName(const eServiceReference &ref, std::string &name);
 	int getLength(const eServiceReference &ref);
 	RESULT getEvent(const eServiceReference &ref, ePtr<eServiceEvent> &SWIG_OUTPUT, time_t start_time);
-
+	int isPlayable(const eServiceReference &ref, const eServiceReference &ignore) { return 1; }
 	int getInfo(const eServiceReference &ref, int w);
 	std::string getInfoString(const eServiceReference &ref,int w);
 };
@@ -545,7 +552,7 @@ RESULT eDVBServiceList::getNext(eServiceReference &ref)
 
 RESULT eDVBServiceList::startEdit(ePtr<iMutableServiceList> &res)
 {
-	if (m_parent.flags & eServiceReference::flagDirectory) // bouquet
+	if (m_parent.flags & eServiceReference::canDescent) // bouquet
 	{
 		ePtr<iDVBChannelList> db;
 		ePtr<eDVBResourceManager> resm;
@@ -639,7 +646,7 @@ RESULT eServiceFactoryDVB::list(const eServiceReference &ref, ePtr<iListableServ
 RESULT eServiceFactoryDVB::info(const eServiceReference &ref, ePtr<iStaticServiceInformation> &ptr)
 {
 	/* is a listable service? */
-	if ((ref.flags & eServiceReference::flagDirectory) == eServiceReference::flagDirectory) // bouquet
+	if (ref.flags & eServiceReference::canDescent) // bouquet
 	{
 		if ( !ref.name.empty() )  // satellites or providers list
 			ptr = m_StaticServiceDVBInfo;