Merge remote branch 'remotes/origin/acid-burn/bug_629_show_autofs_volumes_as_backuplo...

[enigma2.git] / lib / gui / esubtitle.h

diff --git a/lib/gui/esubtitle.h b/lib/gui/esubtitle.h
index d7287776f20204b4f696c4c996e5d030ffb2b3c5..45345db1d89d2857c86c5865b0475eb3ed4d60e9 100644 (file)
--- a/lib/gui/esubtitle.h
+++ b/lib/gui/esubtitle.h
@@ -12,11 +12,11 @@ struct ePangoSubtitlePageElement
        std::string m_pango_line;
        eRect m_area;
        ePangoSubtitlePageElement(const gRGB &color, const std::string &text)
-               : m_color(color), m_pango_line(text), m_have_color(true)
+               : m_color(color), m_have_color(true), m_pango_line(text)
        {
        }
        ePangoSubtitlePageElement(const std::string &text)
-               : m_pango_line(text), m_have_color(false)
+               : m_have_color(false), m_pango_line(text)
        {
        }
 };
@@ -42,7 +42,7 @@ public:
        void setPage(const eDVBSubtitlePage &p);
        void setPage(const ePangoSubtitlePage &p);
        void clearPage();
-       void setPixmap(ePtr<gPixmap> &pixmap, gRegion changed);
+       void setPixmap(ePtr<gPixmap> &pixmap, gRegion changed, eRect dest = eRect(0, 0, 720, 576));
 
        typedef enum { Subtitle_TTX, Subtitle_Regular, Subtitle_Bold, Subtitle_Italic, Subtitle_MAX } subfont_t;
        struct eSubtitleStyle
@@ -75,6 +75,7 @@ private:
        static eSubtitleStyle subtitleStyles[Subtitle_MAX];
 
        ePtr<gPixmap> m_pixmap;  // pixmap to paint on next evtPaint
+       eRect m_pixmap_dest;
 };
 
 #endif