All pastes #2032280 Raw Edit

Miscellany

public cpp v1 · immutable
#2032280 ·published 2010-12-29 05:24 UTC
rendered paste body
diff --git a/mythtv/programs/mythfrontend/playbackbox.cpp b/mythtv/programs/mythfrontend/playbackbox.cppindex 89eec85..ea3a69d 100644--- a/mythtv/programs/mythfrontend/playbackbox.cpp+++ b/mythtv/programs/mythfrontend/playbackbox.cpp@@ -502,7 +502,7 @@ bool PlaybackBox::Create()     connect(m_artTimer[kArtworkCover], SIGNAL(timeout()), SLOT(coverartLoad()));      BuildFocusList();-    m_programInfoCache.ScheduleLoad();+    m_programInfoCache.ScheduleLoad(false);     LoadInBackground();      return true;diff --git a/mythtv/programs/mythfrontend/programinfocache.cpp b/mythtv/programs/mythfrontend/programinfocache.cppindex 1cd2d1b..c9c9aee 100644--- a/mythtv/programs/mythfrontend/programinfocache.cpp+++ b/mythtv/programs/mythfrontend/programinfocache.cpp@@ -28,11 +28,13 @@ static void free_vec(VPI_ptr &v) class ProgramInfoLoader : public QRunnable {   public:-    ProgramInfoLoader(ProgramInfoCache &c) : m_cache(c) {}+    ProgramInfoLoader(ProgramInfoCache &c, const bool updateUI)+      : m_cache(c), m_updateUI(updateUI) {} -    void run(void) { m_cache.Load(); }+    void run(void) { m_cache.Load(m_updateUI); }      ProgramInfoCache &m_cache;+    bool              m_updateUI; };  ProgramInfoCache::ProgramInfoCache(QObject *o) :@@ -52,7 +54,7 @@ ProgramInfoCache::~ProgramInfoCache()     free_vec(m_next_cache); } -void ProgramInfoCache::ScheduleLoad(void)+void ProgramInfoCache::ScheduleLoad(const bool updateUI) {     QMutexLocker locker(&m_lock);     if (!m_load_is_queued)@@ -60,11 +62,11 @@ void ProgramInfoCache::ScheduleLoad(void)         m_load_is_queued = true;         m_loads_in_progress++;         QThreadPool::globalInstance()->start(-            new ProgramInfoLoader(*this));+            new ProgramInfoLoader(*this, updateUI));     } } -void ProgramInfoCache::Load(void)+void ProgramInfoCache::Load(const bool updateUI) {     QMutexLocker locker(&m_lock);     m_load_is_queued = false;@@ -80,8 +82,9 @@ void ProgramInfoCache::Load(void)     free_vec(m_next_cache);     m_next_cache = tmp; -    QCoreApplication::postEvent(-        m_listener, new MythEvent("UPDATE_UI_LIST"));+    if (updateUI)+        QCoreApplication::postEvent(+            m_listener, new MythEvent("UPDATE_UI_LIST"));          m_loads_in_progress--;     m_load_wait.wakeAll();diff --git a/mythtv/programs/mythfrontend/programinfocache.h b/mythtv/programs/mythfrontend/programinfocache.hindex 289df26..72a0e14 100644--- a/mythtv/programs/mythfrontend/programinfocache.h+++ b/mythtv/programs/mythfrontend/programinfocache.h@@ -27,7 +27,7 @@ class ProgramInfoCache     ProgramInfoCache(QObject *o);     ~ProgramInfoCache(); -    void ScheduleLoad(void);+    void ScheduleLoad(const bool updateUI = true);     bool IsLoadInProgress(void) const;     void WaitForLoadToComplete(void) const; @@ -46,7 +46,7 @@ class ProgramInfoCache     ProgramInfo *GetProgramInfo(const QString &piKey) const;    private:-    void Load(void);+    void Load(const bool updateUI = true);     void Clear(void);    private: