X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/05c8bbbbdb6e4175264e6b55f26957b0a0f874a9..5e0d91a196bfe872d04d676e5f6c2d5940786be0:/lib/service/servicedvb.cpp

diff --git a/lib/service/servicedvb.cpp b/lib/service/servicedvb.cpp
index db7df6b4..5a6999d3 100644
--- a/lib/service/servicedvb.cpp
+++ b/lib/service/servicedvb.cpp
@@ -486,7 +486,15 @@ eStaticServiceDVBPVRInformation::eStaticServiceDVBPVRInformation(const eServiceR
 RESULT eStaticServiceDVBPVRInformation::getName(const eServiceReference &ref, std::string &name)
 {
 	ASSERT(ref == m_ref);
-	name = m_parser.m_name.size() ? m_parser.m_name : ref.path;
+	if (m_parser.m_name.size())
+		name = m_parser.m_name;
+	else
+	{
+		name = ref.path;
+		size_t n = name.rfind('/');
+		if (n != std::string::npos)
+			name = name.substr(n + 1);
+	}
 	return 0;
 }
 
@@ -1111,7 +1119,7 @@ void eDVBServicePlay::serviceEventTimeshift(int event)
 		m_event((iPlayableService*)this, evSOF);
 		break;
 	case eDVBServicePMTHandler::eventEOF:
-		if (!m_is_paused)
+		if ((!m_is_paused) && (m_skipmode >= 0))
 			switchToLive();
 		break;
 	}
@@ -1177,12 +1185,15 @@ RESULT eDVBServicePlay::stop()
 			
 			if (getLength(length))
 				length = 0;
-
-			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 */
+			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;
 		}
 	}
@@ -1274,7 +1285,7 @@ RESULT eDVBServicePlay::setFastForward(int ratio)
 
 	return m_decoder->setFastForward(ffratio);
 }
-    
+
 RESULT eDVBServicePlay::seek(ePtr<iSeekableService> &ptr)
 {
 	if (m_is_pvr || m_timeshift_enabled)
@@ -2274,13 +2285,18 @@ void eDVBServicePlay::updateDecoder()
 			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)
@@ -2364,7 +2380,7 @@ void eDVBServicePlay::updateDecoder()
 // 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)
 		{
@@ -2859,6 +2875,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)