X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/4e8cae716ad3fdf29a7b2a45e5eec0a530f93277..88d7390f3d29293d4f87b9f70833215378305255:/lib/service/servicedvb.cpp

diff --git a/lib/service/servicedvb.cpp b/lib/service/servicedvb.cpp
index 0ec488fe..f67ea96b 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,13 @@ eDVBServicePlay::eDVBServicePlay(const eServiceReference &ref, eDVBService *serv
 
 	m_cuesheet_changed = 0;
 	m_cutlist_enabled = 1;
+	
+	m_subtitle_widget = 0;
 }
 
 eDVBServicePlay::~eDVBServicePlay()
 {
+	delete m_subtitle_widget;
 }
 
 void eDVBServicePlay::gotNewEvent()
@@ -985,7 +993,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 +1061,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 +1143,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;
@@ -1203,6 +1217,8 @@ RESULT eDVBServicePlay::getTrackInfo(struct iAudioTrackInfo &info, unsigned int
 		info.m_description = "MPEG";
 	else if (program.audioStreams[i].type == eDVBServicePMTHandler::audioStream::atAC3)
 		info.m_description = "AC3";
+	else if (program.audioStreams[i].type == eDVBServicePMTHandler::audioStream::atAAC)
+		info.m_description = "AAC";
 	else  if (program.audioStreams[i].type == eDVBServicePMTHandler::audioStream::atDTS)
 		info.m_description = "DTS";
 	else
@@ -1275,12 +1291,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;
@@ -1290,7 +1305,7 @@ int eDVBServicePlay::getFrontendInfo(int w)
 	return fe->readFrontendData(w);
 }
 
-PyObject *eDVBServicePlay::getFrontendData(bool original)
+PyObject *eDVBServiceBase::getFrontendData(bool original)
 {
 	PyObject *ret=0;
 
@@ -1655,6 +1670,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
 	}
 
@@ -1699,7 +1715,7 @@ void eDVBServicePlay::updateDecoder()
 				m_dvb_service->setCacheEntry(eDVBService::cAC3PID, apid);
 			}
 			m_dvb_service->setCacheEntry(eDVBService::cVPID, vpid);
-			m_dvb_service->setCacheEntry(eDVBService::cVTYPE, vpidtype);
+			m_dvb_service->setCacheEntry(eDVBService::cVTYPE, vpidtype == eDVBVideo::MPEG2 ? -1 : vpidtype);
 			m_dvb_service->setCacheEntry(eDVBService::cPCRPID, pcrpid);
 			m_dvb_service->setCacheEntry(eDVBService::cTPID, tpid);
 		}
@@ -1827,6 +1843,64 @@ 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)
+{
+	eDebug("new subtitle page received!");
+	if (m_subtitle_widget)
+		m_subtitle_widget->addPage(page);
+}
+
 DEFINE_REF(eDVBServicePlay)
 
 eAutoInitPtr<eServiceFactoryDVB> init_eServiceFactoryDVB(eAutoInitNumbers::service+1, "eServiceFactoryDVB");