use 720x576 subtitle pixmap, and scale to fullscreen

2 files changed, 12 insertions, 4 deletions

diff --git a/lib/gui/esubtitle.cpp b/lib/gui/esubtitle.cpp
index 376fa24d..bf0239df 100644
--- a/lib/gui/esubtitle.cpp
+++ b/lib/gui/esubtitle.cpp
@@ -113,6 +113,9 @@ void eSubtitleWidget::clearPage()
 void eSubtitleWidget::setPixmap(ePtr<gPixmap> &pixmap, gRegion changed)
 {
 	m_pixmap = pixmap;
+	
+	changed.scale(size().width(), pixmap->size().width(), size().height(), pixmap->size().height());
+	
 	invalidate(changed);
 }
 
@@ -129,7 +132,7 @@ int eSubtitleWidget::event(int event, void *data, void *data2)
 		eWidget::event(event, data, data2);
 
 		if (m_pixmap)
-			painter.blit(m_pixmap, ePoint(0,0));
+			painter.blitScale(m_pixmap, eRect(ePoint(0, 0), size()));
 		else if (m_page_ok)
 		{
 			int elements = m_page.m_elements.size();
@@ -192,7 +195,12 @@ int eSubtitleWidget::event(int event, void *data, void *data2)
 		else if (m_dvb_page_ok)
 		{
 			for (std::list<eDVBSubtitleRegion>::iterator it(m_dvb_page.m_regions.begin()); it != m_dvb_page.m_regions.end(); ++it)
-				painter.blit(it->m_pixmap, it->m_position);
+			{
+					/* 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);
+				painter.blitScale(it->m_pixmap, r);
+			}
 		}
 		return 0;
 	}
diff --git a/lib/python/Plugins/Extensions/DVDPlayer/src/servicedvd.cpp b/lib/python/Plugins/Extensions/DVDPlayer/src/servicedvd.cpp
index 2b3eab0b..ea1afec4 100644
--- a/lib/python/Plugins/Extensions/DVDPlayer/src/servicedvd.cpp
+++ b/lib/python/Plugins/Extensions/DVDPlayer/src/servicedvd.cpp
@@ -562,11 +562,11 @@ RESULT eServiceDVD::enableSubtitles(eWidget *parent, SWIG_PYOBJECT(ePyObject) /*
 	m_subtitle_widget = new eSubtitleWidget(parent);
 	m_subtitle_widget->resize(parent->size());
 
-	eSize size = parent->size();
+	eSize size = eSize(720, 576);
 
 	if (!m_pixmap)
 	{
-		m_pixmap = new gPixmap(size, 32);
+		m_pixmap = new gPixmap(size, 32, 1); /* allocate accel surface (if possible) */
 		ddvd_set_lfb(m_ddvdconfig, (unsigned char *)m_pixmap->surface->data, size.width(), size.height(), 4, size.width()*4);
 		run(); // start the thread
 	}