X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/7a7ecc4dc80279abb51cc8fbafa4055c8fef8d37..70dfd18f5fc6f88b327ff5193b64ebff353c1458:/lib/service/servicedvb.cpp

diff --git a/lib/service/servicedvb.cpp b/lib/service/servicedvb.cpp
index cb5b4b72..86ed83d2 100644
--- a/lib/service/servicedvb.cpp
+++ b/lib/service/servicedvb.cpp
@@ -36,6 +36,7 @@ RESULT eStaticServiceDVBPVRInformation::getName(const eServiceReference &ref, st
 {
 	ASSERT(ref == m_ref);
 	name = m_parser.m_name.size() ? m_parser.m_name : ref.path;
+	return 0;
 }
 
 int eStaticServiceDVBPVRInformation::getLength(const eServiceReference &ref)
@@ -54,13 +55,62 @@ int eStaticServiceDVBPVRInformation::getLength(const eServiceReference &ref)
 	return len / 90000;
 }
 
+
+
+class eDVBPVRServiceOfflineOperations: public iServiceOfflineOperations
+{
+	DECLARE_REF(eDVBPVRServiceOfflineOperations);
+	eServiceReferenceDVB m_ref;
+public:
+	eDVBPVRServiceOfflineOperations(const eServiceReference &ref);
+	
+	RESULT deleteFromDisk(int simulate);
+	RESULT getListOfFilenames(std::list<std::string> &);
+};
+
+DEFINE_REF(eDVBPVRServiceOfflineOperations);
+
+eDVBPVRServiceOfflineOperations::eDVBPVRServiceOfflineOperations(const eServiceReference &ref): m_ref((const eServiceReferenceDVB&)ref)
+{
+}
+
+RESULT eDVBPVRServiceOfflineOperations::deleteFromDisk(int simulate)
+{
+	if (simulate)
+		return 0;
+	else
+	{
+		std::list<std::string> res;
+		if (getListOfFilenames(res))
+			return -1;
+		
+				/* TODO: deferred removing.. */
+		for (std::list<std::string>::iterator i(res.begin()); i != res.end(); ++i)
+		{
+			eDebug("Removing %s...", i->c_str());
+			::unlink(i->c_str());
+		}
+		
+		return 0;
+	}
+}
+
+RESULT eDVBPVRServiceOfflineOperations::getListOfFilenames(std::list<std::string> &res)
+{
+	res.clear();
+	res.push_back(m_ref.path);
+	return 0;
+}
+
+
+
 DEFINE_REF(eServiceFactoryDVB)
 
 eServiceFactoryDVB::eServiceFactoryDVB()
 {
 	ePtr<eServiceCenter> sc;
 	
-	eServiceCenter::getInstance(sc);
+	eServiceCenter::getPrivInstance(sc);
 	if (sc)
 		sc->addServiceFactory(eServiceFactoryDVB::id, this);
 }
@@ -69,7 +119,7 @@ eServiceFactoryDVB::~eServiceFactoryDVB()
 {
 	ePtr<eServiceCenter> sc;
 	
-	eServiceCenter::getInstance(sc);
+	eServiceCenter::getPrivInstance(sc);
 	if (sc)
 		sc->removeServiceFactory(eServiceFactoryDVB::id);
 }
@@ -84,7 +134,7 @@ eDVBServiceList::~eDVBServiceList()
 {
 }
 
-RESULT eDVBServiceList::getContent(std::list<eServiceReference> &list)
+RESULT eDVBServiceList::startQuery()
 {
 	ePtr<iDVBChannelList> db;
 	ePtr<eDVBResourceManager> res;
@@ -101,30 +151,50 @@ RESULT eDVBServiceList::getContent(std::list<eServiceReference> &list)
 		return err;
 	}
 	
-	ePtr<iDVBChannelListQuery> query;
-	
 	ePtr<eDVBChannelQuery> q;
 	
 	if (m_parent.path.size())
+	{
 		eDVBChannelQuery::compile(q, m_parent.path);
+		if (!q)
+		{
+			eDebug("compile query failed");
+			return err;
+		}
+	}
 	
-	if ((err = db->startQuery(query, q)) != 0)
+	if ((err = db->startQuery(m_query, q)) != 0)
 	{
 		eDebug("startQuery failed");
 		return err;
 	}
-	
+
+	return 0;
+}
+
+RESULT eDVBServiceList::getContent(std::list<eServiceReference> &list)
+{
 	eServiceReferenceDVB ref;
 	
-	while (!query->getNextResult(ref))
+	if (!m_query)
+		return -1;
+	
+	while (!m_query->getNextResult(ref))
 		list.push_back(ref);
 	return 0;
 }
 
-RESULT eDVBServiceList::getNext(eServiceReference &)
+RESULT eDVBServiceList::getNext(eServiceReference &ref)
 {
-		/* implement me */
-	return -1;
+	if (!m_query)
+		return -1;
+	
+	return m_query->getNextResult((eServiceReferenceDVB&)ref);
+}
+
+int eDVBServiceList::compareLessEqual(const eServiceReference &a, const eServiceReference &b)
+{
+	return m_query->compareLessEqual((const eServiceReferenceDVB&)a, (const eServiceReferenceDVB&)b);
 }
 
 RESULT eServiceFactoryDVB::play(const eServiceReference &ref, ePtr<iPlayableService> &ptr)
@@ -146,7 +216,14 @@ RESULT eServiceFactoryDVB::record(const eServiceReference &ref, ePtr<iRecordable
 
 RESULT eServiceFactoryDVB::list(const eServiceReference &ref, ePtr<iListableService> &ptr)
 {
-	ptr = new eDVBServiceList(ref);
+	ePtr<eDVBServiceList> list = new eDVBServiceList(ref);
+	if (list->startQuery())
+	{
+		ptr = 0;
+		return -1;
+	}
+	
+	ptr = list;
 	return 0;
 }
 
@@ -169,6 +246,12 @@ RESULT eServiceFactoryDVB::info(const eServiceReference &ref, ePtr<iStaticServic
 	}
 }
 
+RESULT eServiceFactoryDVB::offlineOperations(const eServiceReference &, ePtr<iServiceOfflineOperations> &ptr)
+{
+	ptr = 0;
+	return -1;
+}
+
 RESULT eServiceFactoryDVB::lookupService(ePtr<eDVBService> &service, const eServiceReference &ref)
 {
 			// TODO: handle the listing itself
@@ -201,7 +284,7 @@ RESULT eServiceFactoryDVB::lookupService(ePtr<eDVBService> &service, const eServ
 }
 
 eDVBServicePlay::eDVBServicePlay(const eServiceReference &ref, eDVBService *service): 
-	m_reference(ref), m_dvb_service(service)
+	m_reference(ref), m_dvb_service(service), m_service_handler(0)
 {
 	m_is_pvr = !ref.path.empty();
 	
@@ -334,6 +417,7 @@ RESULT eDVBServicePlay::start()
 	eDebug("starting DVB service");
 	r = m_service_handler.tune((eServiceReferenceDVB&)m_reference);
 	m_event(this, evStart);
+	return 0;
 }
 
 RESULT eDVBServicePlay::stop()
@@ -404,8 +488,11 @@ RESULT eDVBServicePlay::info(ePtr<iServiceInformation> &ptr)
 RESULT eDVBServicePlay::getName(std::string &name)
 {
 	if (m_dvb_service)
+	{
 		m_dvb_service->getName(m_reference, name);
-	else
+		if (name.empty())
+			name = "(...)";
+	} else
 		name = "DVB service";
 	return 0;
 }