Ticket #8053: 8053-pbbhelper.patch

programs/mythfrontend/playbackboxhelper.h

@@ -88 +88 @@
     mutable QMutex      m_lock;
 
     // Free disk space tracking
-    int                 m_freeSpaceTimerId;
     uint64_t            m_freeSpaceTotalMB;
     uint64_t            m_freeSpaceUsedMB;
 
@@ -101 +100 @@
     QStringList         m_previewGeneratorQueue;
     uint                m_previewGeneratorRunning;
     uint                m_previewGeneratorMaxThreads;
-
-    static const uint kUpdateFreeSpaceInterval;
 };
 
 #endif // _FREE_SPACE_H_

programs/mythfrontend/playbackboxhelper.cpp

@@ -22 +22 @@
 class PBHEventHandler : public QObject
 {
   public:
-    PBHEventHandler(PlaybackBoxHelper &pbh) : m_pbh(pbh) { }
+    PBHEventHandler(PlaybackBoxHelper &pbh) : m_pbh(pbh), freeSpaceTimerId(0) { }
     virtual bool event(QEvent*); // QObject
+    void UpdateFreeSpaceEvent(void);
     PlaybackBoxHelper &m_pbh;
+    int freeSpaceTimerId;
+    static const uint kUpdateFreeSpaceInterval;
 };
 
+const uint PBHEventHandler::kUpdateFreeSpaceInterval = 15000; // 15 seconds
+
 bool PBHEventHandler::event(QEvent *e)
 {
     if (e->type() == QEvent::Timer)
     {
         QTimerEvent *te = (QTimerEvent*)e;
         const int timer_id = te->timerId();
-        if (timer_id == m_pbh.m_freeSpaceTimerId)
-            m_pbh.UpdateFreeSpace();
+        if (timer_id == freeSpaceTimerId)
+            UpdateFreeSpaceEvent();
     }
     else if (e->type() == (QEvent::Type) MythEvent::MythEventMessage)
     {
         MythEvent *me = (MythEvent*)e;
         if (me->Message() == "UPDATE_FREE_SPACE")
         {
-            m_pbh.UpdateFreeSpace();
+            UpdateFreeSpaceEvent();
             return true;
         }
         else if (me->Message() == "STOP_RECORDING")
@@ -186 +191 @@
     return QObject::event(e);
 }
 
+void PBHEventHandler::UpdateFreeSpaceEvent(void)
+{
+    if (freeSpaceTimerId)
+        killTimer(freeSpaceTimerId);
+    m_pbh.UpdateFreeSpace();
+    freeSpaceTimerId = startTimer(kUpdateFreeSpaceInterval);
+}
+
 //////////////////////////////////////////////////////////////////////
 
-const uint PlaybackBoxHelper::kUpdateFreeSpaceInterval = 15000; // 15 seconds
-
 const uint PreviewGenState::maxAttempts     = 5;
 const uint PreviewGenState::minBlockSeconds = 60;
 
 PlaybackBoxHelper::PlaybackBoxHelper(QObject *listener) :
     m_listener(listener), m_eventHandler(NULL),
     // Free Space Tracking Variables
-    m_freeSpaceTimerId(0), m_freeSpaceTotalMB(0ULL), m_freeSpaceUsedMB(0ULL),
+    m_freeSpaceTotalMB(0ULL), m_freeSpaceUsedMB(0ULL),
     // Preview Image Variables
     m_previewGeneratorRunning(0), m_previewGeneratorMaxThreads(2)
 {
@@ -278 +289 @@
 
 void PlaybackBoxHelper::UpdateFreeSpace(void)
 {
-    if (m_freeSpaceTimerId)
-        killTimer(m_freeSpaceTimerId);
-
     vector<FileSystemInfo> fsInfos = RemoteGetFreeSpace();
 
     QMutexLocker locker(&m_lock);
@@ -292 +300 @@
             m_freeSpaceUsedMB  = (uint64_t) (fsInfos[i].usedSpaceKB  >> 10);
         }
     }
-
-    m_freeSpaceTimerId = startTimer(kUpdateFreeSpaceInterval);
 }
 
 uint64_t PlaybackBoxHelper::GetFreeSpaceTotalMB(void) const