MythPlayer: Move test display mode into MythPlayerCaptionsUI

- and a little renaming
MythTV · Oct 30, 2020 · c2f2f1d · c2f2f1d
1 parent c5d0f71
commit c2f2f1d
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 13 deletions.
diff --git a/mythtv/libs/libmythtv/mythplayer.h b/mythtv/libs/libmythtv/mythplayer.h
@@ -469,11 +469,6 @@ class MTV_PUBLIC MythPlayer : public QObject
     QTime    m_bufferingStart;
     QTime    m_bufferingLastMsg;
 
-    // General Caption/Teletext/Subtitle support
-    uint     m_textDisplayMode            {kDisplayNone};
-    uint     m_prevTextDisplayMode        {kDisplayNone};
-    uint     m_prevNonzeroTextDisplayMode {kDisplayNone};
-
     // Support for analog captions and teletext
     // (i.e. Vertical Blanking Interval (VBI) encoded data.)
     uint     m_vbiMode                    {VBIMode::None}; ///< VBI decoder to use

diff --git a/mythtv/libs/libmythtv/mythplayercaptionsui.cpp b/mythtv/libs/libmythtv/mythplayercaptionsui.cpp
@@ -118,7 +118,7 @@ static uint toTrackType(uint Type)
 void MythPlayerCaptionsUI::DisableCaptions(uint Mode, bool UpdateOSD)
 {
     if (m_textDisplayMode)
-        m_prevNonzeroTextDisplayMode = m_textDisplayMode;
+        m_lastValidTextDisplayMode = m_textDisplayMode;
     m_textDisplayMode &= ~Mode;
     ResetCaptions();
 
@@ -219,7 +219,7 @@ void MythPlayerCaptionsUI::EnableCaptions(uint Mode, bool UpdateOSD)
 
     m_textDisplayMode = Mode;
     if (m_textDisplayMode)
-        m_prevNonzeroTextDisplayMode = m_textDisplayMode;
+        m_lastValidTextDisplayMode = m_textDisplayMode;
     if (UpdateOSD)
         UpdateOSDMessage(msg, kOSDTimeout_Med);
 }
@@ -276,8 +276,8 @@ void MythPlayerCaptionsUI::SetCaptionsEnabled(bool Enable, bool UpdateOSD)
         DisableCaptions(origMode, UpdateOSD);
         return;
     }
-    uint mode = HasCaptionTrack(m_prevNonzeroTextDisplayMode) ?
-        m_prevNonzeroTextDisplayMode : NextCaptionTrack(kDisplayNone);
+    uint mode = HasCaptionTrack(m_lastValidTextDisplayMode) ?
+        m_lastValidTextDisplayMode : NextCaptionTrack(kDisplayNone);
     if (origMode != mode)
     {
         DisableCaptions(origMode, false);
@@ -482,7 +482,7 @@ void MythPlayerCaptionsUI::EnableTeletext(int Page)
 {
     QMutexLocker locker(&m_osdLock);
     m_captionsOverlay.EnableTeletext(true, Page);
-    m_prevTextDisplayMode = m_textDisplayMode;
+    m_lastTextDisplayMode = m_textDisplayMode;
     m_textDisplayMode = kDisplayTeletextMenu;
 }
 
@@ -493,8 +493,8 @@ void MythPlayerCaptionsUI::DisableTeletext()
     m_textDisplayMode = kDisplayNone;
 
     // If subtitles were enabled before the teletext menu was displayed then re-enable them
-    if (m_prevTextDisplayMode & kDisplayAllCaptions)
-        EnableCaptions(m_prevTextDisplayMode, false);
+    if (m_lastTextDisplayMode & kDisplayAllCaptions)
+        EnableCaptions(m_lastTextDisplayMode, false);
 }
 
 void MythPlayerCaptionsUI::ResetTeletext()

diff --git a/mythtv/libs/libmythtv/mythplayercaptionsui.h b/mythtv/libs/libmythtv/mythplayercaptionsui.h
@@ -67,7 +67,10 @@ class MTV_PUBLIC MythPlayerCaptionsUI : public MythPlayerAudioUI
 
     MythCaptionsOverlay m_captionsOverlay;
     MythCaptionsState m_captionsState { };
-    InteractiveTV *m_interactiveTV { nullptr };
+    uint m_textDisplayMode            { kDisplayNone };
+    uint m_lastTextDisplayMode        { kDisplayNone };
+    uint m_lastValidTextDisplayMode   { kDisplayNone };
+    InteractiveTV *m_interactiveTV    { nullptr };
     QMutex m_itvLock    { };
     bool m_itvEnabled   { false };
     bool m_itvVisible   { false };