workaround for romanian txt subtitles

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

diff --git a/lib/dvb/teletext.h b/lib/dvb/teletext.h
index a73783ae794eb18947a87aa455804ee111221734..108c2da3d071c71e9c968019f2db7fd9da8da925 100644 (file)
--- 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)
        {
@@ -19,7 +21,9 @@ struct eDVBTeletextSubtitlePageElement
 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(); }
@@ -32,9 +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<eDVBServicePMTHandler::subtitleStream> m_found_subtitle_pages;
 private:
        void processPESPacket(__u8 *pkt, int len);
        
@@ -43,18 +48,16 @@ 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;
+       int m_pid, m_page_M, m_page_X, m_page_open, m_double_height;
        
        void handlePageStart();
        void handleLine(unsigned char *line, int len);
-       void handlePageEnd();
+       void handlePageEnd(int have_pts, const pts_t &pts);
        
        std::string m_subtitle_text;
        int m_subtitle_color;
        
-       void addSubtitleString(int color, const std::string &string);
+       void addSubtitleString(int color, std::string string);
        
        void sendSubtitlePage();