X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/6e95f24aaf7e2629f193269397ec187ddda8ea3d..b7a2b4e737acaccfa6d52688b19bc252de99d00e:/lib/dvb/teletext.h

diff --git a/lib/dvb/teletext.h b/lib/dvb/teletext.h
index af9d71f1..108c2da3 100644
--- a/lib/dvb/teletext.h
+++ b/lib/dvb/teletext.h
@@ -4,12 +4,14 @@
 #include <lib/base/object.h>
 #include <lib/dvb/idvb.h>
 #include <lib/dvb/pesparse.h>
+#include <lib/dvb/pmt.h>
 #include <lib/gdi/gpixmap.h>
 
 struct eDVBTeletextSubtitlePageElement
 {
 	gRGB m_color;
 	std::string m_text;
+	eRect m_area;
 	eDVBTeletextSubtitlePageElement(const gRGB &color, const std::string &text)
 		: m_color(color), m_text(text)
 	{
@@ -21,6 +23,7 @@ struct eDVBTeletextSubtitlePage
 	pts_t m_pts;
 	int m_have_pts;
 	int m_timeout; /* in pts */
+	int m_C, m_Y;
 	std::vector<eDVBTeletextSubtitlePageElement> m_elements;
 	
 	void clear() { m_elements.clear(); }
@@ -33,11 +36,10 @@ public:
 	eDVBTeletextParser(iDVBDemux *demux);
 	virtual ~eDVBTeletextParser();
 	int start(int pid);
-	void setPage(int page);
-	
+	void setPageAndMagazine(int page, int magazine);
+	void setMagazine(int magazine);
 	void connectNewPage(const Slot1<void,const eDVBTeletextSubtitlePage &> &slot, ePtr<eConnection> &connection);
-	
-	std::set<int> m_found_subtitle_pages;
+	std::set<eDVBServicePMTHandler::subtitleStream> m_found_subtitle_pages;
 private:
 	void processPESPacket(__u8 *pkt, int len);
 	
@@ -46,9 +48,7 @@ private:
 	
 	eDVBTeletextSubtitlePage m_subtitle_page;
 	
-	int m_M, m_Y, m_X, m_S1, m_S2, m_S3, m_S4, m_C;
-	
-	int m_page_M, m_page_X, m_page_open, m_double_height;
+	int m_pid, m_page_M, m_page_X, m_page_open, m_double_height;
 	
 	void handlePageStart();
 	void handleLine(unsigned char *line, int len);