X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/c7bfdda50f1679e3412d7aff4c1229c5cc9f95a9..477c468861635555c7179f2f4397dd765f499656:/lib/dvb/decoder.cpp

diff --git a/lib/dvb/decoder.cpp b/lib/dvb/decoder.cpp
index 0f522b2c..8e21dcad 100644
--- a/lib/dvb/decoder.cpp
+++ b/lib/dvb/decoder.cpp
@@ -1,4 +1,3 @@
-#include <config.h>
 #include <lib/base/eerror.h>
 #include <lib/dvb/decoder.h>
 #if HAVE_DVB_API_VERSION < 3 
@@ -301,6 +300,57 @@ eDVBPCR::~eDVBPCR()
 		::close(m_fd_demux);
 }
 
+DEFINE_REF(eDVBTText);
+
+eDVBTText::eDVBTText(eDVBDemux *demux): m_demux(demux)
+{
+	char filename[128];
+#if HAVE_DVB_API_VERSION < 3
+	sprintf(filename, "/dev/dvb/card%d/demux%d", demux->adapter, demux->demux);
+#else
+	sprintf(filename, "/dev/dvb/adapter%d/demux%d", demux->adapter, demux->demux);
+#endif
+	m_fd_demux = ::open(filename, O_RDWR);
+	if (m_fd_demux < 0)
+		eWarning("%s: %m", filename);
+}
+
+int eDVBTText::startPid(int pid)
+{
+	if (m_fd_demux < 0)
+		return -1;
+	dmx_pes_filter_params pes;
+
+	pes.pid      = pid;
+	pes.input    = DMX_IN_FRONTEND;
+	pes.output   = DMX_OUT_DECODER;
+	pes.pes_type = DMX_PES_TELETEXT;
+	pes.flags    = 0;
+	if (::ioctl(m_fd_demux, DMX_SET_PES_FILTER, &pes) < 0)
+	{
+		eWarning("video: DMX_SET_PES_FILTER: %m");
+		return -errno;
+	}
+	if (::ioctl(m_fd_demux, DMX_START) < 0)
+	{
+		eWarning("video: DMX_START: %m");
+		return -errno;
+	}
+	return 0;
+}
+
+void eDVBTText::stop()
+{
+	if (::ioctl(m_fd_demux, DMX_STOP) < 0)
+		eWarning("video: DMX_STOP: %m");
+}
+
+eDVBTText::~eDVBTText()
+{
+	if (m_fd_demux >= 0)
+		::close(m_fd_demux);
+}
+
 DEFINE_REF(eTSMPEGDecoder);
 
 int eTSMPEGDecoder::setState()
@@ -308,10 +358,14 @@ int eTSMPEGDecoder::setState()
 	int res = 0;
 	
 	int noaudio = m_is_sm || m_is_ff || m_is_trickmode;
-	
+	int nott = noaudio; /* actually same conditions */
+
 	if ((noaudio && m_audio) || (!m_audio && !noaudio))
 		m_changed |= changeAudio;
 	
+	if ((nott && m_text) || (!m_text && !nott))
+		m_changed |= changeText;
+	
 #if HAVE_DVB_API_VERSION < 3
 	if (m_changed & changeAudio && m_audio)
 		m_audio->stopPid();
@@ -416,6 +470,22 @@ int eTSMPEGDecoder::setState()
 		}
 		m_changed &= ~changeAudio;
 	}
+	if (m_changed & changeText)
+	{
+		if (m_text)
+			m_text->stop();
+		m_text = 0;
+		if ((m_textpid >= 0) && (m_textpid < 0x1FFF) && !nott)
+		{
+			m_text = new eDVBTText(m_demux);
+			if (m_text->startPid(m_textpid))
+			{
+				eWarning("text: startpid failed!");
+				res = -1;
+			}
+		}
+		m_changed &= ~changeText;
+	}
 #endif
 	return res;
 }
@@ -464,6 +534,16 @@ RESULT eTSMPEGDecoder::setSyncPCR(int pcrpid)
 	return 0;
 }
 
+RESULT eTSMPEGDecoder::setTextPID(int textpid)
+{
+	if (m_textpid != textpid)
+	{
+		m_changed |= changeText;
+		m_textpid = textpid;
+	}
+	return 0;
+}
+
 RESULT eTSMPEGDecoder::setSyncMaster(int who)
 {
 	return -1;