aboutsummaryrefslogtreecommitdiff
path: root/lib/gui
diff options
context:
space:
mode:
authorghost <andreas.monzner@multimedia-labs.de>2011-02-19 13:24:47 +0100
committerghost <andreas.monzner@multimedia-labs.de>2011-02-19 13:26:48 +0100
commit7030e4d7bb27c16098b04526d0bfc72291459665 (patch)
treec3b927b7f08674bbab3c5ea595c43224287342e5 /lib/gui
parent11ea70cc0749456ad092a193e5c5bd70c1fac0dc (diff)
parentf2381d07785eb22548298f3b3b268c986ab1c882 (diff)
downloadenigma2-7030e4d7bb27c16098b04526d0bfc72291459665.tar.gz
enigma2-7030e4d7bb27c16098b04526d0bfc72291459665.zip
Merge branch 'bug_537_ignore_vob_pgs_subtitles' into master
Diffstat (limited to 'lib/gui')
-rw-r--r--lib/gui/esubtitle.h12
1 files changed, 9 insertions, 3 deletions
diff --git a/lib/gui/esubtitle.h b/lib/gui/esubtitle.h
index 45345db1..cdad7286 100644
--- a/lib/gui/esubtitle.h
+++ b/lib/gui/esubtitle.h
@@ -23,15 +23,21 @@ struct ePangoSubtitlePageElement
struct ePangoSubtitlePage
{
- pts_t show_pts;
+ pts_t m_show_pts;
int m_timeout; /* in milliseconds */
std::vector<ePangoSubtitlePageElement> m_elements;
void clear() { m_elements.clear(); }
};
+struct eVobSubtitlePage
+{
+ pts_t m_show_pts;
+ int m_timeout; /* in milliseconds */
+ ePtr<gPixmap> m_pixmap;
+};
+
class eDVBTeletextSubtitlePage;
-class eDVBPangoSubtitlePage;
-class ePangoSubtitlePage;
+class eDVBSubtitlePage;
class eSubtitleWidget: public eWidget, public Object
{