X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/41558bc41a72c62a0c9fd4fbf28df23a2fc2fa44..e3922901f71a44a74c320504a4a61f7b2906aaf2:/lib/gui/esubtitle.cpp diff --git a/lib/gui/esubtitle.cpp b/lib/gui/esubtitle.cpp index 933a6c62..f3d0e35f 100644 --- a/lib/gui/esubtitle.cpp +++ b/lib/gui/esubtitle.cpp @@ -1,5 +1,6 @@ #include #include +#include /* ok, here's much room for improvements. @@ -9,28 +10,116 @@ .... */ +eSubtitleWidget::eSubtitleStyle eSubtitleWidget::subtitleStyles[Subtitle_MAX]; + eSubtitleWidget::eSubtitleWidget(eWidget *parent) - : eWidget(parent) + : eWidget(parent), m_hide_subtitles_timer(eTimer::create(eApp)) { setBackgroundColor(gRGB(0,0,0,255)); + m_page_ok = 0; + m_dvb_page_ok = 0; + m_pango_page_ok = 0; + CONNECT(m_hide_subtitles_timer->timeout, eSubtitleWidget::clearPage); } -void eSubtitleWidget::addPage(const eDVBTeletextSubtitlePage &p) +#define startX 50 +void eSubtitleWidget::setPage(const eDVBTeletextSubtitlePage &p) { - eDebug("ADD Subtitle Page!!"); - m_pages.clear(); - m_pages.push_back(p); - checkTiming(); + m_page = p; + m_page_ok = 1; + invalidate(m_visible_region); // invalidate old visible regions + m_visible_region.rects.clear(); + + int elements = m_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; istart(7500, true); + invalidate(m_visible_region); // invalidate new regions } -void eSubtitleWidget::checkTiming() +void eSubtitleWidget::setPage(const eDVBSubtitlePage &p) { - activatePage(); + eDebug("setPage"); + m_dvb_page = p; + invalidate(m_visible_region); // invalidate old visible regions + m_visible_region.rects.clear(); + for (std::list::iterator it(m_dvb_page.m_regions.begin()); it != m_dvb_page.m_regions.end(); ++it) + { + eDebug("add %d %d %d %d", it->m_position.x(), it->m_position.y(), it->m_pixmap->size().width(), it->m_pixmap->size().height()); + eRect r = eRect(it->m_position, it->m_pixmap->size()); + r.scale(size().width(), 720, size().height(), 576); + m_visible_region.rects.push_back(r); + } + m_dvb_page_ok = 1; + m_hide_subtitles_timer->start(7500, true); + invalidate(m_visible_region); // invalidate new regions } -void eSubtitleWidget::activatePage() +void eSubtitleWidget::setPage(const ePangoSubtitlePage &p) { - invalidate(); + 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; istart(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(); +} + +void eSubtitleWidget::setPixmap(ePtr &pixmap, gRegion changed, eRect pixmap_dest) +{ + m_pixmap = pixmap; + m_pixmap_dest = pixmap_dest; + + changed.scale(size().width(), pixmap->size().width(), size().height(), pixmap->size().height()); + + invalidate(changed); } int eSubtitleWidget::event(int event, void *data, void *data2) @@ -43,26 +132,80 @@ int eSubtitleWidget::event(int event, void *data, void *data2) gPainter &painter = *(gPainter*)data2; getStyle(style); - eWidget::event(event, data, data2); - ePtr font = new gFont("Regular", 30); - painter.setFont(font); - - std::list::iterator pi = m_pages.begin(); - if (pi == m_pages.end()) - painter.renderText(eRect(ePoint(0, 0), size()), "waiting for subtitles...", gPainter::RT_WRAP); - else + + if (m_pixmap) + { + eRect r = m_pixmap_dest; + r.scale(size().width(), 720, size().height(), 576); + painter.blitScale(m_pixmap, r); + } else if (m_page_ok) + { + int elements = m_page.m_elements.size(); + painter.setFont(subtitleStyles[Subtitle_TTX].font); + for (int i=0; i::iterator it(m_dvb_page.m_regions.begin()); it != m_dvb_page.m_regions.end(); ++it) + { + /* 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; @@ -71,3 +214,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; +} +