X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/b23e0f70b3b0e6815b784f29cbe7d09982116c41..7fb088ec04db7eb68ff7294393f53ba33f533655:/lib/gui/esubtitle.cpp

diff --git a/lib/gui/esubtitle.cpp b/lib/gui/esubtitle.cpp
index bf0239df..594ed8a8 100644
--- a/lib/gui/esubtitle.cpp
+++ b/lib/gui/esubtitle.cpp
@@ -62,7 +62,10 @@ 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());
-		m_visible_region.rects.push_back(eRect(it->m_position, it->m_pixmap->size()));
+		eDebug("disp width %d, disp height %d", p.m_display_size.width(), p.m_display_size.height());
+		eRect r = eRect(it->m_position, it->m_pixmap->size());
+		r.scale(size().width(), p.m_display_size.width(), size().height(), p.m_display_size.height());
+		m_visible_region.rects.push_back(r);
 	}
 	m_dvb_page_ok = 1;
 	m_hide_subtitles_timer->start(7500, true);
@@ -110,11 +113,17 @@ void eSubtitleWidget::clearPage()
 	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_dest = pixmap_dest; /* this is in a virtual 720x576 cage */
 	
-	changed.scale(size().width(), pixmap->size().width(), size().height(), pixmap->size().height());
+		/* incoming "changed" regions are relative to the physical pixmap area, so they have to be scaled to the virtual pixmap area, then to the screen */
+	changed.scale(m_pixmap_dest.width(), 720, m_pixmap_dest.height(), 576);
+	changed.moveBy(ePoint(m_pixmap_dest.x(), m_pixmap_dest.y()));
+
+	if (pixmap->size().width() && pixmap->size().height())
+		changed.scale(size().width(), pixmap->size().width(), size().height(), pixmap->size().height());
 	
 	invalidate(changed);
 }
@@ -132,8 +141,11 @@ int eSubtitleWidget::event(int event, void *data, void *data2)
 		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);
@@ -196,9 +208,8 @@ int eSubtitleWidget::event(int event, void *data, void *data2)
 		{
 			for (std::list<eDVBSubtitleRegion>::iterator it(m_dvb_page.m_regions.begin()); it != m_dvb_page.m_regions.end(); ++it)
 			{
-					/* dvb subtitles are living in their 720x576 cage... i think. check this for HD. */
 				eRect r = eRect(it->m_position, it->m_pixmap->size());
-				r.scale(size().width(), 720, size().height(), 576);
+				r.scale(size().width(), m_dvb_page.m_display_size.width(), size().height(),  m_dvb_page.m_display_size.height());
 				painter.blitScale(it->m_pixmap, r);
 			}
 		}