From 0e7fc97cfaaecf1b7fc93a73157a6a380e9058f4 Mon Sep 17 00:00:00 2001 From: Andreas Frisch Date: Mon, 20 Oct 2008 11:52:18 +0000 Subject: [PATCH] hide subtitles after actual duration timeout, unescape entities and simulate bold and italic --- lib/gui/esubtitle.cpp | 80 ++++++++++++++++++++++++++++++++++++++ lib/gui/esubtitle.h | 27 +++++++++++++ lib/service/servicemp3.cpp | 6 ++- 3 files changed, 111 insertions(+), 2 deletions(-) diff --git a/lib/gui/esubtitle.cpp b/lib/gui/esubtitle.cpp index 80211b4d..f859c170 100644 --- a/lib/gui/esubtitle.cpp +++ b/lib/gui/esubtitle.cpp @@ -66,11 +66,43 @@ void eSubtitleWidget::setPage(const eDVBSubtitlePage &p) invalidate(m_visible_region); // invalidate new regions } +void eSubtitleWidget::setPage(const ePangoSubtitlePage &p) +{ + m_pango_page = p; + m_pango_page_ok = 1; + invalidate(m_visible_region); // invalidate old visible regions + m_visible_region.rects.clear(); + + int elements = m_pango_page.m_elements.size(); + if (elements) + { + int startY = elements > 1 + ? size().height() / 2 + : size().height() / 3 * 2; + int width = size().width() - startX * 2; + int height = size().height() - startY; + int size_per_element = height / (elements ? elements : 1); + for (int i=0; i &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) @@ -112,6 +153,45 @@ int eSubtitleWidget::event(int event, void *data, void *data2) 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 font = new gFont("Regular", 38); + for (int i=0; i::iterator it(m_dvb_page.m_regions.begin()); it != m_dvb_page.m_regions.end(); ++it) diff --git a/lib/gui/esubtitle.h b/lib/gui/esubtitle.h index 15542773..b81faf79 100644 --- a/lib/gui/esubtitle.h +++ b/lib/gui/esubtitle.h @@ -5,7 +5,29 @@ #include #include +struct ePangoSubtitlePageElement +{ + gRGB m_color; + std::string m_pango_line; + eRect m_area; + ePangoSubtitlePageElement(const gRGB &color, const std::string &text) + : m_color(color), m_pango_line(text) + { + } +}; + +struct ePangoSubtitlePage +{ + pts_t m_pts; + int m_have_pts; + int m_timeout; /* in milliseconds */ + std::vector m_elements; + void clear() { m_elements.clear(); } +}; + class eDVBTeletextSubtitlePage; +class eDVBPangoSubtitlePage; +class ePangoSubtitlePage; class eSubtitleWidget: public eWidget, public Object { @@ -14,6 +36,7 @@ public: void setPage(const eDVBTeletextSubtitlePage &p); void setPage(const eDVBSubtitlePage &p); + void setPage(const ePangoSubtitlePage &p); void clearPage(); void setPixmap(ePtr &pixmap, gRegion changed); @@ -27,11 +50,15 @@ private: int m_dvb_page_ok; eDVBSubtitlePage m_dvb_page; + int m_pango_page_ok; + ePangoSubtitlePage m_pango_page; + eTimer m_hide_subtitles_timer; gRegion m_visible_region; ePtr m_pixmap; // pixmap to paint on next evtPaint + std::string eSubtitleWidget::replace_all(const std::string &in, const std::string &entity, const std::string &symbol); }; #endif diff --git a/lib/service/servicemp3.cpp b/lib/service/servicemp3.cpp index 225d90f6..be3536b6 100644 --- a/lib/service/servicemp3.cpp +++ b/lib/service/servicemp3.cpp @@ -1168,14 +1168,16 @@ eAutoInitPtr init_eServiceFactoryMP3(eAutoInitNumbers::servi void eServiceMP3::gstCBsubtitleAvail(GstElement *element, GstBuffer *buffer, GstPad *pad, gpointer user_data) { + gint64 duration_ns = GST_BUFFER_DURATION(buffer); const unsigned char *text = (unsigned char *)GST_BUFFER_DATA(buffer); eDebug("gstCBsubtitleAvail: %s",text); eServiceMP3 *_this = (eServiceMP3*)user_data; if ( _this->m_subtitle_widget ) { - eDVBTeletextSubtitlePage page; + ePangoSubtitlePage page; gRGB rgbcol(0xD0,0xD0,0xD0); - page.m_elements.push_back(eDVBTeletextSubtitlePageElement(rgbcol, (const char*)text)); + page.m_elements.push_back(ePangoSubtitlePageElement(rgbcol, (const char*)text)); + page.m_timeout = duration_ns / 1000000; (_this->m_subtitle_widget)->setPage(page); } } -- 2.30.2