From: Felix Domke <tmbinc@elitedvb.net>
Date: Fri, 13 Feb 2009 13:40:56 +0000 (+0100)
Subject: better fix for timeshift
X-Git-Tag: 2.6.0~350^2~8
X-Git-Url: https://git.cweiske.de/enigma2.git/commitdiff_plain/5698c2b573e69c2e62ee8212893f620f0588c208

better fix for timeshift
---

diff --git a/lib/dvb/pmt.cpp b/lib/dvb/pmt.cpp
index 279ec74f..0198c8f7 100644
--- a/lib/dvb/pmt.cpp
+++ b/lib/dvb/pmt.cpp
@@ -605,12 +605,15 @@ void eDVBServicePMTHandler::SDTScanEvent(int event)
 	}
 }
 
-int eDVBServicePMTHandler::tune(eServiceReferenceDVB &ref, int use_decode_demux, eCueSheet *cue, bool simulate)
+int eDVBServicePMTHandler::tune(eServiceReferenceDVB &ref, int use_decode_demux, eCueSheet *cue, bool simulate, eDVBService *service)
 {
 	RESULT res=0;
 	m_reference = ref;
 	
 	m_use_decode_demux = use_decode_demux;
+
+		/* use given service as backup. This is used for timeshift where we want to clone the live stream using the cache, but in fact have a PVR channel */
+	m_service = service;
 	
 		/* is this a normal (non PVR) channel? */
 	if (ref.path.empty())
diff --git a/lib/service/servicedvb.cpp b/lib/service/servicedvb.cpp
index 4773d097..8a609095 100644
--- a/lib/service/servicedvb.cpp
+++ b/lib/service/servicedvb.cpp
@@ -2189,7 +2189,7 @@ void eDVBServicePlay::switchToTimeshift()
 	r.path = m_timeshift_file;
 
 	m_cue = new eCueSheet();
-	m_service_handler_timeshift.tune(r, 1, m_cue); /* use the decoder demux for everything */
+	m_service_handler_timeshift.tune(r, 1, m_cue, 0, m_dvb_service); /* use the decoder demux for everything */
 
 	eDebug("eDVBServicePlay::switchToTimeshift, in pause mode now.");
 	pause();
@@ -2205,7 +2205,7 @@ void eDVBServicePlay::updateDecoder()
 	eDVBServicePMTHandler &h = m_timeshift_active ? m_service_handler_timeshift : m_service_handler;
 
 	eDVBServicePMTHandler::program program;
-	if (h.getProgramInfo(program) && m_service_handler.getProgramInfo(program))
+	if (h.getProgramInfo(program))
 		eDebug("getting program info failed.");
 	else
 	{