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

diff --git a/lib/service/servicedvb.cpp b/lib/service/servicedvb.cpp
index 94c31b4f..fb84aa18 100644
--- a/lib/service/servicedvb.cpp
+++ b/lib/service/servicedvb.cpp
@@ -568,7 +568,8 @@ RESULT eServiceFactoryDVB::lookupService(ePtr<eDVBService> &service, const eServ
 eDVBServicePlay::eDVBServicePlay(const eServiceReference &ref, eDVBService *service): 
 	m_reference(ref), m_dvb_service(service), m_is_paused(0)
 {
-	m_is_pvr = !ref.path.empty();
+	m_is_primary = 1;
+	m_is_pvr = !m_reference.path.empty();
 	
 	m_timeshift_enabled = m_timeshift_active = 0;
 	m_skipmode = 0;
@@ -675,7 +676,8 @@ RESULT eDVBServicePlay::start()
 		/* in pvr mode, we only want to use one demux. in tv mode, we're using 
 		   two (one for decoding, one for data source), as we must be prepared
 		   to start recording from the data demux. */
-	m_cue = new eCueSheet();
+	if (m_is_pvr)
+		m_cue = new eCueSheet();
 
 	m_first_program_info = 1;
 	eServiceReferenceDVB &service = (eServiceReferenceDVB&)m_reference;
@@ -727,6 +729,12 @@ RESULT eDVBServicePlay::stop()
 	return 0;
 }
 
+RESULT eDVBServicePlay::setTarget(int target)
+{
+	m_is_primary = !target;
+	return 0;
+}
+
 RESULT eDVBServicePlay::connectEvent(const Slot2<void,iPlayableService*,int> &event, ePtr<eConnection> &connection)
 {
 	connection = new eConnection((iPlayableService*)this, m_event.connect(event));
@@ -1009,6 +1017,9 @@ int eDVBServicePlay::getInfo(int w)
 {
 	eDVBServicePMTHandler::program program;
 
+	if (w == sCAIDs)
+		return resIsPyObject;
+
 	if (m_service_handler.getProgramInfo(program))
 		return -1;
 	
@@ -1070,15 +1081,29 @@ int eDVBServicePlay::getInfo(int w)
 }
 
 std::string eDVBServicePlay::getInfoString(int w)
-{	
+{
 	switch (w)
 	{
 	case sProvider:
 		if (!m_dvb_service) return "";
 		return m_dvb_service->m_provider_name;
 	default:
-		return "";
+		break;
 	}
+	return iServiceInformation::getInfoString(w);
+}
+
+PyObject *eDVBServicePlay::getInfoObject(int w)
+{
+	switch (w)
+	{
+	case sCAIDs:
+		if (m_dvb_service)
+			return m_service_handler.getCaIds();
+	default:
+		break;
+	}
+	return iServiceInformation::getInfoObject(w);
 }
 
 int eDVBServicePlay::getNumberOfTracks()
@@ -1439,6 +1464,7 @@ void eDVBServicePlay::switchToLive()
 	if (!m_timeshift_active)
 		return;
 	
+	m_cue = 0;
 	m_decoder = 0;
 	m_decode_demux = 0;
 		/* free the timeshift service handler, we need the resources */
@@ -1465,6 +1491,7 @@ void eDVBServicePlay::switchToTimeshift()
 	eServiceReferenceDVB r = (eServiceReferenceDVB&)m_reference;
 	r.path = m_timeshift_file;
 	
+	m_cue = new eCueSheet();
 	m_service_handler_timeshift.tune(r, 1, m_cue); /* use the decoder demux for everything */
 	updateDecoder(); /* mainly to switch off PCR */
 }
@@ -1524,7 +1551,7 @@ void eDVBServicePlay::updateDecoder()
 	{
 		h.getDecodeDemux(m_decode_demux);
 		if (m_decode_demux)
-			m_decode_demux->getMPEGDecoder(m_decoder);
+			m_decode_demux->getMPEGDecoder(m_decoder, m_is_primary);
 		if (m_cue)
 			m_cue->setDecodingDemux(m_decode_demux, m_decoder);
 	}
@@ -1534,11 +1561,13 @@ void eDVBServicePlay::updateDecoder()
 		m_decoder->setVideoPID(vpid);
 		m_current_audio_stream = 0;
 		m_decoder->setAudioPID(apid, apidtype);
-		if (!(m_is_pvr || m_timeshift_active))
+		if (!(m_is_pvr || m_timeshift_active || !m_is_primary))
 			m_decoder->setSyncPCR(pcrpid);
 		else
 			m_decoder->setSyncPCR(-1);
 		m_decoder->setTextPID(tpid);
+		if (!m_is_primary)
+			m_decoder->setTrickmode(1);
 		m_decoder->start();
 // how we can do this better?
 // update cache pid when the user changed the audio track or video track