Teletext: Clear teletext captions when skipping etc.

Closes #9763
MythTV · Oct 3, 2011 · 71301ed · 71301ed
1 parent 998288d
commit 71301ed
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 5 deletions.
diff --git a/mythtv/libs/libmythtv/mythplayer.cpp b/mythtv/libs/libmythtv/mythplayer.cpp
@@ -1304,6 +1304,11 @@ void MythPlayer::ResetCaptions(void)
     {
         osd->ClearSubtitles();
     }
+    else if ((textDisplayMode & kDisplayTeletextCaptions) ||
+             (textDisplayMode & kDisplayNUVTeletextCaptions))
+    {
+        osd->TeletextClear();
+    }
 }
 
 void MythPlayer::DisableCaptions(uint mode, bool osd_msg)

diff --git a/mythtv/libs/libmythtv/osd.cpp b/mythtv/libs/libmythtv/osd.cpp
@@ -1074,6 +1074,16 @@ void OSD::TeletextReset(void)
         tt->Reset();
 }
 
+void OSD::TeletextClear(void)
+{
+    if (!HasWindow(OSD_WIN_TELETEXT))
+        return;
+
+    TeletextScreen* tt = (TeletextScreen*)m_Children.value(OSD_WIN_TELETEXT);
+    if (tt)
+        tt->ClearScreen();
+}
+
 SubtitleScreen* OSD::InitSubtitles(void)
 {
     SubtitleScreen *sub = NULL;

diff --git a/mythtv/libs/libmythtv/osd.h b/mythtv/libs/libmythtv/osd.h
@@ -174,6 +174,7 @@ class OSD
     void EnableTeletext(bool enable, int page);
     bool TeletextAction(const QString &action);
     void TeletextReset(void);
+    void TeletextClear(void);
 
     SubtitleScreen* InitSubtitles(void);
     void EnableSubtitles(int type);

diff --git a/mythtv/libs/libmythtv/teletextscreen.cpp b/mythtv/libs/libmythtv/teletextscreen.cpp
@@ -52,7 +52,7 @@ TeletextScreen::TeletextScreen(MythPlayer *player, const char * name,
 
 TeletextScreen::~TeletextScreen()
 {
-    CleanUp();
+    ClearScreen();
 }
 
 bool TeletextScreen::Create(void)
@@ -62,7 +62,7 @@ bool TeletextScreen::Create(void)
     return m_player && m_teletextReader;
 }
 
-void TeletextScreen::CleanUp(void)
+void TeletextScreen::ClearScreen(void)
 {
     DeleteAllChildren();
     for (int i = 0; i < m_rowImages.size(); i++)
@@ -191,7 +191,7 @@ void TeletextScreen::Pulse(void)
     if (!m_teletextReader->PageChanged())
         return;
 
-    CleanUp();
+    ClearScreen();
 
     const TeletextSubPage *ttpage = m_teletextReader->FindSubPage();
 
@@ -247,7 +247,7 @@ void TeletextScreen::SetDisplaying(bool display)
 {
     m_displaying = display;
     if (!m_displaying)
-        CleanUp();
+        ClearScreen();
 }
 
 void TeletextScreen::Reset(void)

diff --git a/mythtv/libs/libmythtv/teletextscreen.h b/mythtv/libs/libmythtv/teletextscreen.h
@@ -24,9 +24,9 @@ class TeletextScreen: public MythScreenType
     void SetPage(int page, int subpage);
     void SetDisplaying(bool display);
     void Reset(void);
+    void ClearScreen(void);
 
   private:
-    void CleanUp();
     void OptimiseDisplayedArea(void);
     QImage* GetRowImage(int row, QRect &rect);
     void SetForegroundColor(int color);