Ticket #1899: 1899-v2.patch

libs/libmythtv/osdtypeteletext.h

@@ -15 +15 @@
 
 #include "osdtypes.h"
 #include "teletextdecoder.h"
+#include "osd.h"
 
 class TTFFont;
 class OSDType;
@@ -107 +108 @@
     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() {}
@@ -184 +185 @@
 
     bool         m_displaying;
 
+    OSD          *m_osd;
+
     TeletextMagazine m_magazines[8];
     unsigned char    bitswap[256];
 

libs/libmythtv/osd.h

@@ -154 +154 @@
 
     void SetTextSubtitles(const QStringList&);
     void ClearTextSubtitles(void);
+
+    void SurfaceLock(void) { osdlock.lock(); };
+    void SurfaceUnlock(void) { osdlock.unlock(); };
  private:
     bool InitDefaults(void);
     bool InitCC608(void);

libs/libmythtv/osdtypeteletext.cpp

@@ -47 +47 @@
 
 /*****************************************************************************/
 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),
@@ -65 +66 @@
       m_curpage_showheader(true),       m_curpage_issubtitle(false),
 
       m_transparent(false),             m_revealHidden(false),
-      m_displaying(false)
+      m_displaying(false),              m_osd(osd)
 {
     m_unbiasedrect  = bias(m_displayrect, wmult, hmult);
 
@@ -184 +185 @@
     else 
     {
         memcpy(ttpage->data[0]+0, buf, 40);
-        memset(ttpage->data[0]+40, ' ', sizeof(ttpage->data)-40);
     }
+
+    memset(ttpage->data[0]+40, ' ', sizeof(ttpage->data)-40);           // once a page has been updated and displayed the
+                                                                        // data it contains should be erased for all VBI types
+                                                                        // (prior only erase if not VBI_DVB/VBI_DVB_SUBTITLE
     
     if ( !(ttpage->flags & TP_INTERRUPTED_SEQ)) 
         HeaderUpdated(ttpage->data[0],ttpage->lang);
@@ -316 +320 @@
 
     if (m_surface != NULL)
     {
+        m_osd->SurfaceLock();
         m_surface->SetChanged(true);
         m_surface->ClearUsed();
         DrawPage();
+        m_osd->SurfaceUnlock();
     }
 }
 
@@ -341 +347 @@
         return;
 
     if (m_surface != NULL)
+    {
+        m_osd->SurfaceLock();
         DrawHeader(page, lang);
+        m_osd->SurfaceUnlock();
+    }
 }
 
 /** \fn OSDTypeTeletext::FindPage(int, int)

libs/libmythtv/osd.cpp

@@ -269 +269 @@
     }
 
     OSDTypeTeletext *ttpage = new OSDTypeTeletext(
-        name, font, area, wmult, hmult);
+        name, font, area, wmult, hmult, this);
   
     container->AddType(ttpage);
     return true;