Ticket #3797: pillarbars.3.diff

File pillarbars.3.diff, 2.5 KB (added by Juppers, 13 years ago)

Updated for latest SVN.

  • libs/libmythtv/videoout_xv.h

     
    219219    int                  XJ_screenwidth;
    220220    int                  XJ_screenheight;
    221221    bool                 XJ_started;
     222    Colormap             cmap;
     223    XColor               color, colorrgb;
    222224
    223225    // Used for all non-XvMC drawing
    224226    VideoFrame           av_pause_frame;
  • libs/libmythtv/videoout_xv.cpp

     
    31853185    needrepaint = false;
    31863186    xv_need_bobdeint_repaint = false;
    31873187
    3188     // Draw black in masked areas
    3189     XSetForeground(XJ_disp, XJ_gc, XJ_black);
     3188    // Set the masked area to black unless Gray Pillarbars was selected
     3189    cmap = DefaultColormap (XJ_disp, XJ_screen_num);
     3190    int db_graypillars       = gContext->GetNumSetting("GrayPillars",     0);
     3191    if (db_graypillars == 1)
     3192    {
     3193        XAllocNamedColor (XJ_disp, cmap, "gray25", &color, &colorrgb);
     3194    }
     3195    else
     3196    {
     3197        XAllocNamedColor (XJ_disp, cmap, "gray0", &color, &colorrgb);
     3198    }
    31903199
     3200    // Draw black or gray in masked areas
     3201    XSetForeground(XJ_disp, XJ_gc, color.pixel);
     3202
    31913203    if (display_video_rect.left() > display_visible_rect.left())
    31923204    { // left
    31933205        XFillRectangle(XJ_disp, XJ_curwin, XJ_gc,
  • programs/mythfrontend/globalsettings.cpp

     
    20982098    return gc;
    20992099}
    21002100
     2101static HostCheckBox *GrayPillars()
     2102{
     2103    HostCheckBox *gc = new HostCheckBox("GrayPillars");
     2104    gc->setLabel(QObject::tr("Make pillarboxes gray"));
     2105    gc->setValue(true);
     2106    gc->setHelpText(QObject::tr("If enabled, Pillarboxes will be gray instead of black. "
     2107                    "Useful for people with screens subject to burn-in."));
     2108    return gc;
     2109}
     2110
    21012111static HostComboBox *AspectOverride()
    21022112{
    21032113    HostComboBox *gc = new HostComboBox("AspectOverride");
     
    43794389    oscan->addChild(ocol2);
    43804390
    43814391    general2->addChild(oscan);
     4392    general2->addChild(GrayPillars());
    43824393    general2->addChild(AspectOverride());
    43834394    general2->addChild(AdjustFill());
    43844395    general2->addChild(PIPLocationComboBox());