diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gui/esubtitle.cpp | 80 | ||||
| -rw-r--r-- | lib/gui/esubtitle.h | 27 | ||||
| -rw-r--r-- | 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<elements; ++i) + { + eRect &area = m_pango_page.m_elements[i].m_area; + area.setLeft(startX); + area.setTop(size_per_element * i + startY); + area.setWidth(width); + area.setHeight(size_per_element); + m_visible_region.rects.push_back(area); + } + } + int timeout_ms = m_pango_page.m_timeout; + m_hide_subtitles_timer.start(timeout_ms, true); + invalidate(m_visible_region); // invalidate new regions +} + void eSubtitleWidget::clearPage() { eDebug("subtitle timeout... hide"); m_page_ok = 0; m_dvb_page_ok = 0; + m_pango_page_ok = 0; invalidate(m_visible_region); m_visible_region.rects.clear(); } @@ -81,6 +113,15 @@ 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) @@ -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<gFont> font = new gFont("Regular", 38); + for (int i=0; i<elements; ++i) + { + ePangoSubtitlePageElement &element = m_pango_page.m_elements[i]; + 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); + break; + case 'b': + eDebug("found bold"); + font = new gFont("Replacement", 40); + break; + default: + break; + } + text = text.substr(3, text.length()-7); + } + text = replace_all(text, "'", "'"); + text = replace_all(text, """, "\""); + text = replace_all(text, "&", "&"); + painter.setFont(font); + eRect &area = element.m_area; + eRect shadow = area; + shadow.moveBy(3,3); + painter.setForegroundColor(gRGB(0,0,0)); + painter.renderText(shadow, text, gPainter::RT_WRAP|gPainter::RT_VALIGN_CENTER|gPainter::RT_HALIGN_CENTER); + painter.setForegroundColor(element.m_color); + painter.renderText(area, text, gPainter::RT_WRAP|gPainter::RT_VALIGN_CENTER|gPainter::RT_HALIGN_CENTER); + } + } 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) 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 <lib/dvb/teletext.h> #include <lib/dvb/subtitle.h> +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<ePangoSubtitlePageElement> 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<gPixmap> &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<gPixmap> 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<eServiceFactoryMP3> 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); } } |
