X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/0e7fc97cfaaecf1b7fc93a73157a6a380e9058f4..5e214d181d1590e0002eabdc6f8395cd6ddde2a7:/lib/gui/esubtitle.cpp

diff --git a/lib/gui/esubtitle.cpp b/lib/gui/esubtitle.cpp
index f859c170..376fa24d 100644
--- a/lib/gui/esubtitle.cpp
+++ b/lib/gui/esubtitle.cpp
@@ -10,13 +10,16 @@
 		....
  	*/	
 
+eSubtitleWidget::eSubtitleStyle eSubtitleWidget::subtitleStyles[Subtitle_MAX];
+
 eSubtitleWidget::eSubtitleWidget(eWidget *parent)
-	: eWidget(parent), m_hide_subtitles_timer(eApp)
+	: eWidget(parent), m_hide_subtitles_timer(eTimer::create(eApp))
 {
 	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
@@ -46,7 +49,7 @@ void eSubtitleWidget::setPage(const eDVBTeletextSubtitlePage &p)
 			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
 }
 
@@ -62,7 +65,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_hide_subtitles_timer.start(7500, true);
+	m_hide_subtitles_timer->start(7500, true);
 	invalidate(m_visible_region);  // invalidate new regions
 }
 
@@ -93,7 +96,7 @@ void eSubtitleWidget::setPage(const ePangoSubtitlePage &p)
 		}
 	}
 	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
 }
 
@@ -113,15 +116,6 @@ void eSubtitleWidget::setPixmap(ePtr<gPixmap> &pixmap, gRegion changed)
 	invalidate(changed);
 }
 
-std::string eSubtitleWidget::replace_all(const std::string &in, const std::string &entity, const std::string &symbol)
-{
-	std::string out = in;
-	std::string::size_type loc = 0;
-	while (( loc = out.find(entity, loc)) != std::string::npos )
-	out.replace(loc, entity.length(), symbol);
-	return out;
-}
-
 int eSubtitleWidget::event(int event, void *data, void *data2)
 {
 	switch (event)
@@ -139,42 +133,42 @@ int eSubtitleWidget::event(int event, void *data, void *data2)
 		else if (m_page_ok)
 		{
 			int elements = m_page.m_elements.size();
-			ePtr<gFont> font = new gFont("Regular", 38);
-			painter.setFont(font);
+			painter.setFont(subtitleStyles[Subtitle_TTX].font);
 			for (int i=0; i<elements; ++i)
 			{
 				eDVBTeletextSubtitlePageElement &element = m_page.m_elements[i];
 				eRect &area = element.m_area;
 				eRect shadow = area;
-				shadow.moveBy(3,3);
-				painter.setForegroundColor(gRGB(0,0,0));
+				shadow.moveBy(subtitleStyles[Subtitle_TTX].shadow_offset);
+				painter.setForegroundColor(subtitleStyles[Subtitle_TTX].shadow_color);
 				painter.renderText(shadow, element.m_text, gPainter::RT_WRAP|gPainter::RT_VALIGN_CENTER|gPainter::RT_HALIGN_CENTER);
-				painter.setForegroundColor(element.m_color);
+				if ( !subtitleStyles[Subtitle_TTX].have_foreground_color )
+					painter.setForegroundColor(element.m_color);
+				else
+					painter.setForegroundColor(subtitleStyles[Subtitle_TTX].foreground_color);
 				painter.renderText(area, element.m_text, gPainter::RT_WRAP|gPainter::RT_VALIGN_CENTER|gPainter::RT_HALIGN_CENTER);
 			}
 		}
 		else if (m_pango_page_ok)
 		{
 			int elements = m_pango_page.m_elements.size();
-			ePtr<gFont> font = new gFont("Regular", 38);
+			subfont_t face;
+
 			for (int i=0; i<elements; ++i)
 			{
+				face = Subtitle_Regular;
 				ePangoSubtitlePageElement &element = m_pango_page.m_elements[i];
-				std::string text = element.m_pango_line;				
+				std::string text = element.m_pango_line;
 				std::string::size_type loc = text.find("<", 0 );
 				if ( loc != std::string::npos )
 				{
 					switch (char(text.at(1)))
 					{
 					case 'i':
-						eDebug("found italic");
-						font = new gFont("LCD", 40);
+						face = Subtitle_Italic;
 						break;
 					case 'b':
-						eDebug("found bold");
-						font = new gFont("Replacement", 40);
-						break;
-					default:
+						face = Subtitle_Bold;
 						break;
 					}
 					text = text.substr(3, text.length()-7);
@@ -182,13 +176,16 @@ int eSubtitleWidget::event(int event, void *data, void *data2)
 				text = replace_all(text, "&apos;", "'");
 				text = replace_all(text, "&quot;", "\"");
 				text = replace_all(text, "&amp;", "&");
-				painter.setFont(font);		
+				painter.setFont(subtitleStyles[face].font);
 				eRect &area = element.m_area;
 				eRect shadow = area;
-				shadow.moveBy(3,3);
-				painter.setForegroundColor(gRGB(0,0,0));
+				shadow.moveBy(subtitleStyles[face].shadow_offset);
+				painter.setForegroundColor(subtitleStyles[face].shadow_color);
 				painter.renderText(shadow, text, gPainter::RT_WRAP|gPainter::RT_VALIGN_CENTER|gPainter::RT_HALIGN_CENTER);
-				painter.setForegroundColor(element.m_color);
+				if ( !subtitleStyles[face].have_foreground_color && element.m_have_color )
+					painter.setForegroundColor(element.m_color);
+				else
+					painter.setForegroundColor(subtitleStyles[face].foreground_color);
 				painter.renderText(area, text, gPainter::RT_WRAP|gPainter::RT_VALIGN_CENTER|gPainter::RT_HALIGN_CENTER);
 			}
 		}
@@ -203,3 +200,13 @@ int eSubtitleWidget::event(int event, void *data, void *data2)
 		return eWidget::event(event, data, data2);
 	}
 }
+
+void eSubtitleWidget::setFontStyle(subfont_t face, gFont *font, int haveColor, const gRGB &col, const gRGB &shadowCol, const ePoint &shadowOffset)
+{
+	subtitleStyles[face].font = font;
+	subtitleStyles[face].have_foreground_color = haveColor;
+	subtitleStyles[face].foreground_color = col;
+	subtitleStyles[face].shadow_color = shadowCol;
+	subtitleStyles[face].shadow_offset = shadowOffset;
+}
+