Ticket #7136: mythtv-7136-remove_GeneratePreviewRemotely_setting.2.patch

programs/mythfrontend/globalsettings.cpp

@@ -2191 +2191 @@
     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");
@@ -4379 +4367 @@
                    QString(" (%1/%2)").arg(++i).arg(total));
     pbox->addChild(PlayBoxOrdering());
     pbox->addChild(PlayBoxEpisodeSort());
-    pbox->addChild(GeneratePreviewRemotely());
     pbox->addChild(PreviewPixmapOffset());
     pbox->addChild(PlaybackPreview());
     pbox->addChild(HWAccelPlaybackPreview());

programs/mythfrontend/playbackboxhelper.h

@@ -94 +94 @@
 
     // Preview Pixmap Variables ///////////////////////////////////////////////
     mutable QMutex      m_previewGeneratorLock;
-    uint                m_previewGeneratorMode;
     FileTimeStampMap    m_previewFileTS;
     bool                m_previewSuspend;
     PreviewMap          m_previewGenerator;

programs/mythfrontend/playbackboxhelper.cpp

@@ -200 +200 @@
     // Preview Image Variables
     m_previewGeneratorRunning(0), m_previewGeneratorMaxThreads(2)
 {
-    m_previewGeneratorMode =
-        gContext->GetNumSetting("GeneratePreviewRemotely", 0) ?
-        PreviewGenerator::kRemote : PreviewGenerator::kLocalAndRemote;
-
     int idealThreads = QThread::idealThreadCount();
     if (idealThreads >= 1)
         m_previewGeneratorMaxThreads = idealThreads * 2;
@@ -422 +418 @@
         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)
         {