Ticket #8954: subtitle_stretch.3.diff

mythtv/libs/libmythtv/subtitlescreen.cpp

@@ -16 +16 @@
 static MythFontProperties* gTextSubFont;
 static QHash<int, MythFontProperties*> gCC708Fonts;
 
-SubtitleScreen::SubtitleScreen(MythPlayer *player, const char * name) :
+SubtitleScreen::SubtitleScreen(MythPlayer *player, const char * name,
+                               int fontStretch) :
     MythScreenType((MythScreenType*)NULL, name),
     m_player(player),  m_subreader(NULL),   m_608reader(NULL),
     m_708reader(NULL), m_safeArea(QRect()), m_useBackground(false),
     m_removeHTML(QRegExp("</?.+>")),        m_subtitleType(kDisplayNone),
-    m_textFontZoom(100),                    m_refreshArea(false)
+    m_textFontZoom(100),                    m_refreshArea(false),
+    m_fontStretch(fontStretch)
 {
     m_708fontSizes[0] = 36;
     m_708fontSizes[1] = 45;
@@ -297 +299 @@
 
 void SubtitleScreen::DisplayTextSubtitles(void)
 {
-    if (!InitialiseFont() || !m_player || !m_subreader)
+    if (!InitialiseFont(m_fontStretch) || !m_player || !m_subreader)
         return;
 
     bool changed = false;
@@ -374 +376 @@
 
 void SubtitleScreen::DisplayRawTextSubtitles(void)
 {
-    if (!InitialiseFont() || !m_player || !m_subreader)
+    if (!InitialiseFont(m_fontStretch) || !m_player || !m_subreader)
         return;
 
     uint64_t duration;
@@ -465 +467 @@
                 m_expireTimes.insert(shape, start + duration);
         }
         MythUIText* text = new MythUIText(subtitle, *gTextSubFont, rect,
-                                rect, this,QString("tsub%1%2").arg(x).arg(y));
+                                rect, this, QString("tsub%1%2").arg(x).arg(y));
         if (text)
             text->SetJustification(Qt::AlignCenter);
         y += height;
@@ -552 +554 @@
         Qt::blue,    Qt::magenta, Qt::cyan,  Qt::white,
     };
 
-    if (!InitialiseFont() || !m_608reader)
+    if (!InitialiseFont(m_fontStretch) || !m_608reader)
         return;
 
     bool changed = false;
@@ -655 +657 @@
         return;
     }
 
-    if (!Initialise708Fonts())
+    if (!Initialise708Fonts(m_fontStretch))
         return;
 
     for (uint i = 0; i < 8; i++)
@@ -906 +908 @@
     }
 }
 
-bool SubtitleScreen::InitialiseFont(void)
+bool SubtitleScreen::InitialiseFont(int fontStretch)
 {
     static bool initialised = false;
     QString font = gCoreContext->GetSetting("OSDSubFont", "FreeSans");
@@ -921 +923 @@
     if (mythfont)
     {
         QFont newfont(font);
+        newfont.setStretch(fontStretch);
         font.detach();
         mythfont->SetFace(newfont);
         gTextSubFont = mythfont;
@@ -934 +937 @@
     return true;
 }
 
-bool SubtitleScreen::Initialise708Fonts(void)
+bool SubtitleScreen::Initialise708Fonts(int fontStretch)
 {
     static bool initialised = false;
     if (initialised)
@@ -962 +965 @@
         if (mythfont)
         {
             QFont newfont(font);
+            newfont.setStretch(fontStretch);
             font.detach();
             mythfont->SetFace(newfont);
             gCC708Fonts.insert(count, mythfont);

mythtv/libs/libmythtv/subtitlescreen.h

@@ -1 +1 @@
 #ifndef SUBTITLESCREEN_H
 #define SUBTITLESCREEN_H
 
+#include <QFont>
+
 #include "mythscreentype.h"
 #include "subtitlereader.h"
 #include "mythplayer.h"
 
 class SubtitleScreen : public MythScreenType
 {
-    static bool InitialiseFont(void);
-    static bool Initialise708Fonts(void);
+    static bool InitialiseFont(int fontStretch = QFont::Unstretched);
+    static bool Initialise708Fonts(int fontStretch = QFont::Unstretched);
 
   public:
-    SubtitleScreen(MythPlayer *player, const char * name);
+    SubtitleScreen(MythPlayer *player, const char * name, int fontStretch);
     virtual ~SubtitleScreen();
 
     void EnableSubtitles(int type);
@@ -55 +57 @@
     int                m_textFontZoom;
     bool               m_refreshArea;
     QHash<int,QList<MythUIType*> > m_708imageCache;
+    int                m_fontStretch;
 };
 
 #endif // SUBTITLESCREEN_H

mythtv/libs/libmythtv/teletextscreen.cpp

@@ -39 +39 @@
     return ch;
 }
 
-TeletextScreen::TeletextScreen(MythPlayer *player, const char * name) :
+TeletextScreen::TeletextScreen(MythPlayer *player, const char * name,
+                               int fontStretch) :
     MythScreenType((MythScreenType*)NULL, name),
     m_player(player),           m_safeArea(QRect()),
     m_colSize(10),              m_rowSize(10),
@@ -49 +50 @@
     m_curpage_showheader(true), m_curpage_issubtitle(false),
     m_transparent(false),       m_revealHidden(false),
     m_displaying(false),        m_header_changed(false),
-    m_page_changed(false)
+    m_page_changed(false),      m_fontStretch(fontStretch)
 {
     memset(m_pageinput, 0, sizeof(m_pageinput));
     memset(m_header,    0, sizeof(m_header));
@@ -158 +159 @@
 
 void TeletextScreen::Pulse(void)
 {
-    if (!InitialiseFont() || !m_displaying)
+    if (!InitialiseFont(m_fontStretch) || !m_displaying)
         return;
 
     if (m_player && m_player->getVideoOutput())
@@ -1239 +1240 @@
     return res;
 }
 
-bool TeletextScreen::InitialiseFont(void)
+bool TeletextScreen::InitialiseFont(int fontStretch)
 {
     static bool initialised = false;
     QString font = gCoreContext->GetSetting("OSDSubFont", "FreeSans");
@@ -1255 +1256 @@
     {
         QFont newfont(font);
         font.detach();
+        newfont.setStretch(fontStretch);
         mythfont->SetFace(newfont);
         gTTFont = mythfont;
     }

mythtv/libs/libmythtv/teletextscreen.h

@@ -1 +1 @@
 #ifndef TELETEXTSCREEN_H
 #define TELETEXTSCREEN_H
 
+#include <QFont>
+
 #include "mythscreentype.h"
 #include "teletextdecoder.h"
 #include "mythplayer.h"
@@ -90 +92 @@
 
 class TeletextScreen: public MythScreenType, public TeletextViewer
 {
-    static bool  InitialiseFont(void);
+    static bool  InitialiseFont(int fontStretch = QFont::Unstretched);
 
   public:
-    TeletextScreen(MythPlayer *player, const char * name);
+    TeletextScreen(MythPlayer *player, const char * name, int fontStretch);
     virtual ~TeletextScreen();
 
     // MythScreenType methods
@@ -169 +171 @@
     TeletextMagazine m_magazines[8];
     unsigned char    m_bitswap[256];
     QHash<int, QImage*> m_rowImages;
+    int          m_fontStretch;
 
   public:
     static const QColor kColorBlack;

mythtv/libs/libmythtv/osd.cpp

@@ -956 +956 @@
     else
     {
         OverrideUIScale();
-        tt = new TeletextScreen(m_parent, OSD_WIN_TELETEXT);
+        tt = new TeletextScreen(m_parent, OSD_WIN_TELETEXT, m_fontStretch);
         if (tt)
         {
             if (tt->Create())
@@ -1061 +1061 @@
     else
     {
         OverrideUIScale();
-        sub = new SubtitleScreen(m_parent, OSD_WIN_SUBTITLE);
+        sub = new SubtitleScreen(m_parent, OSD_WIN_SUBTITLE, m_fontStretch);
         if (sub)
         {
             if (sub->Create())