X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/181d3463e3545890e0a0c60081e84af67d302614..defa1a765f48ec880b36b14a247b89649553c2ec:/lib/service/servicedvb.cpp?ds=sidebyside

diff --git a/lib/service/servicedvb.cpp b/lib/service/servicedvb.cpp
index a32ce326..5618477c 100644
--- a/lib/service/servicedvb.cpp
+++ b/lib/service/servicedvb.cpp
@@ -10,6 +10,31 @@
 #include <lib/dvb/db.h>
 
 #include <lib/service/servicedvbrecord.h>
+#include <lib/dvb/metaparser.h>
+
+class eStaticServiceDVBPVRInformation: public iStaticServiceInformation
+{
+	DECLARE_REF(eStaticServiceDVBPVRInformation);
+	eServiceReference m_ref;
+	eDVBMetaParser m_parser;
+public:
+	eStaticServiceDVBPVRInformation(const eServiceReference &ref);
+	RESULT getName(const eServiceReference &ref, std::string &name);
+};
+
+DEFINE_REF(eStaticServiceDVBPVRInformation);
+
+eStaticServiceDVBPVRInformation::eStaticServiceDVBPVRInformation(const eServiceReference &ref)
+{
+	m_ref = ref;
+	m_parser.parseFile(ref.path);
+}
+
+RESULT eStaticServiceDVBPVRInformation::getName(const eServiceReference &ref, std::string &name)
+{
+	ASSERT(ref == m_ref);
+	name = m_parser.m_name.size() ? m_parser.m_name : ref.path;
+}
 
 DEFINE_REF(eServiceFactoryDVB)
 
@@ -78,6 +103,12 @@ RESULT eDVBServiceList::getContent(std::list<eServiceReference> &list)
 	return 0;
 }
 
+RESULT eDVBServiceList::getNext(eServiceReference &)
+{
+		/* implement me */
+	return -1;
+}
+
 RESULT eServiceFactoryDVB::play(const eServiceReference &ref, ePtr<iPlayableService> &ptr)
 {
 	ePtr<eDVBService> service;
@@ -103,13 +134,21 @@ RESULT eServiceFactoryDVB::list(const eServiceReference &ref, ePtr<iListableServ
 
 RESULT eServiceFactoryDVB::info(const eServiceReference &ref, ePtr<iStaticServiceInformation> &ptr)
 {
-	ePtr<eDVBService> service;
-	int r = lookupService(service, ref);
-	if (r)
-		return r;
-		/* eDVBService has the iStaticServiceInformation interface, so we pass it here. */
-	ptr = service;
-	return 0;
+		/* do we have a PVR service? */
+	if (ref.path.size())
+	{
+		ptr = new eStaticServiceDVBPVRInformation(ref);
+		return 0;
+	} else
+	{
+		ePtr<eDVBService> service;
+		int r = lookupService(service, ref);
+		if (r)
+			return r;
+			/* eDVBService has the iStaticServiceInformation interface, so we pass it here. */
+		ptr = service;
+		return 0;
+	}
 }
 
 RESULT eServiceFactoryDVB::lookupService(ePtr<eDVBService> &service, const eServiceReference &ref)
@@ -248,6 +287,12 @@ void eDVBServicePlay::serviceEvent(int event)
 			m_decoder->setAudioPID(apid, 0);
 			m_decoder->setSyncPCR(pcrpid);
 			m_decoder->start();
+// how we can do this better?
+// update cache pid when the user changed the audio track or video track
+// TODO handling of difference audio types.. default audio types..
+			m_dvb_service->setCachePID(eDVBService::cVPID, vpid);
+			m_dvb_service->setCachePID(eDVBService::cAPID, apid);
+			m_dvb_service->setCachePID(eDVBService::cPCRPID, pcrpid);
 		}
 		
 		break;