Ticket #10161: lazystrings_v4.patch

mythtv/libs/libmythui/mythuibuttonlist.cpp

@@ -2852 +2852 @@
                                            const QString &text, const QString &image,
                                            bool checkable, CheckState state,
                                            bool showArrow, int listPosition)
+    : m_strings(this), m_states(this)
 {
     if (!lbtype)
         LOG(VB_GENERAL, LOG_ERR, "Cannot add a button to a non-existent list!");
@@ -2875 +2876 @@
 MythUIButtonListItem::MythUIButtonListItem(MythUIButtonList *lbtype,
                                            const QString &text,
                                            QVariant data, int listPosition)
+    : m_strings(this), m_states(this)
 {
     if (!lbtype)
         LOG(VB_GENERAL, LOG_ERR, "Cannot add a button to a non-existent list!");
@@ -2951 +2953 @@
     m_strings = stringMap;
 }
 
-QString MythUIButtonListItem::GetText(const QString &name) const
+QString MythUIButtonListItem::GetText(const QString &name)
 {
     if (name.isEmpty())
         return m_text;
@@ -2962 +2964 @@
 }
 
 bool MythUIButtonListItem::FindText(const QString &searchStr, const QString &fieldList,
-                                    bool startsWith) const
+                                    bool startsWith)
 {
     if (fieldList.isEmpty())
     {
@@ -2984 +2986 @@
                 return true;
         }
 
-        QMap<QString, TextProperties>::const_iterator i = m_strings.constBegin();
+        QMap<QString, TextProperties>::const_iterator i = m_strings.begin();
 
-        while (i != m_strings.constEnd())
+        while (i != m_strings.end())
         {
             if (startsWith)
             {
@@ -3503 +3505 @@
     if (m_searchState)
         m_searchState->DisplayState(found ? "found" : "notfound");
 }
+
+void TextPropertiesWrapper::FillIn(void)
+{
+    if (pbb)
+    {
+        PlaybackBox *oldPbb = pbb;
+        pbb = 0;
+        func(oldPbb, progInfo, str, parent);
+        progInfo = 0;
+        func = 0;
+    }
+}
+
+void QStringWrapper::FillIn(void)
+{
+    if (pbb)
+    {
+        PlaybackBox *oldPbb = pbb;
+        pbb = 0;
+        func(oldPbb, progInfo, parent);
+        progInfo = 0;
+        func = 0;
+    }
+}

mythtv/libs/libmythui/mythuibuttonlist.h

@@ -14 +14 @@
 
 class MythUIButtonList;
 class MythUIStateType;
+class ProgramInfo;
+class PlaybackBox;
 
 struct TextProperties {
     QString text;
     QString state;
 };
 
+typedef void (*DeferredFillInStringsFunc)(PlaybackBox *, ProgramInfo *,
+                                          QString &, MythUIButtonListItem *);
+// TextPropertiesWrapper is a wrapper around a
+// QMap<QString,TextProperties> object such that initialization of
+// MythUIButtonListItem::m_strings can be deferred until the next
+// access to the object.
+class TextPropertiesWrapper {
+public:
+    TextPropertiesWrapper(MythUIButtonListItem *p)
+        : parent(p), pbb(0), progInfo(0), func(0) {}
+    void SetDeferredMap(PlaybackBox *pb, ProgramInfo *pi,
+                        QString &s, DeferredFillInStringsFunc f) {
+        pbb = pb;
+        progInfo = pi;
+        str = s;
+        func = f;
+    }
+    QMap<QString, TextProperties>::iterator begin(void) {
+        FillIn();
+        return map.begin();
+    }
+    void clear(void) {
+        FillIn();
+        map.clear();
+    }
+    bool contains(const QString &key) {
+        FillIn();
+        return map.contains(key);
+    }
+    QMap<QString, TextProperties>::iterator end(void) {
+        FillIn();
+        return map.end();
+    }
+    QMap<QString, TextProperties>::iterator insert(const QString &key, const TextProperties &value) {
+        FillIn();
+        return map.insert(key, value);
+    }
+    const TextProperties value(const QString &key) {
+        FillIn();
+        return map.value(key);
+    }
+    TextProperties &operator[](const QString &key) {
+        FillIn();
+        return map[key];
+    }
+    TextPropertiesWrapper &operator=(const QMap<QString, TextProperties> &other) {
+        FillIn();
+        map = other;
+        return *this;
+    }
+private:
+    void FillIn(void);
+    MythUIButtonListItem *parent;
+    PlaybackBox *pbb;
+    ProgramInfo *progInfo;
+    QString str;
+    DeferredFillInStringsFunc func;
+    QMap<QString, TextProperties> map;
+};
+
+typedef void (*DeferredFillInStatesFunc)(PlaybackBox *, ProgramInfo *, MythUIButtonListItem *);
+class QStringWrapper {
+public:
+    QStringWrapper(MythUIButtonListItem *p)
+        : parent(p), pbb(0), progInfo(0), func(0) {}
+    void SetDeferredMap(PlaybackBox *pb, ProgramInfo *pi,
+                        DeferredFillInStatesFunc f) {
+        pbb = pb;
+        progInfo = pi;
+        func = f;
+    }
+    QMap<QString, QString>::iterator begin(void) {
+        FillIn();
+        return map.begin();
+    }
+    QMap<QString, QString>::iterator find(const QString &key) {
+        FillIn();
+        return map.find(key);
+    }
+    QMap<QString, QString>::iterator end(void) {
+        FillIn();
+        return map.end();
+    }
+    QMap<QString, QString>::iterator insert(const QString &key, const QString &value) {
+        FillIn();
+        return map.insert(key, value);
+    }
+private:
+    void FillIn(void);
+    MythUIButtonListItem *parent;
+    PlaybackBox *pbb;
+    ProgramInfo *progInfo;
+    DeferredFillInStatesFunc func;
+    QMap<QString, QString> map;
+};
+
 class MUI_PUBLIC MythUIButtonListItem
 {
   public:
@@ -44 +142 @@
                  const QString &state="");
     void SetTextFromMap(InfoMap &infoMap, const QString &state="");
     void SetTextFromMap(QMap<QString, TextProperties> &stringMap);
-    QString GetText(const QString &name="") const;
+    void SetStringsDeferred(PlaybackBox *pb, ProgramInfo *pi,
+                            QString &s, DeferredFillInStringsFunc f) {
+        m_strings.SetDeferredMap(pb, pi, s, f);
+    }
+    void SetStatesDeferred(PlaybackBox *pb, ProgramInfo *pi,
+                           DeferredFillInStatesFunc f) {
+        m_states.SetDeferredMap(pb, pi, f);
+    }
+    QString GetText(const QString &name="");
 
     bool FindText(const QString &searchStr, const QString &fieldList = "**ALL**",
-                  bool startsWith = false) const;
+                  bool startsWith = false);
 
     void SetFontState(const QString &state, const QString &name="");
 
@@ -95 +201 @@
     QVariant        m_data;
     bool            m_showArrow;
 
-    QMap<QString, TextProperties> m_strings;
+    TextPropertiesWrapper m_strings;
     QMap<QString, MythImage*> m_images;
     QMap<QString, QString> m_imageFilenames;
-    QMap<QString, QString> m_states;
+    QStringWrapper m_states;
 
     friend class MythUIButtonList;
     friend class MythGenericTree;

mythtv/programs/mythfrontend/main.cpp

@@ -467 +467 @@
 
 static void startPlaybackWithGroup(QString recGroup = "")
 {
+    LOG(VB_GENERAL, LOG_INFO, QString("LZY startPlaybackWithGroup begin"));
     MythScreenStack *mainStack = GetMythMainWindow()->GetMainStack();
 
     PlaybackBox *pbb = new PlaybackBox(
@@ -481 +482 @@
     }
     else
         delete pbb;
+    LOG(VB_GENERAL, LOG_INFO, QString("LZY startPlaybackWithGroup end"));
 }
 
 static void startPlayback(void)

mythtv/programs/mythfrontend/playbackbox.cpp

@@ -499 +499 @@
 
 bool PlaybackBox::Create()
 {
+    LOG(VB_GENERAL, LOG_INFO, QString("LZY LoadWindowFromXML begin"));
     if (m_type == kDeleteBox &&
             LoadWindowFromXML("recordings-ui.xml", "deleterecordings", this))
         LOG(VB_GENERAL, LOG_DEBUG,
@@ -506 +507 @@
     else
         if (!LoadWindowFromXML("recordings-ui.xml", "watchrecordings", this))
             return false;
+    LOG(VB_GENERAL, LOG_INFO, QString("LZY LoadWindowFromXML end"));
 
     m_recgroupList  = dynamic_cast<MythUIButtonList *> (GetChild("recgroups"));
     m_groupList     = dynamic_cast<MythUIButtonList *> (GetChild("groups"));
@@ -1210 +1212 @@
 
 void PlaybackBox::UpdateUIGroupList(const QStringList &groupPreferences)
 {
+    LOG(VB_GENERAL, LOG_INFO, QString("LZY UpdateUIGroupList begin"));
     m_groupList->Reset();
 
     if (!m_titleList.isEmpty())
@@ -1250 +1253 @@
         if (!sel_idx)
             updateRecList(m_groupList->GetItemCurrent());
     }
+    LOG(VB_GENERAL, LOG_INFO, QString("LZY UpdateUIGroupList end"));
 }
 
 void PlaybackBox::updateRecList(MythUIButtonListItem *sel_item)
@@ -1259 +1263 @@
 
     QString groupname = sel_item->GetData().toString();
     QString grouplabel = sel_item->GetText();
+    LOG(VB_GENERAL, LOG_INFO, QString("LZY updateRecList begin groupname=%1").arg(groupname));
 
     updateGroupInfo(groupname, grouplabel);
 
@@ -1279 +1284 @@
 
     ProgramList &progList = *pmit;
 
-    QMap<AudioProps, QString> audioFlags;
-    audioFlags[AUD_DOLBY] = "dolby";
-    audioFlags[AUD_SURROUND] = "surround";
-    audioFlags[AUD_STEREO] = "stereo";
-    audioFlags[AUD_MONO] = "mono";
-
-    QMap<VideoProps, QString> videoFlags;
-    videoFlags[VID_1080] = "hd1080";
-    videoFlags[VID_720] = "hd720";
-    videoFlags[VID_HDTV] = "hdtv";
-    videoFlags[VID_WIDESCREEN] = "widescreen";
-
-    QMap<SubtitleTypes, QString> subtitleFlags;
-    subtitleFlags[SUB_SIGNED] = "deafsigned";
-    subtitleFlags[SUB_ONSCREEN] = "onscreensub";
-    subtitleFlags[SUB_NORMAL] = "subtitles";
-    subtitleFlags[SUB_HARDHEAR] = "cc";
-
     ProgramList::iterator it = progList.begin();
+    int itemcount = 0;
     for (; it != progList.end(); ++it)
     {
         if ((*it)->GetAvailableStatus() == asPendingDelete ||
@@ -1307 +1295 @@
         MythUIButtonListItem *item =
             new PlaybackBoxListItem(this, m_recordingList, *it);
 
-        QString state = extract_main_state(**it, m_player);
-
-        item->SetFontState(state);
+        item->SetStringsDeferred(this, *it, groupname, DeferredFillInStrings);
+        item->SetStatesDeferred(this, *it, DeferredFillInStates);
 
-        InfoMap infoMap;
-        (*it)->ToMap(infoMap);
-        item->SetTextFromMap(infoMap);
-
-        QString tempSubTitle  = extract_subtitle(**it, groupname);
-
-        if (groupname == (*it)->GetTitle().toLower())
-            item->SetText(tempSubTitle,       "titlesubtitle");
-
-        item->DisplayState(state, "status");
-
-        item->DisplayState(QString::number((*it)->GetStars(10)), "ratingstate");
-
-        SetItemIcons(item, (*it));
-
-        QMap<AudioProps, QString>::iterator ait;
-        for (ait = audioFlags.begin(); ait != audioFlags.end(); ++ait)
-        {
-            if ((*it)->GetAudioProperties() & ait.key())
-                item->DisplayState(ait.value(), "audioprops");
-        }
-
-        QMap<VideoProps, QString>::iterator vit;
-        for (vit = videoFlags.begin(); vit != videoFlags.end(); ++vit)
-        {
-            if ((*it)->GetVideoProperties() & vit.key())
-                item->DisplayState(vit.value(), "videoprops");
-        }
-
-        QMap<SubtitleTypes, QString>::iterator sit;
-        for (sit = subtitleFlags.begin(); sit != subtitleFlags.end(); ++sit)
-        {
-            if ((*it)->GetSubtitleType() & sit.key())
-                item->DisplayState(sit.value(), "subtitletypes");
-        }
+        ++itemcount;
     }
+    LOG(VB_GENERAL, LOG_INFO, QString("LZY item creation count = %1").arg(itemcount));
 
     if (m_noRecordingsText)
     {
@@ -1361 +1315 @@
             m_noRecordingsText->SetVisible(true);
         }
     }
+    LOG(VB_GENERAL, LOG_INFO, QString("LZY updateRecList end"));
 }
 
 static bool save_position(
@@ -1499 +1454 @@
 
 bool PlaybackBox::UpdateUILists(void)
 {
+    LOG(VB_GENERAL, LOG_INFO, QString("LZY UpdateUILists() m_recGroup=%1 begin").arg(m_recGroup));
     m_isFilling = true;
 
     // Save selection, including next few items & groups
@@ -1546 +1502 @@
     QMap<int, QString> searchRule;
     QMap<int, int> recidEpisodes;
 
+    LOG(VB_GENERAL, LOG_INFO, QString("LZY m_programInfoCache.Refresh() begin"));
     m_programInfoCache.Refresh();
+    LOG(VB_GENERAL, LOG_INFO, QString("LZY m_programInfoCache.Refresh() end"));
 
     if (!m_programInfoCache.empty())
     {
@@ -2082 +2040 @@
 
     m_isFilling = false;
 
+    LOG(VB_GENERAL, LOG_INFO, QString("LZY UpdateUILists() end"));
     return true;
 }
 
@@ -4847 +4806 @@
     m_recGroupPwCache[m_recGroup] = newPassword;
 }
 
+void PlaybackBox::DeferredFillInStrings(PlaybackBox *pbb, ProgramInfo *pi,
+                                        QString &groupname, MythUIButtonListItem *item)
+{
+    QString state = extract_main_state(*pi, pbb->m_player);
+
+    item->SetFontState(state);
+
+    InfoMap infoMap;
+    pi->ToMap(infoMap);
+    item->SetTextFromMap(infoMap);
+
+    QString tempSubTitle  = extract_subtitle(*pi, groupname);
+
+    if (groupname == pi->GetTitle().toLower())
+        item->SetText(tempSubTitle,       "titlesubtitle");
+}
+
+void PlaybackBox::DeferredFillInStates(PlaybackBox *pbb, ProgramInfo *pi,
+                                       MythUIButtonListItem *item)
+{
+    QMap<AudioProps, QString> audioFlags;
+    audioFlags[AUD_DOLBY] = "dolby";
+    audioFlags[AUD_SURROUND] = "surround";
+    audioFlags[AUD_STEREO] = "stereo";
+    audioFlags[AUD_MONO] = "mono";
+
+    QMap<VideoProps, QString> videoFlags;
+    videoFlags[VID_1080] = "hd1080";
+    videoFlags[VID_720] = "hd720";
+    videoFlags[VID_HDTV] = "hdtv";
+    videoFlags[VID_WIDESCREEN] = "widescreen";
+
+    QMap<SubtitleTypes, QString> subtitleFlags;
+    subtitleFlags[SUB_SIGNED] = "deafsigned";
+    subtitleFlags[SUB_ONSCREEN] = "onscreensub";
+    subtitleFlags[SUB_NORMAL] = "subtitles";
+    subtitleFlags[SUB_HARDHEAR] = "cc";
+
+        QString state = extract_main_state(*pi, pbb->m_player);
+
+        item->DisplayState(state, "status");
+
+        item->DisplayState(QString::number(pi->GetStars(10)), "ratingstate");
+
+        pbb->SetItemIcons(item, pi);
+
+        QMap<AudioProps, QString>::iterator ait;
+        for (ait = audioFlags.begin(); ait != audioFlags.end(); ++ait)
+        {
+            if (pi->GetAudioProperties() & ait.key())
+                item->DisplayState(ait.value(), "audioprops");
+        }
+
+        QMap<VideoProps, QString>::iterator vit;
+        for (vit = videoFlags.begin(); vit != videoFlags.end(); ++vit)
+        {
+            if (pi->GetVideoProperties() & vit.key())
+                item->DisplayState(vit.value(), "videoprops");
+        }
+
+        QMap<SubtitleTypes, QString>::iterator sit;
+        for (sit = subtitleFlags.begin(); sit != subtitleFlags.end(); ++sit)
+        {
+            if (pi->GetSubtitleType() & sit.key())
+                item->DisplayState(sit.value(), "subtitletypes");
+        }
+        item->DisplayState(state, "status");
+}
+
 ///////////////////////////////////////////////////
 
 GroupSelector::GroupSelector(MythScreenStack *lparent, const QString &label,

mythtv/programs/mythfrontend/playbackbox.h

@@ -441 +441 @@
     PlaybackBoxHelper   m_helper;
     /// Outstanding preview image requests
     QSet<QString>       m_preview_tokens;
+
+    static void DeferredFillInStrings(PlaybackBox *pbb, ProgramInfo *pi,
+                                      QString &groupname, MythUIButtonListItem *item);
+    static void DeferredFillInStates(PlaybackBox *pbb, ProgramInfo *pi,
+                                     MythUIButtonListItem *item);
 };
 
 class GroupSelector : public MythScreenType