Ticket #10161: lazystrings_v11.patch

mythtv/programs/mythfrontend/playbackbox.cpp

@@ -890 +890 @@
     }
 }
 
+void PlaybackBox::ItemVisibleCore(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());
 
+    ItemVisibleCore(item);
     // Job status (recording, transcoding, flagging)
     QString job = extract_job_state(*pginfo);
     item->DisplayState(job, "jobstate");
@@ -1316 +1390 @@
 
     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 +1397 @@
             (*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_helper.ComputeButtonListPage(0);
 
     if (m_noRecordingsText)
     {
@@ -3845 +3859 @@
         if (resultid == "transcode" && dce->GetResult() >= 0)
             changeProfileAndTranscode(dce->GetData().toInt());
     }
+    else if (event->type() == NextButtonListPageEvent::kEventType)
+    {
+        // Lazily compute a "page" of the next 20 button list items
+        // before the next screen refresh.  The value 20 is chosen to
+        // be large enough that the background computation finishes
+        // reasonably quickly, while small enough that it doesn't
+        // noticeably affect scrolling/paging UI responsiveness.
+        const int pageSize = 20;
+        NextButtonListPageEvent *pue =
+            dynamic_cast<NextButtonListPageEvent*>(event);
+        if (m_recordingList)
+        {
+            int start = pue->getStart();
+            while (start < pue->getStart() + pageSize &&
+                   start < m_recordingList->GetCount())
+            {
+                ItemVisibleCore(m_recordingList->GetItemAt(start));
+                ++start;
+            }
+            if (start < m_recordingList->GetCount())
+                m_helper.ComputeButtonListPage(start, pue->getGeneration());
+        }
+    }
     else if ((MythEvent::Type)(event->type()) == MythEvent::MythEventMessage)
     {
         MythEvent *me = (MythEvent *)event;

mythtv/programs/mythfrontend/playbackbox.h

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

mythtv/programs/mythfrontend/playbackboxhelper.cpp

@@ -126 +126 @@
     return availableStatus;
 }
 
+QEvent::Type NextButtonListPageEvent::kEventType =
+    (QEvent::Type) QEvent::registerEventType();
+
 bool PBHEventHandler::event(QEvent *e)
 {
     if (e->type() == QEvent::Timer)
@@ -301 +304 @@
 
             return true;
         }
+        else if (me->Message() == "BUTTONLIST_NEXT_PAGE")
+        {
+            int current = me->ExtraData(0).toInt();
+            int generation = me->ExtraData(1).toInt();
+            QCoreApplication::postEvent(
+                m_pbh.m_listener,
+                new NextButtonListPageEvent(current, generation));
+        }
     }
 
     return QObject::event(e);
@@ -320 +331 @@
     MThread("PlaybackBoxHelper"),
     m_listener(listener), m_eventHandler(new PBHEventHandler(*this)),
     // Free Space Tracking Variables
-    m_freeSpaceTotalMB(0ULL), m_freeSpaceUsedMB(0ULL)
+    m_freeSpaceTotalMB(0ULL), m_freeSpaceUsedMB(0ULL),
+    m_buttonListItemCurrent(0), m_buttonListGeneration(0)
 {
     start();
     m_eventHandler->moveToThread(qthread());
@@ -479 +491 @@
 
     return token;
 }
+
+void PlaybackBoxHelper::ComputeButtonListPage(int start, int generation)
+{
+    // If a specific generation is requested, only honor it if someone
+    // else hasn't already reset the search and updated the current
+    // generation.
+    {
+        QMutexLocker locker(&m_lock);
+        if (generation >= 0 && generation != m_buttonListGeneration)
+            return;
+        // Restart any work in progress
+        if (start == 0)
+            generation = ++m_buttonListGeneration;
+    }
+    LOG(VB_GENERAL, LOG_INFO,
+        QString("Background buttonlist building: start=%1 gen=%2")
+        .arg(start).arg(generation));
+    QStringList extraData;
+    extraData += QString::number(start);
+    extraData += QString::number(generation);
+    QCoreApplication::postEvent(m_eventHandler,
+                                new MythEvent("BUTTONLIST_NEXT_PAGE",
+                                              extraData));
+}

mythtv/programs/mythfrontend/playbackboxhelper.h

@@ -53 +53 @@
     uint64_t GetFreeSpaceTotalMB(void) const;
     uint64_t GetFreeSpaceUsedMB(void) const;
 
+    void ComputeButtonListPage(int start, int generation = -1);
+
   private:
     void UpdateFreeSpace(void);
 
@@ -67 +69 @@
 
     // Artwork Variables //////////////////////////////////////////////////////
     QHash<QString, QString>    m_artworkFilenameCache;
+
+    // Background button list loading
+    int m_buttonListItemCurrent;
+    int m_buttonListGeneration;
+};
+
+class NextButtonListPageEvent : public QEvent
+{
+  public:
+    NextButtonListPageEvent(int start, int generation) :
+        QEvent(kEventType), m_start(start), m_generation(generation) {}
+
+    int getStart()      { return m_start; }
+    int getGeneration() { return m_generation; }
+
+    static Type kEventType;
+
+  private:
+    int m_start;
+    int m_generation;
 };
 
 #endif // _FREE_SPACE_H_