Ticket #4116: 4116-fixes-v1.patch

libs/libmythtv/osdtypes.cpp

@@ -658 +658 @@
 
 OSDTypeText::OSDTypeText(const QString &name, TTFFont *font, 
                          const QString &text, QRect displayrect,
-                         float wmult, float hmult)
-           : OSDType(name)
-{
-    m_message = text;
-    m_default_msg = text;
-    m_font = font;
+                         float wmult, float hmult) :
+    OSDType(name),
+    m_lock(true),
+    m_displaysize(displayrect),
+    m_screensize(displayrect),
+    m_unbiasedsize(unbias(m_screensize, wmult, hmult)),
+    m_message(QDeepCopy<QString>(text)),
+    m_default_msg(QDeepCopy<QString>(text)),
 
-    m_altfont = NULL;
-    
-    m_displaysize = displayrect;
-    m_screensize = displayrect;
-    m_multiline = false;
-    m_centered = false;
-    m_right = false;
-    m_usingalt = false;
+    m_font(font),
+    m_altfont(NULL),
 
-    m_selected  = false;
-    m_button    = false;
-    m_entrynum  = -1;
-    m_cursorpos = 0;
+    m_centered(false),
+    m_right(false),
 
-    m_scroller = false;
-    m_scrollx = m_scrolly = 0;
-    m_scrollinit = false;
+    m_multiline(false),
+    m_usingalt(false),
 
-    m_linespacing = 1.5;
+    m_selected(false),
+    m_button(false),
+    m_entrynum(-1),
+    m_cursorpos(0),
 
-    m_unbiasedsize = unbias(m_screensize, wmult, hmult);
+    m_scroller(false),
+    m_scrollx(0),
+    m_scrolly(0),
 
-    m_draw_info_str = "";
-    m_draw_info_len = 0;
+    m_scrollinit(false),
+
+    m_linespacing(1.5f),
+
+    m_draw_info_str(""),
+    m_draw_info_len(0)
+{
 }
 
-OSDTypeText::OSDTypeText(const OSDTypeText &other)
-           : OSDType(other.m_name)
+OSDTypeText::OSDTypeText(const OSDTypeText &other) :
+    OSDType(other.m_name),
+    m_draw_info_str(""),
+    m_draw_info_len(0)
 {
-    m_message = other.m_message;
-    m_default_msg = other.m_default_msg;
+    QMutexLocker locker(&other.m_lock);
+
+    m_displaysize = other.m_displaysize;
+    m_screensize = other.m_screensize;
+    m_unbiasedsize = other.m_unbiasedsize;
+
+    m_message = QDeepCopy<QString>(other.m_message);
+    m_default_msg = QDeepCopy<QString>(other.m_default_msg);
+
     m_font = other.m_font;
-
     m_altfont = other.m_altfont;
 
-    m_displaysize = other.m_displaysize;
-    m_screensize = other.m_screensize; 
-    m_multiline = other.m_multiline;
     m_centered = other.m_centered;
     m_right = other.m_right;
-    m_usingalt = other.m_usingalt; 
-   
-    m_selected = other.m_selected; 
-    m_button   = other.m_button; 
-    m_entrynum = other.m_entrynum; 
-    m_cursorpos = other.m_cursorpos; 
- 
+
+    m_multiline = other.m_multiline;
+    m_usingalt = other.m_usingalt;
+
+    m_selected = other.m_selected;
+    m_button   = other.m_button;
+    m_entrynum = other.m_entrynum;
+    m_cursorpos = other.m_cursorpos;
+
     m_scroller = other.m_scroller;
     m_scrollx = other.m_scrollx;
     m_scrolly = other.m_scrolly;
+
     m_scrollinit = other.m_scrollinit;
 
     m_linespacing = other.m_linespacing;
-
-    m_unbiasedsize = other.m_unbiasedsize;
-
-    m_draw_info_str = "";
-    m_draw_info_len = 0;
 }
 
 OSDTypeText::~OSDTypeText()
@@ -731 +737 @@
 
 void OSDTypeText::SetAltFont(TTFFont *font)
 {
+    QMutexLocker locker(&m_lock);
     m_altfont = font;
 }
 
 void OSDTypeText::SetText(const QString &text)
 {
-    m_message = text;
+    QMutexLocker locker(&m_lock);
+    m_message = QDeepCopy<QString>(text);
     m_cursorpos = text.length();
     m_scrollinit = false;
 }
 
+QString OSDTypeText::GetText(void) const
+{
+    QMutexLocker locker(&m_lock);
+    return QDeepCopy<QString>(m_message);
+}
+
 void OSDTypeText::SetDefaultText(const QString &text)
 {
-    m_message = text;
-    m_default_msg = text;
+    QMutexLocker locker(&m_lock);
+    m_message = QDeepCopy<QString>(text);
+    m_default_msg = QDeepCopy<QString>(text);
     m_scrollinit = false;
 }
+  
+QString OSDTypeText::GetDefaultText(void) const
+{
+    QMutexLocker locker(&m_lock);
+    return QDeepCopy<QString>(m_default_msg);
+}
 
+void OSDTypeText::SetMultiLine(bool multi)
+{
+    QMutexLocker locker(&m_lock);
+    m_multiline = multi;
+}
+
+void OSDTypeText::SetCentered(bool docenter)
+{
+    QMutexLocker locker(&m_lock);
+    m_centered = docenter;
+}
+
+void OSDTypeText::SetRightJustified(bool right)
+{
+    QMutexLocker locker(&m_lock);
+    m_right = right;
+}
+
+void OSDTypeText::SetScrolling(int x, int y)
+{
+    QMutexLocker locker(&m_lock);
+    m_scroller = true;
+    m_scrollx = x;
+    m_scrolly = y;
+}
+
+void OSDTypeText::SetLineSpacing(float linespacing)
+{
+    QMutexLocker locker(&m_lock);
+    m_linespacing = linespacing;
+}
+
 void OSDTypeText::Reinit(float wmult, float hmult)
 {
+    QMutexLocker locker(&m_lock);
     m_displaysize = m_screensize = bias(m_unbiasedsize, wmult, hmult);
 }
 
 void OSDTypeText::Draw(OSDSurface *surface, int fade, int maxfade, int xoff, 
                        int yoff)
 {
+    QMutexLocker locker(&m_lock);
+
+    // initialize regular expressions once, this is a very slow operation
+    static QMutex regexp_lock;
+    static QRegExp br("%BR%");
+    static QRegExp nl("\n");
+
     int textlength = 0;
 
     if (m_message == QString::null)
@@ -773 +834 @@
 
     if (m_multiline)
     {
-        QString tmp_msg = m_message;
-        tmp_msg.replace(QRegExp("%BR%"), "\n");
-        tmp_msg.replace(QRegExp("\n")," \n ");
+        QString tmp_msg = QDeepCopy<QString>(m_message);
+        regexp_lock.lock();
+        tmp_msg.replace(br, "\n");
+        tmp_msg.replace(nl," \n ");
+        regexp_lock.unlock();
 
         QStringList wordlist = QStringList::split(" ", tmp_msg);
         int length = 0;
@@ -902 +965 @@
                                    const QString &text, int fade, int maxfade, 
                                    int xoff, int yoff, bool double_size)
 {
+    QMutexLocker locker(&m_lock);
+
     if (m_draw_info_str != text)
     {
         m_draw_info_str = QDeepCopy<QString>(text);
@@ -1015 +1080 @@
                              const QString &text, int fade, int maxfade, 
                              int xoff, int yoff, bool doubl)
 {
+    QMutexLocker locker(&m_lock);
+
     if (m_centered || m_right)
     {
         int textlength = 0;
@@ -1067 +1134 @@
 
 bool OSDTypeText::MoveCursor(int dir)
 {
+    QMutexLocker locker(&m_lock);
+
     if (!IsEntry() || IsButton())
         return false;
 
@@ -1077 +1146 @@
 
 bool OSDTypeText::Delete(int dir)
 {
+    QMutexLocker locker(&m_lock);
+
     if (!IsEntry() || IsButton())
         return false;
 
@@ -1099 +1170 @@
 
 void OSDTypeText::InsertCharacter(QChar ch)
 {
+    QMutexLocker locker(&m_lock);
+
     if (!IsEntry() || IsButton())
         return;
 

libs/libmythtv/osdtypes.h

@@ -202 +202 @@
     void SetUseAlt(bool usealt) { m_usingalt = usealt; }
 
     void SetText(const QString &text);
-    QString GetText() { return m_message; }
+    QString GetText(void) const;
 
     void SetDefaultText(const QString &text);
-    QString GetDefaultText() { return m_default_msg; }
+    QString GetDefaultText(void) const;
 
-    void SetMultiLine(bool multi) { m_multiline = multi; }
-    bool GetMultiLine() { return m_multiline; }
+    void SetMultiLine(bool multi);
+    bool GetMultiLine(void) const { return m_multiline; }
 
-    void SetCentered(bool docenter) { m_centered = docenter; }
-    bool GetCentered() { return m_centered; }
+    void SetCentered(bool docenter);
+    bool GetCentered(void) const { return m_centered; }
 
-    void SetRightJustified(bool right) { m_right = right; }
-    bool GetRightJustified() { return m_right; }
+    void SetRightJustified(bool right);
+    bool GetRightJustified(void) const { return m_right; }
 
-    void SetScrolling(int x, int y) { m_scroller = true; m_scrollx = x;
-                                      m_scrolly = y; }
+    void SetScrolling(int x, int y);
 
-    void SetLineSpacing(float linespacing) { m_linespacing = linespacing; }
-    float GetLineSpacing() { return m_linespacing; }
+    void SetLineSpacing(float linespacing);
+    float GetLineSpacing(void) const { return m_linespacing; }
 
     void Draw(OSDSurface *surface, int fade, int maxfade, int xoff, int yoff);
     bool MoveCursor(int dir);
@@ -245 +244 @@
                           const QString &text, int fade, int maxfade, 
                           int xoff, int yoff, bool double_size = false);
 
+    mutable QMutex m_lock;
+
     QRect m_displaysize;
     QRect m_screensize;
     QRect m_unbiasedsize;