Ticket #2586: teletext.diff

libs/libmythtv/osdtypeteletext.cpp

@@ -1 +1 @@
 /* =============================================================
  * File  : osdtypeteletext.cpp
  * Author: Frank Muenchow <beebof@gmx.de>
- *         Martin Barnasconi
+ *         Martin Barnasconi <martin@barnasconi.net>
  * Date  : 2005-10-25
  *
  * This program is free software; you can redistribute it
@@ -215 +215 @@
         return;
 
     int currentpage = m_magazines[magazine - 1].current_page;
+
     if (!currentpage)
         return;
 
@@ -248 +249 @@
             {
                 case VBI_IVTV:
                     b1 = hamm8(buf, &err);
-                    b2 = hamm8(buf + 37, & err);
-                    if (err & 0xF00)
+                    b2 = hamm8(buf + 37, &err);
+                    if (err & 0xF000)
                         return;
                      break;
                 case VBI_DVB:
@@ -512 +513 @@
                 m_pageinput[2] = ' ';
             }
 
+            PageUpdated(m_curpage, m_cursubpage);
             break;
 
         case TTKey::kNextPage:
         {
             TeletextPage *ttpage = FindPage(m_curpage, 1);
+
             if (ttpage)
                 newPage = ttpage->pagenum;
+
             newSubPage = -1;
             m_curpage_showheader = true;
             break;
@@ -527 +531 @@
         case TTKey::kPrevPage:
         {
             TeletextPage *ttpage = FindPage(m_curpage, -1);
+
             if (ttpage)
                 newPage = ttpage->pagenum;
+
             newSubPage = -1;
             m_curpage_showheader = true;
             break;
@@ -537 +543 @@
         case TTKey::kNextSubPage:
         {
             TeletextSubPage *ttpage = FindSubPage(m_curpage, m_cursubpage, 1);
+
             if (ttpage)
                 newSubPage = ttpage->subpagenum;
+
             m_curpage_showheader = true;
             break;
         }
@@ -546 +554 @@
         case TTKey::kPrevSubPage:
         {
             TeletextSubPage *ttpage = FindSubPage(m_curpage, m_cursubpage, -1);
+
             if (ttpage)
                 newSubPage = ttpage->subpagenum;
+
             m_curpage_showheader = true;
             break;
         }
@@ -887 +897 @@
 
     char last_ch = ' ';
     char ch;
+    char floflinkcnt;
 
     uint fgcolor = TTColor::WHITE;
     uint bgcolor = TTColor::BLACK;
     uint newfgcolor = TTColor::WHITE;
     uint newbgcolor = TTColor::BLACK;
 
+    const TeletextSubPage *ttpage = FindSubPage(m_curpage, m_cursubpage);
+
     if (m_curpage_issubtitle || m_transparent)
     {
         bgcolor    = TTColor::TRANSPARENT;
@@ -911 +924 @@
     hold = false;
     endbox = false;
     startbox = false;
+    floflinkcnt = 0;
 
     if (row == 1)
     {
@@ -942 +956 @@
                 fgcolor = ch & 7;
                 mosaic = false;
                 conceal = false;
+
+                if (row == 25) {
+                   floflinkcnt++; //menu item detected;
+                   }
+
                 goto ctrl;
             case 0x08: // flash
                 // XXX
@@ -1008 +1027 @@
                 break;
         }
 
+        if (floflinkcnt) {
+          if (ttpage->floflink[floflinkcnt-1] == 0) 
+             fgcolor = TTColor::BLACK;  //hide FLOF menu characters if not available
+        }
+
         newfgcolor = fgcolor;
         newbgcolor = bgcolor;