Merge commit 'origin/bug_449_fix_wlan_usbstick_recognition'

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

diff --git a/lib/dvb/teletext.h b/lib/dvb/teletext.h
index 821a92261cbb23f83be0f81ec74b991ffb60d68d..7c62afb9e45212f5f7ce91fa7b6cd57072ba2ff4 100644 (file)
--- a/lib/dvb/teletext.h
+++ b/lib/dvb/teletext.h
@@ -4,14 +4,20 @@
 #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
 {
        gRGB m_color;
        std::string m_text;
-       eDVBTeletextSubtitlePageElement(const gRGB &color, const std::string &text)
-               : m_color(color), m_text(text)
+       eRect m_area;
+
+       int m_source_line;
+
+       eDVBTeletextSubtitlePageElement(const gRGB &color, const std::string &text, int source_line)
+               : m_color(color), m_text(text), m_source_line(source_line)
        {
        }
 };
@@ -23,6 +29,7 @@ struct eDVBTeletextSubtitlePage
        int m_timeout; /* in pts */
        std::vector<eDVBTeletextSubtitlePageElement> m_elements;
        
+       void clearLine(int line) { for (unsigned int i = 0; i < m_elements.size(); ) if (m_elements[i].m_source_line == line) m_elements.erase(m_elements.begin() + i); else ++i; }
        void clear() { m_elements.clear(); }
 };
 
@@ -33,12 +40,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;
@@ -46,18 +53,19 @@ 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_C, m_Y, m_pid, m_page_M, m_page_X, m_page_open, m_double_height, m_box_open;
+       int m_X28_0_valid, m_X28_t1, m_X28_t2;
+       int m_M29_0_valid, m_M29_t1, m_M29_t2;
+
        void handlePageStart();
        void handleLine(unsigned char *line, int len);
        void handlePageEnd(int have_pts, const pts_t &pts);
        
        std::string m_subtitle_text;
        int m_subtitle_color;
+       int m_current_source_line;
        
-       void addSubtitleString(int color, std::string string);
+       void addSubtitleString(int color, std::string string, int source_line);
        
        void sendSubtitlePage();