Subtitles: Fix state calculation in EnableCaptions/DisableCaptions.

26f6437 was too aggressive in
assuming that EnableCaptions would actually enable text subtitles, and
DisableCaptions would actually disable text subtitles.  They only
enable/disable a particular type of subtitles (which may have already
been enabled/disabled), so we need to check the overall state after
the operation is performed.

(cherry picked from commit 0925cc0)

Author: stichnot

mythtv/libs/libmythtv/mythplayer.cpp

@@ -1377,7 +1377,7 @@ void MythPlayer::DisableCaptions(uint mode, bool osd_msg)
 
     QMutexLocker locker(&osdLock);
 
-    textDesired = false;
+    textDesired = textDisplayMode & kDisplayAllTextCaptions;
     QString msg = "";
     if (kDisplayNUVTeletextCaptions & mode)
         msg += tr("TXT CAP");
@@ -1414,7 +1414,7 @@ void MythPlayer::DisableCaptions(uint mode, bool osd_msg)
 void MythPlayer::EnableCaptions(uint mode, bool osd_msg)
 {
     QMutexLocker locker(&osdLock);
-    textDesired = true;
+    textDesired = mode & kDisplayAllTextCaptions;
     QString msg = "";
     if ((kDisplayCC608 & mode) || (kDisplayCC708 & mode) ||
         (kDisplayAVSubtitle & mode) || kDisplayRawTextSubtitle & mode)

mythtv/libs/libmythtv/mythplayer.h

@@ -77,6 +77,9 @@ enum
     kDisplayRawTextSubtitle     = 0x080,
     kDisplayAllCaptions         = 0x0FF,
     kDisplayTeletextMenu        = 0x100,
+    kDisplayAllTextCaptions     = ~kDisplayDVDButton &
+                                  ~kDisplayAVSubtitle &
+                                   kDisplayAllCaptions,
 };
 
 enum PlayerFlags