Ticket #10161: lazystrings_v13a.patch

mythtv/libs/libmythui/mythuibuttonlist.cpp

@@ -86 +86 @@
 
     m_buttontemplate = NULL;
 
+    m_nextItemInited = 0;
+
     SetCanTakeFocus(true);
 
     connect(this, SIGNAL(TakingFocus()), this, SLOT(Select()));
@@ -153 +155 @@
     m_topPosition = 0;
     m_itemCount   = 0;
 
+    StopInit();
     Update();
     MythUIType::Reset();
 }
@@ -2476 +2479 @@
     return handled;
 }
 
+class NextButtonListPageEvent : public QEvent
+{
+  public:
+    NextButtonListPageEvent(int start, int pageSize) :
+        QEvent(kEventType), m_start(start), m_pageSize(pageSize) {}
+    const int m_start;
+    const int m_pageSize;
+    static Type kEventType;
+};
+
+QEvent::Type NextButtonListPageEvent::kEventType =
+    (QEvent::Type) QEvent::registerEventType();
+
+void MythUIButtonList::customEvent(QEvent *event)
+{
+    if (event->type() == NextButtonListPageEvent::kEventType)
+    {
+        NextButtonListPageEvent *npe =
+            dynamic_cast<NextButtonListPageEvent*>(event);
+        int cur = npe->m_start;
+        for (; cur < npe->m_start + npe->m_pageSize && cur < GetCount(); ++cur)
+        {
+            const int loginterval = (cur < 1000 ? 100 : 500);
+            if (cur % loginterval == 0)
+                LOG(VB_GENERAL, LOG_INFO,
+                    QString("Build background buttonlist item %1").arg(cur));
+            emit itemInited(GetItemAt(cur));
+        }
+        m_nextItemInited = cur;
+        if (cur < GetCount())
+            StartInit(cur, npe->m_pageSize);
+    }
+}
+
+void MythUIButtonList::StartInit(int start, int pageSize)
+{
+    m_nextItemInited = start;
+    QCoreApplication::
+        postEvent(this, new NextButtonListPageEvent(start, pageSize));
+}
+
+int MythUIButtonList::StopInit(void)
+{
+    QCoreApplication::
+        removePostedEvents(this, NextButtonListPageEvent::kEventType);
+    return m_nextItemInited;
+}
+
 QPoint MythUIButtonList::GetButtonPosition(int column, int row) const
 {
     int x = m_contentsRect.x() +

mythtv/libs/libmythui/mythuibuttonlist.h

@@ -128 +128 @@
 
     virtual bool keyPressEvent(QKeyEvent *);
     virtual bool gestureEvent(MythGestureEvent *event);
+    virtual void customEvent(QEvent *);
 
     enum MovementUnit { MoveItem, MoveColumn, MoveRow, MovePage, MoveMax,
                         MoveMid, MoveByAmount };
@@ -184 +185 @@
     bool FindNext(void);
     bool FindPrev(void);
 
+    void StartInit(int start = 0, int pageSize = 20);
+    int  StopInit(void);
+
   public slots:
     void Select();
     void Deselect();
@@ -192 +196 @@
     void itemSelected(MythUIButtonListItem* item);
     void itemClicked(MythUIButtonListItem* item);
     void itemVisible(MythUIButtonListItem* item);
+    void itemInited(MythUIButtonListItem* item);
 
   protected:
     enum ScrollStyle { ScrollFree, ScrollCenter, ScrollGroupCenter };
@@ -302 +307 @@
     bool m_keepSelAtBottom;
 
     QList<MythUIButtonListItem*> m_itemList;
+    int m_nextItemInited;
 
     bool m_drawFromBottom;
 

mythtv/programs/mythfrontend/playbackbox.cpp

@@ -542 +542 @@
             SLOT(PlayFromBookmark(MythUIButtonListItem*)));
     connect(m_recordingList, SIGNAL(itemVisible(MythUIButtonListItem*)),
             SLOT(ItemVisible(MythUIButtonListItem*)));
+    connect(m_recordingList, SIGNAL(itemInited(MythUIButtonListItem*)),
+            SLOT(ItemInited(MythUIButtonListItem*)));
 
     // connect up timers...
     connect(m_artTimer[kArtworkFanart],   SIGNAL(timeout()), SLOT(fanartLoad()));
@@ -890 +892 @@
     }
 }
 
+void PlaybackBox::ItemInited(MythUIButtonListItem *item)
+{
+    ProgramInfo *pginfo = qVariantValue<ProgramInfo*>(item->GetData());
+    if (item->GetText("is_item_initialized").isNull())
+    {
+        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 groupname =
+            m_groupList->GetItemCurrent()->GetData().toString();
+
+        QString state = extract_main_state(*pginfo, m_player);
+
+        item->SetFontState(state);
+
+        InfoMap infoMap;
+        pginfo->ToMap(infoMap);
+        item->SetTextFromMap(infoMap);
+
+        QString tempSubTitle  = extract_subtitle(*pginfo, groupname);
+
+        if (groupname == pginfo->GetTitle().toLower())
+            item->SetText(tempSubTitle, "titlesubtitle");
+
+        item->DisplayState(state, "status");
+
+        item->DisplayState(QString::number(pginfo->GetStars(10)),
+                           "ratingstate");
+
+        SetItemIcons(item, pginfo);
+
+        QMap<AudioProps, QString>::iterator ait;
+        for (ait = audioFlags.begin(); ait != audioFlags.end(); ++ait)
+        {
+            if (pginfo->GetAudioProperties() & ait.key())
+                item->DisplayState(ait.value(), "audioprops");
+        }
+
+        QMap<VideoProps, QString>::iterator vit;
+        for (vit = videoFlags.begin(); vit != videoFlags.end(); ++vit)
+        {
+            if (pginfo->GetVideoProperties() & vit.key())
+                item->DisplayState(vit.value(), "videoprops");
+        }
+
+        QMap<SubtitleTypes, QString>::iterator sit;
+        for (sit = subtitleFlags.begin(); sit != subtitleFlags.end(); ++sit)
+        {
+            if (pginfo->GetSubtitleType() & sit.key())
+                item->DisplayState(sit.value(), "subtitletypes");
+        }
+
+        item->DisplayState(pginfo->GetCategoryType(), "categorytype");
+
+        // Mark this button list item as initialized.
+        item->SetText("yes", "is_item_initialized");
+    }
+
+}
+
 void PlaybackBox::ItemVisible(MythUIButtonListItem *item)
 {
     ProgramInfo *pginfo = qVariantValue<ProgramInfo*>(item->GetData());
 
+    ItemInited(item);
     // Job status (recording, transcoding, flagging)
     QString job = extract_job_state(*pginfo);
     item->DisplayState(job, "jobstate");
@@ -1316 +1394 @@
 
     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();
     for (; it != progList.end(); ++it)
     {
@@ -1341 +1401 @@
             (*it)->GetAvailableStatus() == asDeleted)
             continue;
 
-        MythUIButtonListItem *item =
-            new PlaybackBoxListItem(this, m_recordingList, *it);
-
-        QString state = extract_main_state(**it, m_player);
-
-        item->SetFontState(state);
-
-        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");
-        }
-
-        item->DisplayState((*it)->GetCategoryType(), "categorytype");
+        new PlaybackBoxListItem(this, m_recordingList, *it);
     }
+    m_recordingList->StartInit();
 
     if (m_noRecordingsText)
     {
@@ -2418 +2436 @@
     ProgramInfo tvrec(rec);
 
     m_playingSomething = true;
+    int initIndex = m_recordingList->StopInit();
 
     uint flags =
         (inPlaylist          ? kStartTVInPlayList       : kStartTVNoFlags) |
@@ -2427 +2446 @@
     playCompleted = TV::StartTV(&tvrec, flags);
 
     m_playingSomething = false;
+    m_recordingList->StartInit(initIndex);
 
     if (inPlaylist && !m_playListPlay.empty())
     {

mythtv/programs/mythfrontend/playbackbox.h

@@ -142 +142 @@
     void ItemSelected(MythUIButtonListItem *item)
         { UpdateUIListItem(item, true); }
     void ItemVisible(MythUIButtonListItem *item);
+    void ItemInited(MythUIButtonListItem *item);
     void selected(MythUIButtonListItem *item);
     void PlayFromBookmark(MythUIButtonListItem *item = NULL);
     void PlayFromBeginning(MythUIButtonListItem *item = NULL);

mythtv/programs/mythfrontend/proglist.cpp

@@ -44 +44 @@
     m_viewTextList(),
 
     m_itemList(),
+    m_itemListSave(),
     m_schedList(),
 
     m_typeList(),
@@ -93 +94 @@
     m_viewTextList(),
 
     m_itemList(),
+    m_itemListSave(),
     m_schedList(),
 
     m_typeList(),
@@ -115 +117 @@
 ProgLister::~ProgLister()
 {
     m_itemList.clear();
+    m_itemListSave.clear();
     gCoreContext->removeListener(this);
 }
 
@@ -139 +142 @@
     connect(m_progList, SIGNAL(itemSelected(MythUIButtonListItem*)),
             this,       SLOT(  HandleSelected(  MythUIButtonListItem*)));
 
+    connect(m_progList, SIGNAL(itemVisible(MythUIButtonListItem*)),
+            this,       SLOT(  HandleVisible(  MythUIButtonListItem*)));
+
+    connect(m_progList, SIGNAL(itemInited(MythUIButtonListItem*)),
+            this,       SLOT(  HandleVisible(  MythUIButtonListItem*)));
+
     connect(m_progList, SIGNAL(itemClicked(MythUIButtonListItem*)),
             this,       SLOT(  HandleClicked()));
 
@@ -1342 +1351 @@
         selectedP = &selected;
     }
 
+    // Save a copy of m_itemList so that deletion of the ProgramInfo
+    // objects can be deferred until background processing of old
+    // ProgramInfo objects has completed.
+    m_itemListSave.clear();
+    m_itemListSave = m_itemList;
+    m_itemList.setAutoDelete(false);
     m_itemList.clear();
+    m_itemList.setAutoDelete(true);
 
     if (m_type == plPreviouslyRecorded)
     {
@@ -1489 +1505 @@
     m_progList->SetItemCurrent(i + 1, i + 1 - selectedOffset);
 }
 
-void ProgLister::UpdateButtonList(void)
+void ProgLister::HandleVisible(MythUIButtonListItem *item)
 {
-    ProgramList::const_iterator it = m_itemList.begin();
-    for (; it != m_itemList.end(); ++it)
-    {
-        MythUIButtonListItem *item =
-            new MythUIButtonListItem(
-                m_progList, "", qVariantFromValue(*it));
+    ProgramInfo *pginfo = qVariantValue<ProgramInfo*>(item->GetData());
 
+    if (item->GetText("is_item_initialized").isNull())
+    {
         InfoMap infoMap;
-        (**it).ToMap(infoMap);
+        pginfo->ToMap(infoMap);
 
-        QString state = toUIState((**it).GetRecordingStatus());
+        QString state = toUIState(pginfo->GetRecordingStatus());
         if ((state == "warning") && (plPreviouslyRecorded == m_type))
             state = "disabled";
 
@@ -1509 +1522 @@
 
         if (m_type == plTitle)
         {
-            QString tempSubTitle = (**it).GetSubtitle();
+            QString tempSubTitle = pginfo->GetSubtitle();
             if (tempSubTitle.trimmed().isEmpty())
-                tempSubTitle = (**it).GetTitle();
+                tempSubTitle = pginfo->GetTitle();
             item->SetText(tempSubTitle, "titlesubtitle", state);
         }
 
-        item->DisplayState(
-            QString::number((**it).GetStars(10)), "ratingstate");
+        item->DisplayState(QString::number(pginfo->GetStars(10)),
+                           "ratingstate");
 
         item->DisplayState(state, "status");
+
+        // Mark this button list item as initialized.
+        item->SetText("yes", "is_item_initialized");
     }
+}
+
+void ProgLister::UpdateButtonList(void)
+{
+    ProgramList::const_iterator it = m_itemList.begin();
+    for (; it != m_itemList.end(); ++it)
+        new MythUIButtonListItem(m_progList, "", qVariantFromValue(*it));
+    m_progList->StartInit();
 
     if (m_positionText)
     {

mythtv/programs/mythfrontend/proglist.h

@@ -50 +50 @@
 
   protected slots:
     void HandleSelected(MythUIButtonListItem *item);
+    void HandleVisible(MythUIButtonListItem *item);
     void HandleClicked(void);
 
     void DeleteOldEpisode(bool ok);
@@ -115 +116 @@
     QStringList       m_viewTextList;
 
     ProgramList       m_itemList;
+    ProgramList       m_itemListSave;
     ProgramList       m_schedList;
 
     QStringList       m_typeList;