Ticket #3720: 3720-preview-problem-v1.patch

libs/libmythtv/previewgenerator.cpp

@@ -27 +27 @@
 #define LOC_ERR QString("Preview Error: ")
 #define LOC_WARN QString("Preview Warning: ")
 
+const char *PreviewGenerator::kInUseID = "preview_generator";
+
 /** \class PreviewGenerator
  *  \brief This class creates a preview image of a recording.
  *
@@ -277 +279 @@
 
 void PreviewGenerator::LocalPreviewRun(void)
 {
-    programInfo.MarkAsInUse(true, "preview_generator");
+    programInfo.MarkAsInUse(true, kInUseID);
 
     float aspect = 0;
     int   secsin = (gContext->GetNumSetting("PreviewPixmapOffset", 64) +
@@ -356 +358 @@
         return false;
     }
 
-    NuppelVideoPlayer *nvp = new NuppelVideoPlayer("Preview", pginfo);
+    NuppelVideoPlayer *nvp = new NuppelVideoPlayer(kInUseID, pginfo);
     nvp->SetRingBuffer(rbuf);
 
     retbuf = nvp->GetScreenGrabAtFrame(frameNumber, true, bufferLen,
@@ -478 +480 @@
         return NULL;
     }
 
-    NuppelVideoPlayer *nvp = new NuppelVideoPlayer("Preview", pginfo);
+    NuppelVideoPlayer *nvp = new NuppelVideoPlayer(kInUseID, pginfo);
     nvp->SetRingBuffer(rbuf);
 
     retbuf = nvp->GetScreenGrab(secondsin, bufferlen,

libs/libmythtv/programinfo.cpp

@@ -21 +21 @@
 #include "jobqueue.h"
 #include "mythdbcon.h"
 #include "storagegroup.h"
+#include "previewgenerator.h"
 
 #define LOC QString("ProgramInfo: ")
 #define LOC_ERR QString("ProgramInfo, Error: ")
@@ -4085 +4086 @@
             }
         }
     }
-    else if (inUseForWhat == "preview_generator")
+    else if (inUseForWhat == PreviewGenerator::kInUseID)
     {
         recDir = "";
     }

libs/libmythtv/previewgenerator.h

@@ -39 +39 @@
     void AttachSignals(QObject*);
     void disconnectSafe(void);
 
+    static const char *kInUseID;
   signals:
     void previewThreadDone(const QString&, bool&);
     void previewReady(const ProgramInfo*);