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 'master' of git.opendreambox.org:/git/enigma2
[enigma2.git]
/
lib
/
gui
/
esubtitle.h
diff --git
a/lib/gui/esubtitle.h
b/lib/gui/esubtitle.h
index 81f920ec386c4d422e5442b388c28096c54c32c3..0a780ca170db92981796a8988f62e77728dca15d 100644
(file)
--- a/
lib/gui/esubtitle.h
+++ b/
lib/gui/esubtitle.h
@@
-18,8
+18,7
@@
struct ePangoSubtitlePageElement
struct ePangoSubtitlePage
{
struct ePangoSubtitlePage
{
- pts_t m_pts;
- int m_have_pts;
+ pts_t 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(); }
@@
-53,12
+52,11
@@
private:
int m_pango_page_ok;
ePangoSubtitlePage m_pango_page;
int m_pango_page_ok;
ePangoSubtitlePage m_pango_page;
- e
Timer
m_hide_subtitles_timer;
+ e
Ptr<eTimer>
m_hide_subtitles_timer;
gRegion m_visible_region;
ePtr<gPixmap> m_pixmap; // pixmap to paint on next evtPaint
gRegion m_visible_region;
ePtr<gPixmap> m_pixmap; // pixmap to paint on next evtPaint
- std::string replace_all(const std::string &in, const std::string &entity, const std::string &symbol);
};
#endif
};
#endif