From 3ecd3b8d7f2d52fd7b5956c1fe08f926cc2a2858 Mon Sep 17 00:00:00 2001
From: Andreas Monzner <andreas.monzner@multimedia-labs.de>
Date: Wed, 25 Oct 2006 18:06:01 +0000
Subject: dvb subtitles are working now

---
 lib/gui/esubtitle.cpp | 25 ++++++++++++++++++++++---
 lib/gui/esubtitle.h   |  5 +++++
 2 files changed, 27 insertions(+), 3 deletions(-)

(limited to 'lib/gui')

diff --git a/lib/gui/esubtitle.cpp b/lib/gui/esubtitle.cpp
index 167325d8..f0b899f7 100644
--- a/lib/gui/esubtitle.cpp
+++ b/lib/gui/esubtitle.cpp
@@ -14,6 +14,7 @@ eSubtitleWidget::eSubtitleWidget(eWidget *parent)
 {
 	setBackgroundColor(gRGB(0,0,0,255));
 	m_page_ok = 0;
+	m_dvb_page_ok = 0;
 }
 
 void eSubtitleWidget::setPage(const eDVBTeletextSubtitlePage &p)
@@ -23,9 +24,17 @@ void eSubtitleWidget::setPage(const eDVBTeletextSubtitlePage &p)
 	invalidate();
 }
 
+void eSubtitleWidget::setPage(const eDVBSubtitlePage &p)
+{
+	m_dvb_page = p;
+	m_dvb_page_ok = 1;
+	invalidate();
+}
+
 void eSubtitleWidget::clearPage()
 {
 	m_page_ok = 0;
+	m_dvb_page_ok = 0;
 	invalidate();
 }
 
@@ -44,10 +53,9 @@ int eSubtitleWidget::event(int event, void *data, void *data2)
 		ePtr<gFont> font = new gFont("Regular", 30);
 		painter.setFont(font);
 		
-		
-		if (!m_page_ok)
+/*		if (!m_page_ok && !m_dvb_page_ok)
 			painter.renderText(eRect(ePoint(0, 0), size()), "waiting for subtitles...", gPainter::RT_WRAP);
-		else
+		else */if (m_page_ok)
 		{
 			int elements = m_page.m_elements.size();
 			int height = size().height();
@@ -60,6 +68,17 @@ int eSubtitleWidget::event(int event, void *data, void *data2)
 				painter.renderText(eRect(0, size_per_element * i, size().width(), size_per_element), m_page.m_elements[i].m_text, gPainter::RT_WRAP|gPainter::RT_VALIGN_CENTER|gPainter::RT_HALIGN_CENTER);
 			}
 		}
+		else if (m_dvb_page_ok)
+		{
+			painter.setOffset(ePoint(0,0));
+//			if (!m_dvb_page.m_regions.size())
+//				eDebug("clear screen");
+			for (std::list<eDVBSubtitleRegion>::iterator it(m_dvb_page.m_regions.begin()); it != m_dvb_page.m_regions.end(); ++it)
+			{
+				painter.resetClip(eRect(it->m_position, it->m_pixmap->size()));
+				painter.blit(it->m_pixmap, it->m_position);
+			}
+		}
 		return 0;
 	}
 	default:
diff --git a/lib/gui/esubtitle.h b/lib/gui/esubtitle.h
index 0cd66d2c..ad4b523b 100644
--- a/lib/gui/esubtitle.h
+++ b/lib/gui/esubtitle.h
@@ -3,6 +3,7 @@
 
 #include <lib/gui/ewidget.h>
 #include <lib/dvb/teletext.h>
+#include <lib/dvb/subtitle.h>
 
 class eDVBTeletextSubtitlePage;
 
@@ -12,6 +13,7 @@ public:
 	eSubtitleWidget(eWidget *parent);
 	
 	void setPage(const eDVBTeletextSubtitlePage &p);
+	void setPage(const eDVBSubtitlePage &p);
 	void clearPage();
 	
 protected:
@@ -20,6 +22,9 @@ protected:
 private:
 	int m_page_ok;
 	eDVBTeletextSubtitlePage m_page;
+
+	int m_dvb_page_ok;
+	eDVBSubtitlePage m_dvb_page;
 };
 
 #endif
-- 
cgit v1.2.3