Ticket #7136: mythtv-7136-remove_GeneratePreviewRemotely_setting.patch

programs/mythfrontend/playbackbox.cpp

@@ -316 +316 @@
     m_watchListBlackOut  = gContext->GetNumSetting("PlaybackWLBlackOut", 2);
     m_groupnameAsAllProg = gContext->GetNumSetting("DispRecGroupAsAllProg", 0);
     m_previewFromBookmark = gContext->GetNumSetting("PreviewFromBookmark");
-    m_previewGeneratorMode =
-            gContext->GetNumSetting("GeneratePreviewRemotely", 0) ?
-            PreviewGenerator::kRemote : PreviewGenerator::kLocalAndRemote;
 
     bool displayCat  = gContext->GetNumSetting("DisplayRecGroupIsCategory", 0);
 
@@ -3956 +3953 @@
         uint attempts = IncPreviewGeneratorAttempts(filename);
         if (attempts < PreviewGenState::maxAttempts)
         {
-            PreviewGenerator::Mode mode =
-                (PreviewGenerator::Mode) m_previewGeneratorMode;
-            SetPreviewGenerator(filename, new PreviewGenerator(pginfo, mode));
+            SetPreviewGenerator(filename, new PreviewGenerator(pginfo,
+                                PreviewGenerator::kRemote));
         }
         else if (attempts == PreviewGenState::maxAttempts)
         {

programs/mythfrontend/globalsettings.cpp

@@ -2167 +2167 @@
     return gc;
 }
 
-static HostCheckBox *GeneratePreviewRemotely()
-{
-    HostCheckBox *gc = new HostCheckBox("GeneratePreviewRemotely");
-    gc->setLabel(QObject::tr("Generate preview image remotely"));
-    gc->setValue(false);
-    gc->setHelpText(
-        QObject::tr(
-            "If you have a very slow frontend you can enable this to "
-            "always have a backend server generate preview images."));
-    return gc;
-}
-
 static HostCheckBox *PlayBoxTransparency()
 {
     HostCheckBox *gc = new HostCheckBox("PlayBoxTransparency");
@@ -4556 +4544 @@
                    QString(" (%1/%2)").arg(++i).arg(total));
     pbox->addChild(PlayBoxOrdering());
     pbox->addChild(PlayBoxEpisodeSort());
-    pbox->addChild(GeneratePreviewRemotely());
     pbox->addChild(PreviewPixmapOffset());
     pbox->addChild(PreviewFromBookmark());
     pbox->addChild(PlaybackPreview());

programs/mythfrontend/playbackbox.h

@@ -436 +436 @@
 
     // Preview Pixmap Variables ///////////////////////////////////////////////
     bool                m_previewFromBookmark;
-    uint                m_previewGeneratorMode;
     QMap<QString,QDateTime> m_previewFileTS;
     bool                m_previewSuspend;
     mutable QMutex      m_previewGeneratorLock;