X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/b60edd97068cc078b6a63a3e247e20860472cb79..672b0fa44cd420dbf5b4d1f9c9a5c3201ada06da:/lib/service/servicedvb.cpp

diff --git a/lib/service/servicedvb.cpp b/lib/service/servicedvb.cpp
index 52978dc3..e62d7783 100644
--- a/lib/service/servicedvb.cpp
+++ b/lib/service/servicedvb.cpp
@@ -336,6 +336,7 @@ public:
 	int isPlayable(const eServiceReference &ref, const eServiceReference &ignore) { return 1; }
 	int getInfo(const eServiceReference &ref, int w);
 	std::string getInfoString(const eServiceReference &ref,int w);
+	PyObject *getInfoObject(const eServiceReference &r, int what);
 };
 
 DEFINE_REF(eStaticServiceDVBPVRInformation);
@@ -400,6 +401,8 @@ int eStaticServiceDVBPVRInformation::getInfo(const eServiceReference &ref, int w
 		return iServiceInformation::resIsString;
 	case iServiceInformation::sServiceref:
 		return iServiceInformation::resIsString;
+	case iServiceInformation::sFileSize:
+		return m_parser.m_filesize;
 	case iServiceInformation::sTimeCreate:
 		if (m_parser.m_time_create)
 			return m_parser.m_time_create;
@@ -425,6 +428,17 @@ std::string eStaticServiceDVBPVRInformation::getInfoString(const eServiceReferen
 	}
 }
 
+PyObject *eStaticServiceDVBPVRInformation::getInfoObject(const eServiceReference &r, int what)
+{
+	switch (what)
+	{
+	case iServiceInformation::sFileSize:
+		return PyLong_FromLongLong(m_parser.m_filesize);
+	default:
+		Py_RETURN_NONE;
+	}
+}
+
 RESULT eStaticServiceDVBPVRInformation::getEvent(const eServiceReference &ref, ePtr<eServiceEvent> &evt, time_t start_time)
 {
 	if (!ref.path.empty())
@@ -1515,7 +1529,7 @@ int eDVBServicePlay::getInfo(int w)
 		int aspect = -1;
 		if (m_decoder)
 			aspect = m_decoder->getVideoAspect();
-		if (no_program_info)
+		if (aspect == -1 && no_program_info)
 			break;
 		else if (aspect == -1 && !program.videoStreams.empty() && program.videoStreams[0].component_tag != -1)
 		{
@@ -2824,18 +2838,22 @@ void eDVBServicePlay::checkSubtitleTiming()
 			m_decoder->getPTS(0, pos);
 
 		eDebug("%lld %lld", pos, show_time);
-		int diff =  show_time - pos;
+		int diff = show_time - pos;
+		if (type == TELETEXT && !page.m_have_pts)
+		{
+			eDebug("ttx subtitle page without pts... immediate show");
+			diff = 0;
+		}
 		if (diff < 0)
 		{
 			eDebug("[late (%d ms)]", -diff / 90);
 			diff = 0;
 		}
-//		if (diff > 900000)
-//		{
-//			eDebug("[invalid]");
-//			diff = 0;
-//		}
-	
+		if (abs(diff) > 1800000)
+		{
+			eDebug("[invalid]... immediate show!");
+			diff = 0;
+		}
 		if ((diff/90)<20)
 		{
 			if (type == TELETEXT)