Ticket #2586: 2586-v2.patch

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
@@ -248 +248 @@
             {
                 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 +512 @@
                 m_pageinput[2] = ' ';
             }
 
+            PageUpdated(m_curpage, m_cursubpage);
             break;
 
         case TTKey::kNextPage:
@@ -911 +912 @@
     hold = false;
     endbox = false;
     startbox = false;
+    uint flof_link_count = 0;
 
     if (row == 1)
     {
@@ -942 +944 @@
                 fgcolor = ch & 7;
                 mosaic = false;
                 conceal = false;
+                // increment FLOF/FastText count if menu item detected
+                flof_link_count += (row == 25) ? 1 : 0;
                 goto ctrl;
             case 0x08: // flash
                 // XXX
@@ -1008 +1012 @@
                 break;
         }
 
+        // Hide FastText/FLOF menu characters if not available
+        if (flof_link_count && (flof_link_count <= 6))
+        {
+            const TeletextSubPage *ttpage =
+                FindSubPage(m_curpage, m_cursubpage);
+
+            if (ttpage)
+            {
+                bool has_flof = ttpage->floflink[flof_link_count - 1];
+                ch = (has_flof) ? ch : ' ';
+            }
+        }
+
         newfgcolor = fgcolor;
         newbgcolor = bgcolor;