X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/77899dbcdd418844bb0749eeb2538b87eed4c83f..af5dfb0ec911f152f909530cf29c9e2ba74e2c1f:/lib/service/servicedvb.cpp

diff --git a/lib/service/servicedvb.cpp b/lib/service/servicedvb.cpp
index 8ff07250..94c31b4f 100644
--- a/lib/service/servicedvb.cpp
+++ b/lib/service/servicedvb.cpp
@@ -10,6 +10,7 @@
 #include <lib/dvb/db.h>
 #include <lib/dvb/decoder.h>
 
+#include <lib/components/file_eraser.h>
 #include <lib/service/servicedvbrecord.h>
 #include <lib/service/event.h>
 #include <lib/dvb/metaparser.h>
@@ -185,6 +186,8 @@ int eStaticServiceDVBPVRInformation::getInfo(const eServiceReference &ref, int w
 	{
 	case iServiceInformation::sDescription:
 		return iServiceInformation::resIsString;
+	case iServiceInformation::sServiceref:
+		return iServiceInformation::resIsString;
 	case iServiceInformation::sTimeCreate:
 		if (m_parser.m_time_create)
 			return m_parser.m_time_create;
@@ -201,6 +204,8 @@ std::string eStaticServiceDVBPVRInformation::getInfoString(const eServiceReferen
 	{
 	case iServiceInformation::sDescription:
 		return m_parser.m_description;
+	case iServiceInformation::sServiceref:
+		return m_parser.m_ref.toString();
 	default:
 		return "";
 	}
@@ -233,11 +238,18 @@ RESULT eDVBPVRServiceOfflineOperations::deleteFromDisk(int simulate)
 		if (getListOfFilenames(res))
 			return -1;
 		
+		eBackgroundFileEraser *eraser = eBackgroundFileEraser::getInstance();
+		if (!eraser)
+			eDebug("FATAL !! can't get background file eraser");
+		
 				/* TODO: deferred removing.. */
 		for (std::list<std::string>::iterator i(res.begin()); i != res.end(); ++i)
 		{
 			eDebug("Removing %s...", i->c_str());
-			::unlink(i->c_str());
+			if (eraser)
+				eraser->erase(i->c_str());
+			else
+				::unlink(i->c_str());
 		}
 		
 		return 0;
@@ -248,10 +260,25 @@ RESULT eDVBPVRServiceOfflineOperations::getListOfFilenames(std::list<std::string
 {
 	res.clear();
 	res.push_back(m_ref.path);
+
+// handling for old splitted recordings (enigma 1)
+	char buf[255];
+	int slice=1;
+	while(true)
+	{
+		snprintf(buf, 255, "%s.%03d", m_ref.path.c_str(), slice++);
+		struct stat s;
+		if (stat(buf, &s) < 0)
+			break;
+		res.push_back(buf);
+	}	
+
 	res.push_back(m_ref.path + ".meta");
 	res.push_back(m_ref.path + ".ap");
 	res.push_back(m_ref.path + ".cuts");
-	res.push_back(m_ref.path + ".eit");
+	std::string tmp = m_ref.path;
+	tmp.erase(m_ref.path.length()-3);
+	res.push_back(tmp + ".eit");
 	return 0;
 }
 
@@ -633,6 +660,9 @@ void eDVBServicePlay::serviceEventTimeshift(int event)
 		if (m_timeshift_active)
 			updateDecoder();
 		break;
+	case eDVBServicePMTHandler::eventSOF:
+		m_event((iPlayableService*)this, evSOF);
+		break;
 	case eDVBServicePMTHandler::eventEOF:
 		switchToLive();
 		break;
@@ -1152,6 +1182,52 @@ int eDVBServicePlay::getFrontendInfo(int w)
 	return fe->readFrontendData(w);
 }
 
+PyObject *eDVBServicePlay::getFrontendData(bool original)
+{
+	PyObject *ret=0;
+
+	eUsePtr<iDVBChannel> channel;
+	if(!m_service_handler.getChannel(channel))
+	{
+		ePtr<iDVBFrontend> fe;
+		if(!channel->getFrontend(fe))
+		{
+			ret = fe->readTransponderData(original);
+			if (ret)
+			{
+				ePtr<iDVBFrontendParameters> feparm;
+				channel->getCurrentFrontendParameters(feparm);
+				if (feparm)
+				{
+					eDVBFrontendParametersSatellite osat;
+					if (!feparm->getDVBS(osat))
+					{
+						void PutToDict(PyObject *, const char*, long);
+						void PutToDict(PyObject *, const char*, const char*);
+						PutToDict(ret, "orbital_position", osat.orbital_position);
+						const char *tmp = "UNKNOWN";
+						switch(osat.polarisation)
+						{
+							case eDVBFrontendParametersSatellite::Polarisation::Horizontal: tmp="HORIZONTAL"; break;
+							case eDVBFrontendParametersSatellite::Polarisation::Vertical: tmp="VERTICAL"; break;
+							case eDVBFrontendParametersSatellite::Polarisation::CircularLeft: tmp="CIRCULAR_LEFT"; break;
+							case eDVBFrontendParametersSatellite::Polarisation::CircularRight: tmp="CIRCULAR_RIGHT"; break;
+							default:break;
+						}
+						PutToDict(ret, "polarization", tmp);
+					}
+				}
+			}
+		}
+	}
+	if (!ret)
+	{
+		ret = Py_None;
+		Py_INCREF(ret);
+	}
+	return ret;
+}
+
 int eDVBServicePlay::getNumberOfSubservices()
 {
 	ePtr<eServiceEvent> evt;
@@ -1390,6 +1466,7 @@ void eDVBServicePlay::switchToTimeshift()
 	r.path = m_timeshift_file;
 	
 	m_service_handler_timeshift.tune(r, 1, m_cue); /* use the decoder demux for everything */
+	updateDecoder(); /* mainly to switch off PCR */
 }
 
 void eDVBServicePlay::updateDecoder()