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.cpp
diff --git
a/lib/gui/esubtitle.cpp
b/lib/gui/esubtitle.cpp
index bf0239dffdae8741f1c82122e26bcb52aa693ced..f3d0e35f1edcb5afc655aef11deb060b8e67e180 100644
(file)
--- a/
lib/gui/esubtitle.cpp
+++ b/
lib/gui/esubtitle.cpp
@@
-62,7
+62,9
@@
void eSubtitleWidget::setPage(const eDVBSubtitlePage &p)
for (std::list<eDVBSubtitleRegion>::iterator it(m_dvb_page.m_regions.begin()); it != m_dvb_page.m_regions.end(); ++it)
{
eDebug("add %d %d %d %d", it->m_position.x(), it->m_position.y(), it->m_pixmap->size().width(), it->m_pixmap->size().height());
for (std::list<eDVBSubtitleRegion>::iterator it(m_dvb_page.m_regions.begin()); it != m_dvb_page.m_regions.end(); ++it)
{
eDebug("add %d %d %d %d", it->m_position.x(), it->m_position.y(), it->m_pixmap->size().width(), it->m_pixmap->size().height());
- m_visible_region.rects.push_back(eRect(it->m_position, it->m_pixmap->size()));
+ eRect r = eRect(it->m_position, it->m_pixmap->size());
+ r.scale(size().width(), 720, size().height(), 576);
+ m_visible_region.rects.push_back(r);
}
m_dvb_page_ok = 1;
m_hide_subtitles_timer->start(7500, true);
}
m_dvb_page_ok = 1;
m_hide_subtitles_timer->start(7500, true);
@@
-110,9
+112,10
@@
void eSubtitleWidget::clearPage()
m_visible_region.rects.clear();
}
m_visible_region.rects.clear();
}
-void eSubtitleWidget::setPixmap(ePtr<gPixmap> &pixmap, gRegion changed)
+void eSubtitleWidget::setPixmap(ePtr<gPixmap> &pixmap, gRegion changed
, eRect pixmap_dest
)
{
m_pixmap = pixmap;
{
m_pixmap = pixmap;
+ m_pixmap_dest = pixmap_dest;
changed.scale(size().width(), pixmap->size().width(), size().height(), pixmap->size().height());
changed.scale(size().width(), pixmap->size().width(), size().height(), pixmap->size().height());
@@
-132,8
+135,11
@@
int eSubtitleWidget::event(int event, void *data, void *data2)
eWidget::event(event, data, data2);
if (m_pixmap)
eWidget::event(event, data, data2);
if (m_pixmap)
- painter.blitScale(m_pixmap, eRect(ePoint(0, 0), size()));
- else if (m_page_ok)
+ {
+ eRect r = m_pixmap_dest;
+ r.scale(size().width(), 720, size().height(), 576);
+ painter.blitScale(m_pixmap, r);
+ } else if (m_page_ok)
{
int elements = m_page.m_elements.size();
painter.setFont(subtitleStyles[Subtitle_TTX].font);
{
int elements = m_page.m_elements.size();
painter.setFont(subtitleStyles[Subtitle_TTX].font);