X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/d3eca61ede32dd385b2e53fb33c669efa26cbcfb..ff69eecfab66bbfa534d8a766c001c79a13ac90e:/lib/gui/esubtitle.cpp diff --git a/lib/gui/esubtitle.cpp b/lib/gui/esubtitle.cpp index 6e8d48e9..5cf4cfa2 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,23 +49,56 @@ 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 } void eSubtitleWidget::setPage(const eDVBSubtitlePage &p) { -// eDebug("setPage"); + 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()); - m_visible_region.rects.push_back(eRect(it->m_position, it->m_pixmap->size())); + 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); + m_hide_subtitles_timer->start(7500, true); + 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; istart(timeout_ms, true); invalidate(m_visible_region); // invalidate new regions } @@ -71,10 +107,25 @@ 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; /* this is in a virtual 720x576 cage */ + + /* incoming "changed" regions are relative to the physical pixmap area, so they have to be scaled to the virtual pixmap area, then to the screen */ + changed.scale(m_pixmap_dest.width(), 720, m_pixmap_dest.height(), 576); + changed.moveBy(ePoint(m_pixmap_dest.x(), m_pixmap_dest.y())); + + changed.scale(size().width(), pixmap->size().width(), size().height(), pixmap->size().height()); + + invalidate(changed); +} + int eSubtitleWidget::event(int event, void *data, void *data2) { switch (event) @@ -85,30 +136,81 @@ 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", 38); - painter.setFont(font); - - if (m_page_ok) + + 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) - painter.blit(it->m_pixmap, it->m_position); + { + /* 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; } @@ -116,3 +218,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; +} +