git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'bug_690_fix_oled_lcd_clear_on_shutdown'
[enigma2.git]
/
lib
/
gui
/
esubtitle.h
diff --git
a/lib/gui/esubtitle.h
b/lib/gui/esubtitle.h
index 2b0ec8ff61c19204726462b753124cc7f0c63104..cdad7286cab7cd8e7ce3b7e29a4b4361b272440a 100644
(file)
--- a/
lib/gui/esubtitle.h
+++ b/
lib/gui/esubtitle.h
@@
-23,7
+23,7
@@
struct ePangoSubtitlePageElement
struct ePangoSubtitlePage
{
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(); }
int m_timeout; /* in milliseconds */
std::vector<ePangoSubtitlePageElement> m_elements;
void clear() { m_elements.clear(); }
@@
-31,15
+31,13
@@
struct ePangoSubtitlePage
struct eVobSubtitlePage
{
struct eVobSubtitlePage
{
- pts_t show_pts;
+ pts_t
m_
show_pts;
int m_timeout; /* in milliseconds */
ePtr<gPixmap> m_pixmap;
};
class eDVBTeletextSubtitlePage;
int m_timeout; /* in milliseconds */
ePtr<gPixmap> m_pixmap;
};
class eDVBTeletextSubtitlePage;
-class eDVBPangoSubtitlePage;
-class ePangoSubtitlePage;
-class eVobSubtitlePage;
+class eDVBSubtitlePage;
class eSubtitleWidget: public eWidget, public Object
{
class eSubtitleWidget: public eWidget, public Object
{