X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/1573e3dc168002939adff026d11e60359ba1d3ad..2ab514e090cb4f0dc14faa061820d9d154b37647:/lib/service/servicedvb.cpp

diff --git a/lib/service/servicedvb.cpp b/lib/service/servicedvb.cpp
index e3b6fe45..7f931334 100644
--- a/lib/service/servicedvb.cpp
+++ b/lib/service/servicedvb.cpp
@@ -1111,7 +1111,8 @@ void eDVBServicePlay::serviceEventTimeshift(int event)
 		m_event((iPlayableService*)this, evSOF);
 		break;
 	case eDVBServicePMTHandler::eventEOF:
-		switchToLive();
+		if ((!m_is_paused) && (m_skipmode >= 0))
+			switchToLive();
 		break;
 	}
 }
@@ -1159,7 +1160,7 @@ RESULT eDVBServicePlay::stop()
 		/* add bookmark for last play position */
 	if (m_is_pvr)
 	{
-		pts_t play_position;
+		pts_t play_position, length;
 		if (!getPlayPosition(play_position))
 		{
 				/* remove last position */
@@ -1174,7 +1175,17 @@ RESULT eDVBServicePlay::stop()
 					++i;
 			}
 			
-			m_cue_entries.insert(cueEntry(play_position, 3)); /* last play position */
+			if (getLength(length))
+				length = 0;
+			
+			if (length)
+			{
+				int perc = play_position * 100LL / length;
+			
+					/* only store last play position when between 5% and 95% */
+				if ((5 < perc) && (perc < 95))
+					m_cue_entries.insert(cueEntry(play_position, 3)); /* last play position */
+			}
 			m_cuesheet_changed = 1;
 		}
 	}
@@ -1266,7 +1277,7 @@ RESULT eDVBServicePlay::setFastForward(int ratio)
 
 	return m_decoder->setFastForward(ffratio);
 }
-    
+
 RESULT eDVBServicePlay::seek(ePtr<iSeekableService> &ptr)
 {
 	if (m_is_pvr || m_timeshift_enabled)
@@ -2186,12 +2197,15 @@ void eDVBServicePlay::switchToTimeshift()
 
 	m_cue = new eCueSheet();
 	m_service_handler_timeshift.tune(r, 1, m_cue); /* use the decoder demux for everything */
-	updateDecoder(1); /* mainly to switch off PCR, and to set pause */
+
+	eDebug("eDVBServicePlay::switchToTimeshift, in pause mode now.");
+	pause();
+	updateDecoder(); /* mainly to switch off PCR, and to set pause */
 	
 	m_event((iPlayableService*)this, evSeekableStatusChanged);
 }
 
-void eDVBServicePlay::updateDecoder(int intopause)
+void eDVBServicePlay::updateDecoder()
 {
 	int vpid = -1, vpidtype = -1, apid = -1, apidtype = -1, pcrpid = -1, tpid = -1, achannel = -1, ac3_delay=-1, pcm_delay=-1;
 
@@ -2263,13 +2277,18 @@ void eDVBServicePlay::updateDecoder(int intopause)
 			m_decode_demux->getMPEGDecoder(m_decoder, m_is_primary);
 			if (m_decoder)
 				m_decoder->connectVideoEvent(slot(*this, &eDVBServicePlay::video_event), m_video_event_connection);
+			m_teletext_parser = new eDVBTeletextParser(m_decode_demux);
+			m_teletext_parser->connectNewPage(slot(*this, &eDVBServicePlay::newSubtitlePage), m_new_subtitle_page_connection);
+			m_subtitle_parser = new eDVBSubtitleParser(m_decode_demux);
+			m_subtitle_parser->connectNewPage(slot(*this, &eDVBServicePlay::newDVBSubtitlePage), m_new_dvb_subtitle_page_connection);
+		} else
+		{
+			m_teletext_parser = 0;
+			m_subtitle_parser = 0;
 		}
+
 		if (m_cue)
 			m_cue->setDecodingDemux(m_decode_demux, m_decoder);
-		m_teletext_parser = new eDVBTeletextParser(m_decode_demux);
-		m_teletext_parser->connectNewPage(slot(*this, &eDVBServicePlay::newSubtitlePage), m_new_subtitle_page_connection);
-		m_subtitle_parser = new eDVBSubtitleParser(m_decode_demux);
-		m_subtitle_parser->connectNewPage(slot(*this, &eDVBServicePlay::newDVBSubtitlePage), m_new_dvb_subtitle_page_connection);
 	}
 
 	if (m_decoder)
@@ -2334,7 +2353,10 @@ void eDVBServicePlay::updateDecoder(int intopause)
 		if (!m_is_primary)
 			m_decoder->setTrickmode(1);
 
-		m_decoder->start();
+		if (m_is_paused)
+			m_decoder->preroll();
+		else
+			m_decoder->start();
 
 		if (vpid > 0 && vpid < 0x2000)
 			;
@@ -2350,7 +2372,7 @@ void eDVBServicePlay::updateDecoder(int intopause)
 // how we can do this better?
 // update cache pid when the user changed the audio track or video track
 // TODO handling of difference audio types.. default audio types..
-				
+
 		/* don't worry about non-existing services, nor pvr services */
 		if (m_dvb_service && !m_is_pvr)
 		{
@@ -2845,6 +2867,35 @@ void eDVBServicePlay::video_event(struct iTSMPEGDecoder::videoEvent event)
 	m_event((iPlayableService*)this, evVideoSizeChanged);
 }
 
+RESULT eDVBServicePlay::stream(ePtr<iStreamableService> &ptr)
+{
+	ptr = this;
+	return 0;
+}
+
+PyObject *eDVBServicePlay::getStreamingData()
+{
+	eDVBServicePMTHandler::program program;
+	if (m_service_handler.getProgramInfo(program))
+	{
+		Py_INCREF(Py_None);
+		return Py_None;
+	}
+
+	PyObject *r = program.createPythonObject();
+	ePtr<iDVBDemux> demux;
+	if (!m_service_handler.getDataDemux(demux))
+	{
+		uint8_t demux_id;
+		demux->getCADemuxID(demux_id);
+		
+		PyDict_SetItemString(r, "demux", PyInt_FromLong(demux_id));
+	}
+
+	return r;
+}
+
+
 DEFINE_REF(eDVBServicePlay)
 
 PyObject *eDVBService::getInfoObject(const eServiceReference &ref, int w)