X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/673d85e4aace04805fe958bbe8cb741b21ccbc1b..e059d69c2ce61b1ba1ae2e0b9c75eb53bb26f1bb:/lib/service/servicedvb.cpp

diff --git a/lib/service/servicedvb.cpp b/lib/service/servicedvb.cpp
index f9bb877f..033d13d3 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>
@@ -233,11 +234,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 +256,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;
 }
 
@@ -551,9 +574,7 @@ eDVBServicePlay::eDVBServicePlay(const eServiceReference &ref, eDVBService *serv
 	CONNECT(m_event_handler.m_eit_changed, eDVBServicePlay::gotNewEvent);
 
 	m_cuesheet_changed = 0;
-	
-	if (m_is_pvr)
-		loadCuesheet();
+	m_cutlist_enabled = 1;
 }
 
 eDVBServicePlay::~eDVBServicePlay()
@@ -635,6 +656,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;
@@ -648,9 +672,12 @@ RESULT eDVBServicePlay::start()
 		   two (one for decoding, one for data source), as we must be prepared
 		   to start recording from the data demux. */
 	m_cue = new eCueSheet();
+
 	m_first_program_info = 1;
 	eServiceReferenceDVB &service = (eServiceReferenceDVB&)m_reference;
 	r = m_service_handler.tune(service, m_is_pvr, m_cue);
+	
+		/* inject EIT if there is a stored one */
 	if (m_is_pvr)
 	{
 		std::string filename = service.path;
@@ -674,6 +701,10 @@ RESULT eDVBServicePlay::start()
 			}
 		}
 	}
+	
+	if (m_is_pvr)
+		loadCuesheet();
+
 	m_event(this, evStart);
 	m_event((iPlayableService*)this, evSeekableStatusChanged);
 	return 0;
@@ -832,12 +863,18 @@ RESULT eDVBServicePlay::seekRelative(int direction, pts_t to)
 	if ((m_timeshift_enabled ? m_service_handler_timeshift : m_service_handler).getPVRChannel(pvr_channel))
 		return -1;
 	
+	int mode = 1;
+	
+			/* HACK until we have skip-AP api */
+	if ((to > 0) && (to < 100))
+		mode = 2;
+	
 	to *= direction;
 	
 	if (!m_cue)
 		return 0;
 	
-	m_cue->seekTo(1, to);
+	m_cue->seekTo(mode, to);
 	return 0;
 }
 
@@ -1141,6 +1178,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;
@@ -1289,9 +1372,16 @@ void eDVBServicePlay::setCutList(PyObject *list)
 	}
 	m_cuesheet_changed = 1;
 	
+	cutlistToCuesheet();
 	m_event((iPlayableService*)this, evCuesheetChanged);
 }
 
+void eDVBServicePlay::setCutListEnable(int enable)
+{
+	m_cutlist_enabled = enable;
+	cutlistToCuesheet();
+}
+
 void eDVBServicePlay::updateTimeshiftPids()
 {
 	if (!m_record)
@@ -1372,6 +1462,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()
@@ -1506,6 +1597,7 @@ void eDVBServicePlay::loadCuesheet()
 		eDebug("cutfile not found!");
 	
 	m_cuesheet_changed = 0;
+	cutlistToCuesheet();
 	m_event((iPlayableService*)this, evCuesheetChanged);
 }
 
@@ -1538,6 +1630,57 @@ void eDVBServicePlay::saveCuesheet()
 	m_cuesheet_changed = 0;
 }
 
+void eDVBServicePlay::cutlistToCuesheet()
+{
+	if (!m_cue)
+	{
+		eDebug("no cue sheet");
+		return;
+	}	
+	m_cue->clear();
+	
+	if (!m_cutlist_enabled)
+	{
+		m_cue->commitSpans();
+		eDebug("cutlists where disabled");
+		return;
+	}
+
+	pts_t in = 0, out = 0, length = 0;
+	
+	getLength(length);
+		
+	std::multiset<cueEntry>::iterator i(m_cue_entries.begin());
+	
+	while (1)
+	{
+		if (i == m_cue_entries.end())
+			out = length;
+		else {
+			if (i->what == 0) /* in */
+			{
+				in = i++->where;
+				continue;
+			} else if (i->what == 1) /* out */
+				out = i++->where;
+			else /* mark */
+			{
+				i++;
+				continue;
+			}
+		}
+		
+		if (in != out)
+			m_cue->addSourceSpan(in, out);
+		
+		in = length;
+		
+		if (i == m_cue_entries.end())
+			break;
+	}
+	m_cue->commitSpans();
+}
+
 DEFINE_REF(eDVBServicePlay)
 
 eAutoInitPtr<eServiceFactoryDVB> init_eServiceFactoryDVB(eAutoInitNumbers::service+1, "eServiceFactoryDVB");