Ticket #8950: 8950-v1.patch

libs/libmythtv/tv_play.h

@@ -804 +804 @@
     QRect saved_gui_bounds;
     /// true if this instance disabled MythUI drawing.
     bool  weDisabledGUI;
+    /// true if video chromakey and frame should not be drawn
+    bool  disableDrawUnusedRects;
 
     // embedded status
     bool         isEmbedded;       ///< are we currently embedded

libs/libmythtv/tv_play.cpp

@@ -919 +919 @@
       lcdTitle(""), lcdSubtitle(""), lcdCallsign(""),
       // Window info (GUI is optional, transcoding, preview img, etc)
       myWindow(NULL),               weDisabledGUI(false),
+      disableDrawUnusedRects(false),
       isEmbedded(false),            ignoreKeyPresses(false),
       // Timers
       lcdTimerId(0),                keyListTimerId(0),
@@ -3415 +3416 @@
         case QEvent::Enter:
         {
             event(e);
-            return true;
+            return false;
         }
         default:
             return false;
@@ -7729 +7730 @@
 
 void TV::DrawUnusedRects(void)
 {
-    if (!weDisabledGUI)
+    if (disableDrawUnusedRects)
         return;
 
     VERBOSE(VB_PLAYBACK, LOC + "DrawUnusedRects() -- begin");
@@ -7885 +7886 @@
         }
     }
 
+    // If the video is paused, don't paint it's unused rects & chromakey
+    disableDrawUnusedRects = pause_active;
+
     // We are embedding in a mythui window so assuming no one
     // else has disabled painting show the MythUI window again.
     if (GetMythMainWindow() && weDisabledGUI)
@@ -8615 +8619 @@
         }
 
         DoSetPauseState(actx, saved_pause); // Restore pause states
+        disableDrawUnusedRects = false;
 
         GetMythMainWindow()->GetPaintWindow()->hide();
         GetMythMainWindow()->GetPaintWindow()->clearMask();

libs/libmythtv/videoout_xv.cpp

@@ -2586 +2586 @@
         return;
     }
 
-    // This is used to avoid drawing the colorkey when embedding and
-    // not using overlay. This is needed because we don't paint this
-    // in the vertical retrace period when calling this from the EPG.
-    bool clrdraw = xv_colorkey || !window.IsEmbedding();
-
-    if (xv_draw_colorkey && window.IsRepaintNeeded() && clrdraw)
+    if (xv_draw_colorkey && window.IsRepaintNeeded())
     {
         disp->SetForeground(xv_colorkey);
         disp->FillRectangle(XJ_curwin,
@@ -2600 +2595 @@
                        display_visible_rect.width(),
                        display_visible_rect.height() - 2 * boboff));
     }
-    else if (xv_draw_colorkey && xv_need_bobdeint_repaint && clrdraw)
+    else if (xv_draw_colorkey && xv_need_bobdeint_repaint)
     {
         // if this is only for deinterlacing mode switching, draw
         // the border areas, presumably the main image is undamaged.