Ticket #7776: black-background-2.patch

libs/libmythtv/osdtypes.cpp

@@ -2600 +2600 @@
 }
 
 OSDType708CC::OSDType708CC(const QString &name, TTFFont *fonts[48],
-                           int xoff, int yoff, int dispw, int disph) : 
+                          int xoff, int yoff, int dispw, int disph,
+                          float wmult, float hmult) : 
     OSDType(name)
 {
     xoffset = xoff;
@@ -2610 +2611 @@
 
     for (uint i = 0; i < 48; i++)
         m_fonts[i] = fonts[i];
+
+    QRect rect = QRect(0, 0, 0, 0);
+    m_box = new OSDTypeBox("cc_background", rect, wmult, hmult);
+    m_ccbackground = gContext->GetNumSetting("CCBackground", 0);
 }
 
 QRect OSDType708CC::CalcBounds(const OSDSurface *surface,
@@ -2745 +2750 @@
 
             font->CalcWidth(list[i]->str, &text_length);
 
-            font->setColor(list[i]->attr.GetFGColor(), kTTF_Normal);
-
             font->setOutline(false);
             font->setShadow(0,0);
-            if (list[i]->attr.edge_type == 3/*kEdgeUniform*/)
+
+            if (m_ccbackground)
             {
-                font->setColor(list[i]->attr.GetEdgeColor(), kTTF_Outline);
-                font->setOutline(true);
+                QRect rect = QRect(0, 0, text_length + 1, 
+                                   (font->Size() * 3 / 2) + 1);
+                m_box->SetRect(rect, m_wmult, m_hmult);
+                m_box->Draw(surface, 0, 0, ul.x() + tot_width - 2,
+                                           ul.y() + total_height - 2);
+                font->setColor(QColor(255, 255, 255), kTTF_Normal);
+            } else {
+                font->setColor(list[i]->attr.GetFGColor(), kTTF_Normal);
+                if (list[i]->attr.edge_type == 3/*kEdgeUniform*/)
+                {
+                    font->setColor(list[i]->attr.GetEdgeColor(), kTTF_Outline);
+                    font->setOutline(true);
+                }
+                else if (list[i]->attr.edge_type == 4/*kEdgeLeftShadow*/)
+                {
+                    font->setColor(list[i]->attr.GetEdgeColor(), kTTF_Shadow);
+                    font->setShadow(-2, +2);
+                }
+                else if (list[i]->attr.edge_type == 5/*kEdgeRightShadow*/)
+                {
+                    font->setColor(list[i]->attr.GetEdgeColor(), kTTF_Shadow);
+                    font->setShadow(+2, +2);
+                }
             }
-            else if (list[i]->attr.edge_type == 4/*kEdgeLeftShadow*/)
-            {
-                font->setColor(list[i]->attr.GetEdgeColor(), kTTF_Shadow);
-                font->setShadow(-2, +2);
-            }
-            else if (list[i]->attr.edge_type == 5/*kEdgeRightShadow*/)
-            {
-                font->setColor(list[i]->attr.GetEdgeColor(), kTTF_Shadow);
-                font->setShadow(+2, +2);
-            }
 
             font->DrawString(surface,
                              ul.x() + tot_width, ul.y() + total_height + 2,

libs/libmythtv/osdtypes.h

@@ -604 +604 @@
 {
   public:
     OSDType708CC(const QString &name, TTFFont *fonts[48],
-                 int xoff, int yoff, int dispw, int disph);
+                 int xoff, int yoff, int dispw, int disph,
+                 float wmult, float hmult);
     virtual ~OSDType708CC() {}
 
     void Reinit(float, float) {}
@@ -625 +626 @@
 
     TTFFont *m_fonts[48];
 
+    OSDTypeBox *m_box;
+    int m_ccbackground;
+    float m_wmult, m_hmult;
     int xoffset, yoffset, displaywidth, displayheight;
 };
 

libs/libmythtv/osd.cpp

@@ -325 +325 @@
     AddSet(container, name);
     OSDType708CC *ccpage = 
         new OSDType708CC(name, ccfonts, xoffset, yoffset, 
-                         displaywidth, displayheight);
+                         displaywidth, displayheight, wmult, hmult);
     container->AddType(ccpage);
 
     VERBOSE(VB_VBI, LOC + "InitCC708() -- end");

programs/mythfrontend/globalsettings.cpp

@@ -1950 +1950 @@
 static HostCheckBox *CCBackground()
 {
     HostCheckBox *gc = new HostCheckBox("CCBackground");
-    gc->setLabel(QObject::tr("Black background for analog closed captioning"));
+    gc->setLabel(QObject::tr("Black background for closed captioning"));
     gc->setValue(false);
     gc->setHelpText(QObject::tr(
-                        "If enabled, analog captions will be displayed "
+                        "If enabled, captions will be displayed "
                         "over a black space for maximum contrast. Otherwise, "
                         "captions will use outlined text over the picture."));
     return gc;