X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/e677ac4a7bf81391877c909a703e5918ce4a511b..98c4b5bb004e9297bffa8e1c3572572741fda933:/lib/service/servicedvb.cpp

diff --git a/lib/service/servicedvb.cpp b/lib/service/servicedvb.cpp
index 06b6d97f..a32ce326 100644
--- a/lib/service/servicedvb.cpp
+++ b/lib/service/servicedvb.cpp
@@ -9,6 +9,8 @@
 #include <lib/dvb/dvb.h>
 #include <lib/dvb/db.h>
 
+#include <lib/service/servicedvbrecord.h>
+
 DEFINE_REF(eServiceFactoryDVB)
 
 eServiceFactoryDVB::eServiceFactoryDVB()
@@ -78,15 +80,19 @@ RESULT eDVBServiceList::getContent(std::list<eServiceReference> &list)
 
 RESULT eServiceFactoryDVB::play(const eServiceReference &ref, ePtr<iPlayableService> &ptr)
 {
+	ePtr<eDVBService> service;
+	int r = lookupService(service, ref);
+	if (r)
+		service = 0;
 		// check resources...
-	ptr = new eDVBServicePlay(ref);
+	ptr = new eDVBServicePlay(ref, service);
 	return 0;
 }
 
-RESULT eServiceFactoryDVB::record(const eServiceReference &, ePtr<iRecordableService> &ptr)
+RESULT eServiceFactoryDVB::record(const eServiceReference &ref, ePtr<iRecordableService> &ptr)
 {
-	ptr = 0;
-	return -1;
+	ptr = new eDVBServiceRecord((eServiceReferenceDVB&)ref);
+	return 0;
 }
 
 RESULT eServiceFactoryDVB::list(const eServiceReference &ref, ePtr<iListableService> &ptr)
@@ -97,7 +103,17 @@ RESULT eServiceFactoryDVB::list(const eServiceReference &ref, ePtr<iListableServ
 
 RESULT eServiceFactoryDVB::info(const eServiceReference &ref, ePtr<iStaticServiceInformation> &ptr)
 {
-	ptr = 0;
+	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)
+{
 			// TODO: handle the listing itself
 	// if (ref.... == -1) .. return "... bouquets ...";
 	// could be also done in another serviceFactory (with seperate ID) to seperate actual services and lists
@@ -117,22 +133,18 @@ RESULT eServiceFactoryDVB::info(const eServiceReference &ref, ePtr<iStaticServic
 		return err;
 	}
 	
-	ePtr<eDVBService> service;
-
 		/* we are sure to have a ..DVB reference as the info() call was forwarded here according to it's ID. */
 	if ((err = db->getService((eServiceReferenceDVB&)ref, service)) != 0)
 	{
 		eDebug("getService failed!");
 		return err;
 	}
-	
-		/* eDVBService has the iStaticServiceInformation interface, so we pass it here. */
-	ptr = service;
+
 	return 0;
 }
 
-eDVBServicePlay::eDVBServicePlay(const eServiceReference &ref): 
-	m_reference(ref)
+eDVBServicePlay::eDVBServicePlay(const eServiceReference &ref, eDVBService *service): 
+	m_reference(ref), m_dvb_service(service)
 {
 	CONNECT(m_service_handler.serviceEvent, eDVBServicePlay::serviceEvent);
 	CONNECT(m_event_handler.m_eit_changed, eDVBServicePlay::gotNewEvent);
@@ -146,6 +158,7 @@ eDVBServicePlay::~eDVBServicePlay()
 
 void eDVBServicePlay::gotNewEvent()
 {
+#if 0
 		// debug only
 	ePtr<eServiceEvent> m_event_now, m_event_next;
 	getEvent(m_event_now, 0);
@@ -155,6 +168,8 @@ void eDVBServicePlay::gotNewEvent()
 		eDebug("now running: %s (%d seconds :)", m_event_now->m_event_name.c_str(), m_event_now->m_duration);
 	if (m_event_next)
 		eDebug("next running: %s (%d seconds :)", m_event_next->m_event_name.c_str(), m_event_next->m_duration);
+#endif
+	m_event((iPlayableService*)this, evUpdatedEventInfo);
 }
 
 void eDVBServicePlay::serviceEvent(int event)
@@ -243,6 +258,7 @@ void eDVBServicePlay::serviceEvent(int event)
 RESULT eDVBServicePlay::start()
 {
 	eDebug("starting DVB service");
+	m_event(this, evStart);
 	return m_service_handler.tune((eServiceReferenceDVB&)m_reference);
 }
 
@@ -254,7 +270,8 @@ RESULT eDVBServicePlay::stop()
 
 RESULT eDVBServicePlay::connectEvent(const Slot2<void,iPlayableService*,int> &event, ePtr<eConnection> &connection)
 {
-	return -1;
+	connection = new eConnection((iPlayableService*)this, m_event.connect(event));
+	return 0;
 }
 
 RESULT eDVBServicePlay::pause(ePtr<iPauseableService> &ptr)
@@ -270,9 +287,12 @@ RESULT eDVBServicePlay::info(ePtr<iServiceInformation> &ptr)
 	return 0;
 }
 
-RESULT eDVBServicePlay::getName(const eServiceReference &ref, std::string &name)
+RESULT eDVBServicePlay::getName(std::string &name)
 {
-	name = "DVB service";
+	if (m_dvb_service)
+		m_dvb_service->getName(m_reference, name);
+	else
+		name = "DVB service";
 	return 0;
 }