Index: libs/libmythtv/osdtypeteletext.h =================================================================== --- libs/libmythtv/osdtypeteletext.h (revision 10340) +++ libs/libmythtv/osdtypeteletext.h (working copy) @@ -15,6 +15,7 @@ #include "osdtypes.h" #include "teletextdecoder.h" +#include "osd.h" class TTFFont; class OSDType; @@ -81,6 +82,7 @@ int flof; ///< page has FastText links int floflink[6]; ///< FastText links (FLOF) bool subtitle; ///< page is subtitle page + bool active; }; class TeletextPage @@ -96,9 +98,10 @@ class TeletextMagazine { public: - QMutex lock; + mutable QMutex lock; int current_page; int current_subpage; + TeletextSubPage loadingpage; std::map pages; }; @@ -107,35 +110,28 @@ Q_OBJECT public: OSDTypeTeletext(const QString &name, TTFFont *font, - QRect displayrect, float wmult, float hmult); + QRect displayrect, float wmult, float hmult, OSD *osd); OSDTypeTeletext(const OSDTypeTeletext &other) : OSDType(other.m_name), TeletextViewer() {} virtual ~OSDTypeTeletext() {} - void Reinit(float wmult, float hmult); + // Teletext Drawing methods void Draw(OSDSurface *surface, int fade, int maxfade, int xoff, int yoff); + void DrawBackground(OSDSurface *surface, int x, int y) const; + void DrawRect(OSDSurface *surface, const QRect) const; + void DrawCharacter(OSDSurface *surface, int x, int y, + QChar ch, int doubleheight = 0) const; + void DrawMosaic(OSDSurface *surface, int x, int y, + int code, int doubleheight) const; + void DrawLine(OSDSurface *surface, const uint8_t *page, + uint row, int lang) const; + void DrawHeader(OSDSurface *surface, const uint8_t *page, int lang) const; + void DrawStatus(OSDSurface *surface) const; + void DrawPage(OSDSurface *surface) const; - void SetForegroundColor(int color); - void SetBackgroundColor(int color); - - void DrawBackground(int x, int y); - void DrawRect(int x, int y, int dx, int dy); - void DrawCharacter(int x, int y, QChar ch, int doubleheight = 0); - void DrawMosaic(int x, int y, int code, int doubleheight); - - void DrawLine(const uint8_t* page, uint row, int lang); - void DrawHeader(const uint8_t* page, int lang); - void DrawPage(void); - - void NewsFlash(void) {}; - - void PageUpdated(int page, int subpage); - void HeaderUpdated(uint8_t* page, int lang); - void StatusUpdated(void); - - // Teletext Viewer methods + // TeletextViewer interface methods void KeyPress(uint key); void SetPage(int page, int subpage); void SetDisplaying(bool display) { m_displaying = display; }; @@ -146,57 +142,78 @@ void AddTeletextData(int magazine, int row, const uint8_t* buf, int vbimode); + static const QColor kColorBlack; + static const QColor kColorRed; + static const QColor kColorGreen; + static const QColor kColorYellow; + static const QColor kColorBlue; + static const QColor kColorMagenta; + static const QColor kColorCyan; + static const QColor kColorWhite; + static const int kTeletextColumns; + static const int kTeletextRows; + private: - char CharConversion(char ch, int lang); - TeletextSubPage *FindSubPage(int page, int subpage, int direction = 0); - TeletextPage *FindPage(int page, int direction = 0); + // Internal Teletext Sets + void SetForegroundColor(int color) const; + void SetBackgroundColor(int color) const; + // Internal Teletext Commands + void NewsFlash(void) {}; + void PageUpdated(int page, int subpage); + void HeaderUpdated(uint8_t *page, int lang); + + const TeletextSubPage *FindSubPagec(int page,int subpage,int dir = 0) const; + const TeletextPage *FindPagec(int page, int direction = 0) const; + + TeletextSubPage *FindSubPage(int page, int subpage, int direction = 0) + { return (TeletextSubPage*) FindSubPagec(page, subpage, direction);} + TeletextPage *FindPage(int page, int direction = 0) + { return (TeletextPage*) FindPagec(page, direction);} + private: QMutex m_lock; QRect m_displayrect; QRect m_unbiasedrect; - TTFFont *m_font; - OSDSurface *m_surface; OSDTypeBox *m_box; int m_tt_colspace; int m_tt_rowspace; - uint8_t m_bgcolor_y; - uint8_t m_bgcolor_u; - uint8_t m_bgcolor_v; - uint8_t m_bgcolor_a; - // last fetched page int m_fetchpage; int m_fetchsubpage; + // needs to mutable so we can change color character by character. + mutable TTFFont *m_font; + + // current character background + mutable uint8_t m_bgcolor_y; + mutable uint8_t m_bgcolor_u; + mutable uint8_t m_bgcolor_v; + mutable uint8_t m_bgcolor_a; + // currently displayed page: - int m_curpage; - int m_cursubpage; + mutable int m_curpage; + mutable int m_cursubpage; + mutable bool m_curpage_showheader; + mutable bool m_curpage_issubtitle; + int m_pageinput[3]; - bool m_curpage_showheader; - bool m_curpage_issubtitle; bool m_transparent; bool m_revealHidden; bool m_displaying; + OSD *m_osd; + uint8_t m_header[40]; + mutable bool m_header_changed; + mutable bool m_page_changed; + TeletextMagazine m_magazines[8]; unsigned char bitswap[256]; - - static const QColor kColorBlack; - static const QColor kColorRed; - static const QColor kColorGreen; - static const QColor kColorYellow; - static const QColor kColorBlue; - static const QColor kColorMagenta; - static const QColor kColorCyan; - static const QColor kColorWhite; - static const int kTeletextColumns; - static const int kTeletextRows; }; #endif Index: libs/libmythtv/osd.h =================================================================== --- libs/libmythtv/osd.h (revision 10340) +++ libs/libmythtv/osd.h (working copy) @@ -154,6 +154,8 @@ void SetTextSubtitles(const QStringList&); void ClearTextSubtitles(void); + + void UpdateTeletext(void); private: bool InitDefaults(void); bool InitCC608(void); Index: libs/libmythtv/osdtypeteletext.cpp =================================================================== --- libs/libmythtv/osdtypeteletext.cpp (revision 10340) +++ libs/libmythtv/osdtypeteletext.cpp (working copy) @@ -47,25 +47,31 @@ /*****************************************************************************/ OSDTypeTeletext::OSDTypeTeletext(const QString &name, TTFFont *font, - QRect displayrect, float wmult, float hmult) + QRect displayrect, float wmult, float hmult, OSD *osd) : OSDType(name), m_displayrect(displayrect), m_unbiasedrect(0,0,0,0), - m_font(font), m_surface(NULL), m_box(NULL), m_tt_colspace(m_displayrect.width() / kTeletextColumns), m_tt_rowspace(m_displayrect.height() / kTeletextRows), + // last fetched page + m_fetchpage(0), m_fetchsubpage(0), + + // current font + m_font(font), + + // current character background m_bgcolor_y(0), m_bgcolor_u(0), m_bgcolor_v(0), m_bgcolor_a(0), - // last fetched page - m_fetchpage(0), m_fetchsubpage(0), - // currently displayed page: + + // currently displayed page m_curpage(0x100), m_cursubpage(-1), m_curpage_showheader(true), m_curpage_issubtitle(false), m_transparent(false), m_revealHidden(false), - m_displaying(false) + m_displaying(false), m_osd(osd), + m_header_changed(false), m_page_changed(false) { m_unbiasedrect = bias(m_displayrect, wmult, hmult); @@ -104,7 +110,9 @@ m_magazines[mag].pages.clear(); m_magazines[mag].current_page = 0; m_magazines[mag].current_subpage = 0; + m_magazines[mag].loadingpage.active = false; } + memset(m_header, ' ', 40); m_curpage = 0x100; m_cursubpage = -1; @@ -115,23 +123,8 @@ m_pageinput[2] = '0'; } -/** \fn OSDTypeTeletext::CharConversion(char, int) - * \brief converts the given character to the given language - */ -char OSDTypeTeletext::CharConversion(char ch, int lang) -{ - int c = 0; - for (int j = 0; j < 14; j++) - { - c = ch & 0x7F; - if (c == lang_chars[0][j]) - ch = lang_chars[lang + 1][j]; - } - return ch; -} - /** \fn OSDTypeTeletext::AddPageHeader(int,int,const unsigned char*,int,int,int) - * \brief Adds a new page header + * \brief Adds a new page header * (page=0 if none) */ void OSDTypeTeletext::AddPageHeader(int page, int subpage, @@ -144,29 +137,41 @@ int lastPage = m_magazines[magazine - 1].current_page; int lastSubPage = m_magazines[magazine - 1].current_subpage; - // update the last fetched page if the magazine is the same + // update the last fetched page if the magazine is the same // and the page no. is different - if (page != lastPage || subpage != lastSubPage) + + if ((page != lastPage || subpage != lastSubPage) && + m_magazines[magazine - 1].loadingpage.active == true) + { + TeletextSubPage *ttpage = FindSubPage(lastPage, lastSubPage); + if (ttpage == NULL) + { + ttpage = &m_magazines[magazine - 1].pages[lastPage].subpages[lastSubPage]; + m_magazines[magazine - 1].pages[lastPage].pagenum = lastPage; + ttpage->subpagenum = lastSubPage; + } + memcpy(ttpage, &m_magazines[magazine - 1].loadingpage, sizeof(TeletextSubPage)); + m_magazines[magazine - 1].loadingpage.active = false; + PageUpdated(lastPage, lastSubPage); + } m_fetchpage = page; m_fetchsubpage = subpage; - TeletextSubPage *ttpage = FindSubPage(page, subpage); + TeletextSubPage *ttpage = &m_magazines[magazine - 1].loadingpage; - if (ttpage == NULL) - { - ttpage = &m_magazines[magazine - 1].pages[page].subpages[subpage]; - m_magazines[magazine - 1].pages[page].pagenum = page; - ttpage->subpagenum = subpage; - - for (int i=0; i < 6; i++) - ttpage->floflink[i] = 0; - } - m_magazines[magazine - 1].current_page = page; m_magazines[magazine - 1].current_subpage = subpage; + memset(ttpage->data, ' ', sizeof(ttpage->data)); + + ttpage->active = true; + ttpage->subpagenum = subpage; + + for (int i=0; i < 6; i++) + ttpage->floflink[i] = 0; + ttpage->lang = lang; ttpage->flags = flags; ttpage->flof = 0; @@ -174,7 +179,9 @@ ttpage->subtitle = (vbimode == VBI_DVB_SUBTITLE); for (int j = 0; j < 8; j++) + { ttpage->data[0][j] = 32; + } if (vbimode == VBI_DVB || vbimode == VBI_DVB_SUBTITLE) { @@ -184,11 +191,13 @@ else { memcpy(ttpage->data[0]+0, buf, 40); - memset(ttpage->data[0]+40, ' ', sizeof(ttpage->data)-40); } if ( !(ttpage->flags & TP_INTERRUPTED_SEQ)) + { + memcpy(m_header, ttpage->data[0], 40); HeaderUpdated(ttpage->data[0],ttpage->lang); + } } /** \fn OSDTypeTeletext::AddTeletextData(int,int,const unsigned char*,int) @@ -207,11 +216,8 @@ if (currentpage == 0) return; - TeletextSubPage *ttpage = FindSubPage(currentpage, currentsubpage); + TeletextSubPage *ttpage = &m_magazines[magazine - 1].loadingpage; - if (ttpage == NULL) - return; - switch (row) { case 1 ... 24: // Page Data @@ -298,7 +304,7 @@ } } -/** \fn OSDTypeTeletext::PageUpdated(int) +/** \fn OSDTypeTeletext::PageUpdated(int,int) * \brief Updates the page, if given pagenumber is the same * as the current shown page */ @@ -313,13 +319,8 @@ if (subpage != m_cursubpage && m_cursubpage != -1) return; - - if (m_surface != NULL) - { - m_surface->SetChanged(true); - m_surface->ClearUsed(); - DrawPage(); - } + m_page_changed = true; + m_osd->UpdateTeletext(); } /** \fn OSDTypeTeletext::HeaderUpdated(unsigned char*,int) @@ -331,6 +332,8 @@ */ void OSDTypeTeletext::HeaderUpdated(unsigned char *page, int lang) { + (void)lang; + if (!m_displaying) return; @@ -340,8 +343,16 @@ if (m_curpage_showheader == false) return; - if (m_surface != NULL) - DrawHeader(page, lang); + m_header_changed = true; +// Cannot use the OSD to trigger a draw for this. If it does it +// takes too much time drawing the page each time the data changes +// (the OSD erases the surface before doing a redraw so the entire +// teletext contents must be re-displayed). +// m_osd->UpdateTeletext(); +#if 0 + if (surface != NULL) + DrawHeader(surface, page, lang); +#endif } /** \fn OSDTypeTeletext::FindPage(int, int) @@ -351,9 +362,8 @@ * \param direction find page before or after the given page * \return TeletextPage (NULL if not found) */ -TeletextPage* OSDTypeTeletext::FindPage(int page, int direction) +const TeletextPage *OSDTypeTeletext::FindPagec(int page, int direction) const { - TeletextPage *res = NULL; int mag = MAGAZINE(page); if (mag > 8 || mag < 1) @@ -361,18 +371,18 @@ QMutexLocker lock(&m_magazines[mag - 1].lock); - std::map::iterator pageIter; + std::map::const_iterator pageIter; pageIter = m_magazines[mag - 1].pages.find(page); if (pageIter == m_magazines[mag - 1].pages.end()) return NULL; - res = &pageIter->second; + const TeletextPage *res = &pageIter->second; if (direction == -1) { --pageIter; if (pageIter == m_magazines[mag - 1].pages.end()) { - std::map::reverse_iterator iter; + std::map::const_reverse_iterator iter; iter = m_magazines[mag - 1].pages.rbegin(); res = &iter->second; } @@ -395,7 +405,7 @@ return res; } -/** \fn OSDTypeTeletext::FindSubPage(int, int, int) +/** \fn OSDTypeTeletext::FindSubPage(int, int, int) const * \brief Finds the given page * * \param page Page number @@ -404,9 +414,9 @@ * (only if Subpage is not -1) * \return TeletextSubPage (NULL if not found) */ -TeletextSubPage* OSDTypeTeletext::FindSubPage(int page, int subpage, int direction) +const TeletextSubPage *OSDTypeTeletext::FindSubPagec(int page, int subpage, + int direction) const { - TeletextSubPage *res = NULL; int mag = MAGAZINE(page); if (mag > 8 || mag < 1) @@ -414,63 +424,48 @@ QMutexLocker lock(&m_magazines[mag - 1].lock); - if (subpage == -1) - { - // return the first subpage found - std::map::iterator pageIter; - pageIter = m_magazines[mag - 1].pages.find(page); - if (pageIter == m_magazines[mag - 1].pages.end()) - return NULL; + std::map::const_iterator pageIter; + pageIter = m_magazines[mag - 1].pages.find(page); + if (pageIter == m_magazines[mag - 1].pages.end()) + return NULL; - TeletextPage *page = &pageIter->second; - std::map::iterator subpageIter; - subpageIter = page->subpages.begin(); - if (subpageIter == page->subpages.end()) - return NULL; + const TeletextPage *ttpage = &(pageIter->second); + std::map::const_iterator subpageIter = + ttpage->subpages.begin(); - return &subpageIter->second; - } - else - { - // try to find the subpage given - std::map::iterator pageIter; - pageIter = m_magazines[mag - 1].pages.find(page); - if (pageIter == m_magazines[mag - 1].pages.end()) - return NULL; + // try to find the subpage given, or first if subpage == -1 + if (subpage != -1) + subpageIter = ttpage->subpages.find(subpage); - TeletextPage *page = &pageIter->second; - std::map::iterator subpageIter; - subpageIter = page->subpages.find(subpage); - if (subpageIter == page->subpages.end()) - return NULL; + if (subpageIter == ttpage->subpages.end()) + return NULL; - res = &subpageIter->second; - if (direction == -1) - { - --subpageIter; - if (subpageIter == page->subpages.end()) - { - std::map::reverse_iterator iter; - iter = page->subpages.rbegin(); - res = &iter->second; - } - else - res = &subpageIter->second; - } + if (subpage == -1) + return &(subpageIter->second); - if (direction == 1) + const TeletextSubPage *res = &(subpageIter->second); + if (direction == -1) + { + --subpageIter; + if (subpageIter == ttpage->subpages.end()) { - ++subpageIter; - if (subpageIter == page->subpages.end()) - { - subpageIter = page->subpages.begin(); - res = &subpageIter->second; - } - else - res = &subpageIter->second; + std::map::const_reverse_iterator iter = + ttpage->subpages.rbegin(); + res = &(iter->second); } + else + res = &(subpageIter->second); } + if (direction == 1) + { + ++subpageIter; + if (subpageIter == ttpage->subpages.end()) + subpageIter = ttpage->subpages.begin(); + + res = &(subpageIter->second); + } + return res; } @@ -677,72 +672,69 @@ PageUpdated(m_curpage, m_cursubpage); } -/** \fn OSDTypeTeletext::SetForegroundColor(int) +QColor color_tt2qt(int ttcolor) +{ + QColor color; + + switch (ttcolor & ~TTColor::TRANSPARENT) + { + case TTColor::BLACK: color = OSDTypeTeletext::kColorBlack; break; + case TTColor::RED: color = OSDTypeTeletext::kColorRed; break; + case TTColor::GREEN: color = OSDTypeTeletext::kColorGreen; break; + case TTColor::YELLOW: color = OSDTypeTeletext::kColorYellow; break; + case TTColor::BLUE: color = OSDTypeTeletext::kColorBlue; break; + case TTColor::MAGENTA: color = OSDTypeTeletext::kColorMagenta; break; + case TTColor::CYAN: color = OSDTypeTeletext::kColorCyan; break; + case TTColor::WHITE: color = OSDTypeTeletext::kColorWhite; break; + } + + return color; +} + +/** \fn OSDTypeTeletext::SetForegroundColor(int) const * \brief Set the font color to the given color. * * NOTE: TTColor::TRANSPARENT does not do anything! * \sa TTColor */ -void OSDTypeTeletext::SetForegroundColor(int color) +void OSDTypeTeletext::SetForegroundColor(int ttcolor) const { - switch (color & ~TTColor::TRANSPARENT) - { - case TTColor::BLACK: m_font->setColor(kColorBlack); break; - case TTColor::RED: m_font->setColor(kColorRed); break; - case TTColor::GREEN: m_font->setColor(kColorGreen); break; - case TTColor::YELLOW: m_font->setColor(kColorYellow); break; - case TTColor::BLUE: m_font->setColor(kColorBlue); break; - case TTColor::MAGENTA: m_font->setColor(kColorMagenta); break; - case TTColor::CYAN: m_font->setColor(kColorCyan); break; - case TTColor::WHITE: m_font->setColor(kColorWhite); break; - } - + m_font->setColor(color_tt2qt(ttcolor)); m_font->setShadow(0,0); m_font->setOutline(0); } -/** \fn OSDTypeTeletext:SetBackgroundColor(int) +/** \fn OSDTypeTeletext:SetBackgroundColor(int) const * \brief Set the background color to the given color * * \sa TTColor */ -void OSDTypeTeletext::SetBackgroundColor(int ttcolor) +void OSDTypeTeletext::SetBackgroundColor(int ttcolor) const { - QColor color; + const QColor color = color_tt2qt(ttcolor); - switch (ttcolor & ~TTColor::TRANSPARENT) - { - case TTColor::BLACK: color = kColorBlack; break; - case TTColor::RED: color = kColorRed; break; - case TTColor::GREEN: color = kColorGreen; break; - case TTColor::YELLOW: color = kColorYellow; break; - case TTColor::BLUE: color = kColorBlue; break; - case TTColor::MAGENTA: color = kColorMagenta; break; - case TTColor::CYAN: color = kColorCyan; break; - case TTColor::WHITE: color = kColorWhite; break; - } + const int r = color.red(); + const int g = color.green(); + const int b = color.blue(); - int r = color.red(); - int g = color.green(); - int b = color.blue(); + const float y = (0.299*r) + (0.587*g) + (0.114*b); + const float u = (0.564*(b - y)); // = -0.169R-0.331G+0.500B + const float v = (0.713*(r - y)); // = 0.500R-0.419G-0.081B - float y = (0.299*r) + (0.587*g) + (0.114*b); - float u = (0.564*(b - y)); // = -0.169R-0.331G+0.500B - float v = (0.713*(r - y)); // = 0.500R-0.419G-0.081B - m_bgcolor_y = (uint8_t)(y); m_bgcolor_u = (uint8_t)(127 + u); m_bgcolor_v = (uint8_t)(127 + v); + m_bgcolor_a = (ttcolor & TTColor::TRANSPARENT) ? 0x00 : 0xff; } -/** \fn OSDTypeTeletext::DrawBackground(int, int) - * \brief draws background in the color set in setBackgroundColor +/** \fn OSDTypeTeletext::DrawBackground(OSDSurface*,int,int) const + * \brief draws background in the color set in SetBackgroundColor(). * * \param x X position (40 cols) * \param y Y position (25 rows) */ -void OSDTypeTeletext::DrawBackground(int x, int y) +void OSDTypeTeletext::DrawBackground(OSDSurface *surface, int x, int y) const { x *= m_tt_colspace; x += m_displayrect.left(); @@ -750,46 +742,42 @@ y *= m_tt_rowspace; y += m_displayrect.top(); - DrawRect(x, y, m_tt_colspace, m_tt_rowspace); + DrawRect(surface, QRect(x, y, m_tt_colspace, m_tt_rowspace)); } -/** \fn OSDTypeteletext::drawRect(int, int, int, int) - * \brief draws a Rectangle at position x and y (width dx, height dy) - * with the color set in setBackgroundColor - * - * \param x X position at the screen - * \param y Y position at the screen - * \param dx width - * \param dy height +/** \fn OSDTypeteletext::DrawRect(OSDSurface*,const QRect) const + * \brief Draws a Rectangle with the color set in SetBackgroundColor(). */ -void OSDTypeTeletext::DrawRect(int x, int y, int dx, int dy) +void OSDTypeTeletext::DrawRect(OSDSurface *surface, const QRect rect) const { - QRect all(x, y, dx, dy); - m_surface->AddRect(all); + QRect tmp = rect; + surface->AddRect(tmp); - int luma_stride = m_surface->width; - int chroma_stride = m_surface->width >> 1; - int ye = y + dy; + const int luma_stride = surface->width; + const int chroma_stride = surface->width >> 1; + const int y = rect.top(), x = rect.left(); + const int dy = rect.height(), dx = rect.width(); + const int ye = y + dy; - unsigned char *buf_y = m_surface->y + (luma_stride * y) + x; - unsigned char *buf_u = m_surface->u + (chroma_stride * (y>>1)) + (x>>1); - unsigned char *buf_v = m_surface->v + (chroma_stride * (y>>1)) + (x>>1); - unsigned char *buf_a = m_surface->alpha + (luma_stride * y) + x; + unsigned char *buf_y = surface->y + (luma_stride * y) + x; + unsigned char *buf_u = surface->u + (chroma_stride * (y>>1)) + (x>>1); + unsigned char *buf_v = surface->v + (chroma_stride * (y>>1)) + (x>>1); + unsigned char *buf_a = surface->alpha + (luma_stride * y) + x; - for (; y>1] = m_bgcolor_u; - buf_v[i>>1] = m_bgcolor_v; + buf_u[k>>1] = m_bgcolor_u; + buf_v[k>>1] = m_bgcolor_v; } buf_u += chroma_stride; @@ -801,7 +789,7 @@ } } -/** \fn OSDTypeTeletext::DrawCharacter(int, int, QChar, int) +/** \fn OSDTypeTeletext::DrawCharacter(OSDSurface*,int,int,QChar,int) const * \brief Draws a character at posistion x, y * * \param x X position (40 cols) @@ -809,7 +797,9 @@ * \param ch Character * \param doubleheight if different to 0, draw doubleheighted character */ -void OSDTypeTeletext::DrawCharacter(int x, int y, QChar ch, int doubleheight) +void OSDTypeTeletext::DrawCharacter(OSDSurface *surface, + int x, int y, + QChar ch, int doubleheight) const { if (!m_font) return; @@ -822,8 +812,8 @@ y *= m_tt_rowspace; y += m_displayrect.top(); - m_font->DrawString(m_surface, x, y, line, - m_surface->width, m_surface->height, + m_font->DrawString(surface, x, y, line, + surface->width, surface->height, 255, doubleheight); } @@ -833,35 +823,52 @@ * \param x X position (40 cols) * \param y Y position (25 rows) * \param code Code - * \param doubleheight if different to 0, draw doubleheighted mosaic) + * \param doubleheight if different to 0, draw doubleheighted mosaic) const */ -void OSDTypeTeletext::DrawMosaic(int x, int y, int code, int doubleheight) +void OSDTypeTeletext::DrawMosaic(OSDSurface *surface, int x, int y, + int code, int doubleheight) const { - (void)x; - (void)y; - (void)code; - x *= m_tt_colspace; x += m_displayrect.left(); y *= m_tt_rowspace; y += m_displayrect.top(); - int dx = (int)round(m_tt_colspace / 2)+1; - int dy = (int)round(m_tt_rowspace / 3)+1; + int dx = (int)round(m_tt_colspace / 2) + 1; + int dy = (int)round(m_tt_rowspace / 3) + 1; + dy = (doubleheight) ? (2 * dy) : dy; - if (doubleheight != 0) - dy *= 2; + if (code & 0x10) + DrawRect(surface, QRect(x, y + 2*dy, dx, dy)); + if (code & 0x40) + DrawRect(surface, QRect(x + dx, y + 2*dy, dx, dy)); + if (code & 0x01) + DrawRect(surface, QRect(x, y, dx, dy)); + if (code & 0x02) + DrawRect(surface, QRect(x + dx, y, dx, dy)); + if (code & 0x04) + DrawRect(surface, QRect(x, y + dy, dx, dy)); + if (code & 0x08) + DrawRect(surface, QRect(x + dx, y + dy, dx, dy)); +} - if (code & 0x10) DrawRect(x, y + 2*dy, dx, dy); - if (code & 0x40) DrawRect(x + dx, y + 2*dy, dx, dy); - if (code & 0x01) DrawRect(x, y, dx, dy); - if (code & 0x02) DrawRect(x + dx, y, dx, dy); - if (code & 0x04) DrawRect(x, y + dy, dx, dy); - if (code & 0x08) DrawRect(x + dx, y + dy, dx, dy); +/** \fn cvt_char(char,int) + * \brief converts the given character to the given language + */ +static char cvt_char(char ch, int lang) +{ + int c = 0; + for (int j = 0; j < 14; j++) + { + c = ch & 0x7F; + if (c == lang_chars[0][j]) + ch = lang_chars[lang + 1][j]; + } + return ch; } -void OSDTypeTeletext::DrawLine(const unsigned char* page, uint row, int lang) +void OSDTypeTeletext::DrawLine(OSDSurface *surface, const unsigned char *page, + uint row, int lang) const { bool mosaic; bool conceal; @@ -903,7 +910,7 @@ if (row == 1) { for (uint x = 0; x < 8; x++) - DrawBackground(x, 1); + DrawBackground(surface, x, 1); } for (uint x = (row == 1 ? 8 : 0); x < (uint)kTeletextColumns; ++x) @@ -1006,57 +1013,59 @@ if (m_transparent) SetBackgroundColor(TTColor::TRANSPARENT); - DrawBackground(x, row); + DrawBackground(surface, x, row); if (doubleheight && row < (uint)kTeletextRows) - DrawBackground(x, row + 1); + DrawBackground(surface, x, row + 1); if ((mosaic) && (ch < 0x40 || ch > 0x5F)) { SetBackgroundColor(newfgcolor); - DrawMosaic(x, row, ch, doubleheight); + DrawMosaic(surface, x, row, ch, doubleheight); } - else + else { - char c2 = CharConversion(ch, lang); + char c2 = cvt_char(ch, lang); bool dh = doubleheight && row < (uint)kTeletextRows; int rw = (dh) ? row + 1 : row; - DrawCharacter(x, rw, c2, dh); + DrawCharacter(surface, x, rw, c2, dh); } } } } -void OSDTypeTeletext::DrawHeader(const unsigned char* page, int lang) +void OSDTypeTeletext::DrawHeader(OSDSurface *surface, + const unsigned char* page, int lang) const { if (!m_displaying) return; if (page != NULL) - DrawLine(page, 1, lang); - - StatusUpdated(); + DrawLine(surface, page, 1, lang); + + DrawStatus(surface); } -void OSDTypeTeletext::DrawPage(void) +void OSDTypeTeletext::DrawPage(OSDSurface *surface) const { if (!m_displaying) return; - TeletextSubPage *ttpage = FindSubPage(m_curpage, m_cursubpage); + const TeletextSubPage *ttpage = FindSubPagec(m_curpage, m_cursubpage); - if (ttpage == NULL) + if (!ttpage) { - DrawHeader(NULL,0); + DrawHeader(surface, NULL, 0); // no page selected so show the header and a list of available pages return; } m_cursubpage = ttpage->subpagenum; int a = 0; - if ((ttpage->subtitle) || (ttpage->flags & - (TP_SUPPRESS_HEADER + TP_NEWSFLASH + TP_SUBTITLE))) + if ((ttpage->subtitle) || + (ttpage->flags & (TP_SUPPRESS_HEADER | TP_NEWSFLASH | TP_SUBTITLE))) { - a = 1; + a = 1; // when showing subtitles we don't want to + // see the teletext header line, so skip it when displaying m_curpage_showheader = false; m_curpage_issubtitle = true; } @@ -1064,11 +1073,20 @@ { m_curpage_issubtitle = false; m_curpage_showheader = true; - DrawHeader(ttpage->data[0], ttpage->lang); +// DrawHeader(surface, ttpage->data[0], ttpage->lang); +// if (m_header_changed == true) + { + DrawHeader(surface, m_header, ttpage->lang); + m_header_changed = false; + } } - for (int y = kTeletextRows-a; y >= 2; y--) - DrawLine(ttpage->data[y-1], y, ttpage->lang); +// if (m_page_changed == true) + { + m_page_changed = false; + for (int y = kTeletextRows - a; y >= 2; y--) + DrawLine(surface, ttpage->data[y-1], y, ttpage->lang); + } } void OSDTypeTeletext::Reinit(float wmult, float hmult) @@ -1078,34 +1096,28 @@ m_tt_rowspace = m_displayrect.height() / kTeletextRows; } -void OSDTypeTeletext::Draw(OSDSurface *surface, int fade, int maxfade, - int xoff, int yoff) +void OSDTypeTeletext::Draw(OSDSurface *surface, + int /*fade*/, int /*maxfade*/, + int /*xoff*/, int /*yoff*/) { - (void)surface; - (void)fade; - (void)maxfade; - (void)xoff; - (void)yoff; - - m_surface = surface; - DrawPage(); + DrawPage(surface); } -void OSDTypeTeletext::StatusUpdated(void) +void OSDTypeTeletext::DrawStatus(OSDSurface *surface) const { SetForegroundColor(TTColor::WHITE); SetBackgroundColor(TTColor::BLACK); if (!m_transparent) for (int i = 0; i < 40; ++i) - DrawBackground(i, 0); + DrawBackground(surface, i, 0); - DrawCharacter(1, 0, 'P', 0); - DrawCharacter(2, 0, m_pageinput[0], 0); - DrawCharacter(3, 0, m_pageinput[1], 0); - DrawCharacter(4, 0, m_pageinput[2], 0); + DrawCharacter(surface, 1, 0, 'P', 0); + DrawCharacter(surface, 2, 0, m_pageinput[0], 0); + DrawCharacter(surface, 3, 0, m_pageinput[1], 0); + DrawCharacter(surface, 4, 0, m_pageinput[2], 0); - TeletextSubPage *ttpage = FindSubPage(m_curpage, m_cursubpage); + const TeletextSubPage *ttpage = FindSubPagec(m_curpage, m_cursubpage); if (!ttpage) { @@ -1114,11 +1126,11 @@ if (!m_transparent) for (int i = 7; i < 40; i++) - DrawBackground(i, 0); + DrawBackground(surface, i, 0); char *str = "Page Not Available"; for (unsigned int i = 0; i < strlen(str); ++i) - DrawCharacter(i+10, 0, str[i], 0); + DrawCharacter(surface, i+10, 0, str[i], 0); return; } @@ -1126,14 +1138,14 @@ // get list of available sub pages QString str = ""; int count = 1, selected = 0; - TeletextPage *page = FindPage(m_curpage); + const TeletextPage *page = FindPagec(m_curpage); if (page) { - std::map::iterator subpageIter; + std::map::const_iterator subpageIter; subpageIter = page->subpages.begin(); while (subpageIter != page->subpages.end()) { - TeletextSubPage *subpage = &subpageIter->second; + const TeletextSubPage *subpage = &subpageIter->second; if (subpage->subpagenum == m_cursubpage) { @@ -1180,7 +1192,7 @@ else SetBackgroundColor(TTColor::BLACK); - DrawBackground(x * 3 + 7, 0); + DrawBackground(surface, x * 3 + 7, 0); if (str[x * 3] == '*') { @@ -1188,12 +1200,12 @@ SetBackgroundColor(TTColor::RED); } - DrawBackground(x * 3 + 8, 0); - DrawBackground(x * 3 + 9, 0); + DrawBackground(surface, x * 3 + 8, 0); + DrawBackground(surface, x * 3 + 9, 0); - DrawCharacter(x * 3 + 7, 0, str[x * 3], 0); - DrawCharacter(x * 3 + 8, 0, str[x * 3 + 1], 0); - DrawCharacter(x * 3 + 9, 0, str[x * 3 + 2], 0); + DrawCharacter(surface, x * 3 + 7, 0, str[x * 3], 0); + DrawCharacter(surface, x * 3 + 8, 0, str[x * 3 + 1], 0); + DrawCharacter(surface, x * 3 + 9, 0, str[x * 3 + 2], 0); } } Index: libs/libmythtv/osd.cpp =================================================================== --- libs/libmythtv/osd.cpp (revision 10340) +++ libs/libmythtv/osd.cpp (working copy) @@ -269,12 +269,31 @@ } OSDTypeTeletext *ttpage = new OSDTypeTeletext( - name, font, area, wmult, hmult); + name, font, area, wmult, hmult, this); + container->SetPriority(30); // set draw priority to 30. container->AddType(ttpage); return true; } +void OSD::UpdateTeletext(void) +{ + QMutexLocker locker(&osdlock); + + OSDSet *container = GetSet("teletext"); + if (!container) + return; + + OSDType *type = container->GetType("teletext"); + OSDTypeTeletext *ttpage = dynamic_cast(type); + if (ttpage) + { + container->Display(1); + m_setsvisible = true; + changed = true; + } +} + void OSD::SetTextSubtitles(const QStringList &lines) { const uint SUBTITLE_FONT_SIZE = 18;