X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/8d0841a3c4d57ec102acc2a8ac09123b7ebdee27..633c730e5feed206333c5174d53c6384c08047b2:/lib/service/servicedvb.cpp

diff --git a/lib/service/servicedvb.cpp b/lib/service/servicedvb.cpp
index 8f58cdee..7d737c22 100644
--- a/lib/service/servicedvb.cpp
+++ b/lib/service/servicedvb.cpp
@@ -751,7 +751,10 @@ RESULT eDVBServicePlay::start()
 	m_first_program_info = 1;
 	eServiceReferenceDVB &service = (eServiceReferenceDVB&)m_reference;
 	r = m_service_handler.tune(service, m_is_pvr, m_cue);
-	
+
+	// get back correct service reference (after parsing of recording meta files)
+	m_service_handler.getServiceReference(service);
+
 		/* inject EIT if there is a stored one */
 	if (m_is_pvr)
 	{
@@ -1290,7 +1293,7 @@ int eDVBServicePlay::getCurrentChannel()
 
 RESULT eDVBServicePlay::selectChannel(int i)
 {
-	if (i < LEFT || i > RIGHT)
+	if (i < LEFT || i > RIGHT || i == STEREO)
 		i = -1;  // Stereo
 	if (m_dvb_service)
 		m_dvb_service->setCacheEntry(eDVBService::cACHANNEL, i);
@@ -1689,29 +1692,32 @@ void eDVBServicePlay::updateDecoder()
 			ac3_delay = m_dvb_service->getCacheEntry(eDVBService::cAC3DELAY);
 			pcm_delay = m_dvb_service->getCacheEntry(eDVBService::cPCMDELAY);
 		}
-/*
-		else if (m_reference.path.length()) // workaround for recordings
+		else // subservice or recording
 		{
-			eDebug("playback %s", m_reference.toString().c_str());
-			
-			ePtr<eDVBResourceManager> res_mgr;
-			if (!eDVBResourceManager::getInstance(res_mgr))
+			eServiceReferenceDVB parent = ((eServiceReferenceDVB&)m_reference).getParentServiceReference();
+			if (!parent && !m_reference.path.empty()) // is recording
+			{
+				parent = (eServiceReferenceDVB&)m_reference;
+				parent.path="";
+			}
+			if (parent)
 			{
-				ePtr<iDVBChannelList> db;
-				if (!res_mgr->getChannelList(db))
+				ePtr<eDVBResourceManager> res_mgr;
+				if (!eDVBResourceManager::getInstance(res_mgr))
 				{
-					ePtr<eDVBService> origService;
-					eServiceReference tmp = m_reference;
-					tmp.path="";
-					if (!db->getService((eServiceReferenceDVB&)tmp, origService))
+					ePtr<iDVBChannelList> db;
+					if (!res_mgr->getChannelList(db))
 					{
-						ac3_delay = origService->getCacheEntry(eDVBService::cAC3DELAY);
-						pcm_delay = origService->getCacheEntry(eDVBService::cPCMDELAY);
+						ePtr<eDVBService> origService;
+						if (!db->getService(parent, origService))
+						{
+							ac3_delay = origService->getCacheEntry(eDVBService::cAC3DELAY);
+							pcm_delay = origService->getCacheEntry(eDVBService::cPCMDELAY);
+						}
 					}
 				}
 			}
 		}
-*/
 
 		m_decoder->setAC3Delay(ac3_delay == -1 ? 0 : ac3_delay);
 		m_decoder->setPCMDelay(pcm_delay == -1 ? 0 : pcm_delay);
@@ -1734,6 +1740,15 @@ void eDVBServicePlay::updateDecoder()
 
 		m_decoder->start();
 
+		if (vpid > 0 && vpid < 0x2000)
+			;
+		else
+		{
+			std::string radio_pic;
+			if (!ePythonConfigQuery::getConfigValue("config.misc.radiopic", radio_pic))
+				m_decoder->setRadioPic(radio_pic);
+		}
+
 		m_decoder->setAudioChannel(achannel);
 
 // how we can do this better?
@@ -2004,7 +2019,7 @@ int eDVBServicePlay::getPCMDelay()
 void eDVBServicePlay::setAC3Delay(int delay)
 {
 	if (m_dvb_service)
-		m_dvb_service->setCacheEntry(eDVBService::cAC3DELAY, delay);
+		m_dvb_service->setCacheEntry(eDVBService::cAC3DELAY, delay ? delay : -1);
 	if (m_decoder)
 		m_decoder->setAC3Delay(delay);
 }
@@ -2012,7 +2027,7 @@ void eDVBServicePlay::setAC3Delay(int delay)
 void eDVBServicePlay::setPCMDelay(int delay)
 {
 	if (m_dvb_service)
-		m_dvb_service->setCacheEntry(eDVBService::cPCMDELAY, delay);
+		m_dvb_service->setCacheEntry(eDVBService::cPCMDELAY, delay ? delay : -1);
 	if (m_decoder)
 		m_decoder->setPCMDelay(delay);
 }