X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/36b594f45d5d892048f2c3f191553b10fa626ea5..36dc37e5d0c9ef8fc5f923ad38ee6cc98f316556:/lib/service/servicedvb.cpp

diff --git a/lib/service/servicedvb.cpp b/lib/service/servicedvb.cpp
index b99357c5..3b111510 100644
--- a/lib/service/servicedvb.cpp
+++ b/lib/service/servicedvb.cpp
@@ -17,6 +17,9 @@
 #include <lib/dvb/tstools.h>
 #include <lib/python/python.h>
 
+		/* for subtitles */
+#include <lib/gui/esubtitle.h>
+
 #include <sys/vfs.h>
 
 #include <byteswap.h>
@@ -24,6 +27,8 @@
 
 #include <dvbsi++/event_information_section.h>
 
+#define INTERNAL_TELETEXT
+
 #ifndef BYTE_ORDER
 #error no byte order defined!
 #endif
@@ -639,10 +644,15 @@ eDVBServicePlay::eDVBServicePlay(const eServiceReference &ref, eDVBService *serv
 
 	m_cuesheet_changed = 0;
 	m_cutlist_enabled = 1;
+	
+	m_subtitle_widget = 0;
+	
+	CONNECT(m_subtitle_sync_timer.timeout, eDVBServicePlay::checkSubtitleTiming);
 }
 
 eDVBServicePlay::~eDVBServicePlay()
 {
+	delete m_subtitle_widget;
 }
 
 void eDVBServicePlay::gotNewEvent()
@@ -985,7 +995,7 @@ RESULT eDVBServicePlay::isCurrentlySeekable()
 	return m_is_pvr || m_timeshift_active;
 }
 
-RESULT eDVBServicePlay::frontendStatusInfo(ePtr<iFrontendStatusInformation> &ptr)
+RESULT eDVBServicePlay::frontendInfo(ePtr<iFrontendInformation> &ptr)
 {
 	ptr = this;
 	return 0;
@@ -1053,6 +1063,12 @@ RESULT eDVBServicePlay::cueSheet(ePtr<iCueSheet> &ptr)
 	return -1;
 }
 
+RESULT eDVBServicePlay::subtitle(ePtr<iSubtitleOutput> &ptr)
+{
+	ptr = this;
+	return 0;
+}
+
 RESULT eDVBServicePlay::getName(std::string &name)
 {
 	if (m_is_pvr)
@@ -1129,7 +1145,7 @@ int eDVBServicePlay::getInfo(int w)
 			}
 		}
 		return -1;
-	case sIsCrypted: return program.isCrypted;
+	case sIsCrypted: return program.isCrypted();
 	case sVideoPID: if (program.videoStreams.empty()) return -1; return program.videoStreams[0].pid;
 	case sVideoType: if (program.videoStreams.empty()) return -1; return program.videoStreams[0].type;
 	case sAudioPID: if (program.audioStreams.empty()) return -1; return program.audioStreams[m_current_audio_stream].pid;
@@ -1277,12 +1293,11 @@ RESULT eDVBServicePlay::selectChannel(int i)
 		if (m_decoder)
 			m_decoder->setAudioChannel(i);
 	}
+	return 0;
 }
 
-int eDVBServicePlay::getFrontendInfo(int w)
+int eDVBServiceBase::getFrontendInfo(int w)
 {
-	if (m_is_pvr)
-		return 0;
 	eUsePtr<iDVBChannel> channel;
 	if(m_service_handler.getChannel(channel))
 		return 0;
@@ -1292,7 +1307,7 @@ int eDVBServicePlay::getFrontendInfo(int w)
 	return fe->readFrontendData(w);
 }
 
-PyObject *eDVBServicePlay::getFrontendData(bool original)
+PyObject *eDVBServiceBase::getFrontendData(bool original)
 {
 	PyObject *ret=0;
 
@@ -1657,6 +1672,7 @@ void eDVBServicePlay::updateDecoder()
 			m_cue->setDecodingDemux(m_decode_demux, m_decoder);
 #ifdef INTERNAL_TELETEXT
 		m_teletext_parser = new eDVBTeletextParser(m_decode_demux);
+		m_teletext_parser->connectNewPage(slot(*this, &eDVBServicePlay::newSubtitlePage), m_new_subtitle_page_connection);
 #endif
 	}
 
@@ -1829,6 +1845,105 @@ void eDVBServicePlay::cutlistToCuesheet()
 	m_cue->commitSpans();
 }
 
+RESULT eDVBServicePlay::enableSubtitles(eWidget *parent, PyObject *entry)
+{
+	if (m_subtitle_widget)
+		disableSubtitles(parent);
+	
+	if (!m_teletext_parser)
+		return -1;
+	
+	if (!PyInt_Check(entry))
+		return -1;
+	
+	m_subtitle_widget = new eSubtitleWidget(parent);
+	m_subtitle_widget->resize(parent->size()); /* full size */
+	
+	int page = PyInt_AsLong(entry);
+	
+	m_teletext_parser->setPage(page);
+
+	return 0;
+}
+
+RESULT eDVBServicePlay::disableSubtitles(eWidget *parent)
+{
+	delete m_subtitle_widget;
+	m_subtitle_widget = 0;
+	return 0;
+}
+
+PyObject *eDVBServicePlay::getSubtitleList()
+{
+	if (!m_teletext_parser)
+	{
+		Py_INCREF(Py_None);
+		return Py_None;
+	}
+	
+	PyObject *l = PyList_New(0);
+	
+	for (std::set<int>::iterator i(m_teletext_parser->m_found_subtitle_pages.begin()); i != m_teletext_parser->m_found_subtitle_pages.end(); ++i)
+	{
+		PyObject *tuple = PyTuple_New(2);
+		char desc[20];
+		sprintf(desc, "Page %x", *i);
+		PyTuple_SetItem(tuple, 0, PyString_FromString(desc));
+		PyTuple_SetItem(tuple, 1, PyInt_FromLong(*i));
+		PyList_Append(l, tuple);
+	}
+	
+	return l;
+}
+
+void eDVBServicePlay::newSubtitlePage(const eDVBTeletextSubtitlePage &page)
+{
+	if (m_subtitle_widget)
+	{
+		m_subtitle_pages.push_back(page);
+		
+		checkSubtitleTiming();
+	}
+}
+
+void eDVBServicePlay::checkSubtitleTiming()
+{
+	while (1)
+	{
+		if (m_subtitle_pages.empty())
+			return;
+	
+		eDVBTeletextSubtitlePage p = m_subtitle_pages.front();
+	
+		pts_t pos = 0;
+	
+		if (m_decoder)
+			m_decoder->getPTS(0, pos);
+	
+		int diff = p.m_pts - pos;
+		if (diff < 0)
+		{
+			eDebug("[late (%d ms)]", -diff / 90);
+			diff = 0;
+		}
+		if (diff > 900000)
+		{
+			eDebug("[invalid]");
+			diff = 0;
+		}
+	
+		if (!diff)
+		{
+			m_subtitle_widget->setPage(p);
+			m_subtitle_pages.pop_front();
+		} else
+		{
+			m_subtitle_sync_timer.start(diff / 90, 1);
+			break;
+		}
+	}
+}
+
 DEFINE_REF(eDVBServicePlay)
 
 eAutoInitPtr<eServiceFactoryDVB> init_eServiceFactoryDVB(eAutoInitNumbers::service+1, "eServiceFactoryDVB");