fix bug described here -> http://www.dream-multimedia-tv.de/board/thread.php?threadid...

[enigma2.git] / lib / dvb / teletext.h

diff --git a/lib/dvb/teletext.h b/lib/dvb/teletext.h
index 8c5dfa3e1bc9aab85fa75974caa51968c910654d..b8df23c6d6246c95880180bc40e40d518f5c1180 100644 (file)
--- a/lib/dvb/teletext.h
+++ b/lib/dvb/teletext.h
@@ -4,7 +4,9 @@
 #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>
+#include <map>
 
 struct eDVBTeletextSubtitlePageElement
 {
@@ -22,6 +24,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(); }
@@ -34,12 +37,12 @@ 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:
+       std::map<int, unsigned int> m_modifications;
        void processPESPacket(__u8 *pkt, int len);
        
        ePtr<iDVBPESReader> m_pes_reader;
@@ -47,9 +50,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_number, 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, m_box_open;
        
        void handlePageStart();
        void handleLine(unsigned char *line, int len);