Ticket #3353: mythtv_remotepreviewgen.patch

libs/libmythtv/previewgenerator.cpp

@@ -59 +59 @@
  *                    if the file is local.
  */
 PreviewGenerator::PreviewGenerator(const ProgramInfo *pginfo,
-                                   bool local_only)
-    : programInfo(*pginfo), localOnly(local_only), isConnected(false),
+                                   bool local_only, bool force_remote)
+    : programInfo(*pginfo), localOnly(local_only), forceRemote(force_remote), isConnected(false),
       createSockets(false), serverSock(NULL),      pathname(pginfo->pathname)
 {
-    if (IsLocal())
+    if (IsLocal() && !forceRemote)
         return;
 
     // Try to find a local means to access file...
@@ -150 +150 @@
  */
 void PreviewGenerator::Run(void)
 {
-    if (IsLocal())
+    if (IsLocal() && !forceRemote)
     {
         LocalPreviewRun();
     }

libs/libmythtv/previewgenerator.h

@@ -16 +16 @@
 {
     Q_OBJECT
   public:
-    PreviewGenerator(const ProgramInfo *pginfo, bool local_only = true);
+    PreviewGenerator(const ProgramInfo *pginfo, bool local_only = true, bool remote_only = false);
     virtual ~PreviewGenerator();
 
     void Start(void);
@@ -60 +60 @@
     ProgramInfo        programInfo;
 
     bool               localOnly;
+    bool               forceRemote;
     bool               isConnected;
     bool               createSockets;
     MythSocket        *serverSock;

programs/mythfrontend/playbackbox.cpp

@@ -4143 +4143 @@
         uint attempts = IncPreviewGeneratorAttempts(filename);
         if (attempts < 5)
         {
-            SetPreviewGenerator(filename, new PreviewGenerator(pginfo, false));
+            SetPreviewGenerator(filename, new PreviewGenerator(pginfo, false, true));
         }
         else if (attempts == 5)
         {
@@ -4153 +4153 @@
             return retpixmap;
         }
 #else
-        PreviewGenerator pg(pginfo, false);
+        PreviewGenerator pg(pginfo, false, true);
         pg.Run();
 #endif
     }
@@ -4207 +4207 @@
         if (attempts < 5)
         {
             VERBOSE(VB_PLAYBACK, "Starting preview generator");
-            SetPreviewGenerator(filename, new PreviewGenerator(pginfo, false));
+            SetPreviewGenerator(filename, new PreviewGenerator(pginfo, false, true));
         }
         else if (attempts == 5)
         {
@@ -4217 +4217 @@
             return retpixmap;
         }
 #else
-        PreviewGenerator pg(pginfo, false);
+        PreviewGenerator pg(pginfo, false, true);
         pg.Run();
         image = gContext->CacheRemotePixmap(filename, true);
 #endif