X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=blobdiff_plain;f=lib%2Fservice%2Fservicedvb.cpp;h=012493fa0deb14539eb1a114d4c5fb8b1490ea37;hp=d4a3a562ab649aa7391be26a31580362ec33f40a;hb=4531ea135c84d78d96d66a08b67f1f5e09475c55;hpb=a0f0f0b446b7b0fd941194299fa4840b609df1f0

diff --git a/lib/service/servicedvb.cpp b/lib/service/servicedvb.cpp
index d4a3a56..012493f 100644
--- a/lib/service/servicedvb.cpp
+++ b/lib/service/servicedvb.cpp
@@ -370,13 +370,17 @@ int eStaticServiceDVBPVRInformation::getLength(const eServiceReference &ref)
 	struct stat s;
 	stat(ref.path.c_str(), &s);
 
-	if (tstools.openFile(ref.path.c_str()))
+	if (tstools.openFile(ref.path.c_str(), 1))
 		return 0;
 
 			/* check if cached data is still valid */
 	if (m_parser.m_data_ok && (s.st_size == m_parser.m_filesize) && (m_parser.m_length))
 		return m_parser.m_length / 90000;
 
+			/* open again, this time with stream info */
+	if (tstools.openFile(ref.path.c_str()))
+		return 0;
+
 			/* otherwise, re-calc length and update meta file */
 	pts_t len;
 	if (tstools.calcLen(len))
@@ -520,6 +524,7 @@ eServiceFactoryDVB::eServiceFactoryDVB()
 	{
 		std::list<std::string> extensions;
 		extensions.push_back("ts");
+		extensions.push_back("trp");
 		sc->addServiceFactory(eServiceFactoryDVB::id, this, extensions);
 	}
 
@@ -1851,20 +1856,7 @@ PyObject *eDVBServiceBase::getTransponderData(bool original)
 		{
 			ePtr<iDVBFrontend> fe;
 			if(!channel->getFrontend(fe))
-			{
 				fe->getTransponderData(ret, original);
-				ePtr<iDVBFrontendParameters> feparm;
-				channel->getCurrentFrontendParameters(feparm);
-				if (feparm)
-				{
-					eDVBFrontendParametersSatellite osat;
-					if (!feparm->getDVBS(osat))
-					{
-						PutToDict(ret, "orbital_position", osat.orbital_position);
-						PutToDict(ret, "polarization", osat.polarisation);
-					}
-				}
-			}
 		}
 	}
 	else
@@ -2275,8 +2267,18 @@ void eDVBServicePlay::updateDecoder()
 				}
 			}
 		}
-		m_decoder->setAC3Delay(ac3_delay == -1 ? 0 : ac3_delay);
-		m_decoder->setPCMDelay(pcm_delay == -1 ? 0 : pcm_delay);
+
+		std::string config_delay;
+		int config_delay_int = 0;
+		if(ePythonConfigQuery::getConfigValue("config.av.generalAC3delay", config_delay) == 0)
+			config_delay_int = atoi(config_delay.c_str());
+		m_decoder->setAC3Delay(ac3_delay == -1 ? config_delay_int : ac3_delay + config_delay_int);
+
+		if(ePythonConfigQuery::getConfigValue("config.av.generalPCMdelay", config_delay) == 0)
+			config_delay_int = atoi(config_delay.c_str());
+		else
+			config_delay_int = 0;
+		m_decoder->setPCMDelay(pcm_delay == -1 ? config_delay_int : pcm_delay + config_delay_int);
 
 		m_decoder->setVideoPID(vpid, vpidtype);
 		selectAudioStream();