git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add diseqc tester test type "random"
[enigma2.git]
/
lib
/
gui
/
esubtitle.cpp
diff --git
a/lib/gui/esubtitle.cpp
b/lib/gui/esubtitle.cpp
index f859c170ac27710275ad885c5ef0a803272dba1b..085a749a6fde71fdb0264160bc18ee161ab77de0 100644
(file)
--- a/
lib/gui/esubtitle.cpp
+++ b/
lib/gui/esubtitle.cpp
@@
-11,12
+11,13
@@
*/
eSubtitleWidget::eSubtitleWidget(eWidget *parent)
*/
eSubtitleWidget::eSubtitleWidget(eWidget *parent)
- : eWidget(parent), m_hide_subtitles_timer(e
App
)
+ : eWidget(parent), m_hide_subtitles_timer(e
Timer::create(eApp)
)
{
setBackgroundColor(gRGB(0,0,0,255));
m_page_ok = 0;
m_dvb_page_ok = 0;
{
setBackgroundColor(gRGB(0,0,0,255));
m_page_ok = 0;
m_dvb_page_ok = 0;
- CONNECT(m_hide_subtitles_timer.timeout, eSubtitleWidget::clearPage);
+ m_pango_page_ok = 0;
+ CONNECT(m_hide_subtitles_timer->timeout, eSubtitleWidget::clearPage);
}
#define startX 50
}
#define startX 50
@@
-46,7
+47,7
@@
void eSubtitleWidget::setPage(const eDVBTeletextSubtitlePage &p)
m_visible_region.rects.push_back(area);
}
}
m_visible_region.rects.push_back(area);
}
}
- m_hide_subtitles_timer
.
start(7500, true);
+ m_hide_subtitles_timer
->
start(7500, true);
invalidate(m_visible_region); // invalidate new regions
}
invalidate(m_visible_region); // invalidate new regions
}
@@
-62,7
+63,7
@@
void eSubtitleWidget::setPage(const eDVBSubtitlePage &p)
m_visible_region.rects.push_back(eRect(it->m_position, it->m_pixmap->size()));
}
m_dvb_page_ok = 1;
m_visible_region.rects.push_back(eRect(it->m_position, it->m_pixmap->size()));
}
m_dvb_page_ok = 1;
- m_hide_subtitles_timer
.
start(7500, true);
+ m_hide_subtitles_timer
->
start(7500, true);
invalidate(m_visible_region); // invalidate new regions
}
invalidate(m_visible_region); // invalidate new regions
}
@@
-93,7
+94,7
@@
void eSubtitleWidget::setPage(const ePangoSubtitlePage &p)
}
}
int timeout_ms = m_pango_page.m_timeout;
}
}
int timeout_ms = m_pango_page.m_timeout;
- m_hide_subtitles_timer
.
start(timeout_ms, true);
+ m_hide_subtitles_timer
->
start(timeout_ms, true);
invalidate(m_visible_region); // invalidate new regions
}
invalidate(m_visible_region); // invalidate new regions
}