Ticket #3797: pillarbars.2.diff

libs/libmythtv/videoout_xv.h

@@ -186 +186 @@
     int                  XJ_screenwidth;
     int                  XJ_screenheight;
     bool                 XJ_started;
+    Colormap             cmap;
+    XColor               color, colorrgb;
 
     // Used for all non-XvMC drawing
     VideoFrame           av_pause_frame;

libs/libmythtv/videoout_xv.cpp

@@ -2559 +2559 @@
     needrepaint = false;
     xv_need_bobdeint_repaint = false;
 
-    // Draw black in masked areas
-    XSetForeground(XJ_disp, XJ_gc, XJ_black);
+    // Set the masked area to black unless Gray Pillarbars was selected
+    cmap = DefaultColormap (XJ_disp, XJ_screen_num);
+    int db_graypillars       = gContext->GetNumSetting("GrayPillars",     0);
+    if (db_graypillars == 1)
+    {
+        XAllocNamedColor (XJ_disp, cmap, "gray25", &color, &colorrgb);
+    }
+    else 
+    {
+        XAllocNamedColor (XJ_disp, cmap, "gray0", &color, &colorrgb);
+    }
 
+    // Draw black or gray in masked areas
+    XSetForeground(XJ_disp, XJ_gc, color.pixel); 
+
     if (display_video_rect.left() > display_visible_rect.left())
     { // left
         XFillRectangle(XJ_disp, XJ_curwin, XJ_gc,

programs/mythfrontend/globalsettings.cpp

@@ -1539 +1539 @@
     return gc;
 }
 
+static HostCheckBox *GrayPillars()
+{
+    HostCheckBox *gc = new HostCheckBox("GrayPillars");
+    gc->setLabel(QObject::tr("Make pillarboxes gray"));
+    gc->setValue(true);
+    gc->setHelpText(QObject::tr("If enabled, Pillarboxes will be gray instead of black. "
+                    "Useful for people with screens subject to burn-in."));
+    return gc;
+}
+
 static HostComboBox *AspectOverride()
 {
     HostComboBox *gc = new HostComboBox("AspectOverride");
@@ -3617 +3627 @@
     general->addChild(RealtimePriority());
     general->addChild(UseVideoTimebase());
     general->addChild(DecodeExtraAudio());
+    general->addChild(GrayPillars());
     general->addChild(AspectOverride());
     general->addChild(PIPLocation());
     addChild(general);