MythDisplay: Use run time check for mode switching support

MythTV · Jan 22, 2020 · b508699 · b508699
1 parent 00186a1
commit b508699
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 12 deletions.
diff --git a/mythtv/libs/libmythui/mythdisplay.h b/mythtv/libs/libmythui/mythdisplay.h
@@ -25,6 +25,7 @@ class MUI_PUBLIC MythDisplay : public QObject, public ReferenceCounter
     static MythDisplay* AcquireRelease(bool Acquire = true);
     static QStringList  GetDescription(void);
 
+    virtual bool  VideoModesAvailable(void) { return false; }
     virtual bool  UsingVideoModes(void) { return false; }
     virtual const vector<MythDisplayMode>& GetVideoModes(void);
 

diff --git a/mythtv/libs/libmythui/platforms/mythdisplayosx.h b/mythtv/libs/libmythui/platforms/mythdisplayosx.h
@@ -15,6 +15,7 @@ class MythDisplayOSX : public MythDisplay
 
     void UpdateCurrentMode(void) override;
 
+    bool VideoModesAvailable(void) override { return true; }
     bool UsingVideoModes(void) override;
     const std::vector<MythDisplayMode>& GetVideoModes(void) override;
     bool SwitchToVideoMode(QSize Size, double DesiredRate) override;

diff --git a/mythtv/libs/libmythui/platforms/mythdisplayrpi.h b/mythtv/libs/libmythui/platforms/mythdisplayrpi.h
@@ -22,6 +22,7 @@ class MythDisplayRPI : public MythDisplay
    ~MythDisplayRPI() override;
 
     void  UpdateCurrentMode (void) override final;
+    bool  VideoModesAvailable(void) override { return true; }
     bool  UsingVideoModes   (void) override final;
     bool  SwitchToVideoMode (QSize Size, double Framerate) override final;
     const vector<MythDisplayMode>& GetVideoModes(void) override final;

diff --git a/mythtv/libs/libmythui/platforms/mythdisplayx11.h b/mythtv/libs/libmythui/platforms/mythdisplayx11.h
@@ -21,6 +21,7 @@ class MythDisplayX11 : public MythDisplay
     void UpdateCurrentMode(void) override final;
 
 #ifdef USING_XRANDR
+    bool VideoModesAvailable(void) override { return true; }
     bool UsingVideoModes(void) override;
     const std::vector<MythDisplayMode>& GetVideoModes(void) override;
     bool SwitchToVideoMode(QSize Size, double DesiredRate) override;

diff --git a/mythtv/programs/mythfrontend/globalsettings.cpp b/mythtv/programs/mythfrontend/globalsettings.cpp
@@ -2186,7 +2186,6 @@ static HostCheckBoxSetting *GuiSizeForTV()
     return gc;
 }
 
-#if defined(USING_XRANDR) || CONFIG_DARWIN
 static HostCheckBoxSetting *UseVideoModes()
 {
     HostCheckBoxSetting *gc = new VideoModeSettings("UseVideoModes");
@@ -2472,7 +2471,6 @@ VideoModeSettings::VideoModeSettings(const char *c) : HostCheckBoxSetting(c)
 
     addChild(overrides);
 };
-#endif
 
 static HostCheckBoxSetting *HideMouseCursor()
 {
@@ -4536,13 +4534,15 @@ AppearanceSettings::AppearanceSettings()
     screen->addChild(AirPlayFullScreen());
 #endif
 
-#if defined(USING_XRANDR) || CONFIG_DARWIN
     MythDisplay* display = MythDisplay::AcquireRelease();
-    vector<MythDisplayMode> scr = display->GetVideoModes();
+    if (display->VideoModesAvailable())
+    {
+        vector<MythDisplayMode> scr = display->GetVideoModes();
+        if (!scr.empty())
+            addChild(UseVideoModes());
+    }
     MythDisplay::AcquireRelease(false);
-    if (!scr.empty())
-        addChild(UseVideoModes());
-#endif
+
     auto *dates = new GroupSetting();
 
     dates->setLabel(tr("Localization"));

diff --git a/mythtv/programs/mythfrontend/globalsettings.h b/mythtv/programs/mythfrontend/globalsettings.h
@@ -52,9 +52,7 @@ class VideoModeSettings : public HostCheckBoxSetting
 
   public:
     explicit VideoModeSettings(const char *c);
-#if defined(USING_XRANDR) || CONFIG_DARWIN
-    void updateButton(MythUIButtonListItem *item) override; // MythUICheckBoxSetting
-#endif
+    void updateButton(MythUIButtonListItem *item) override;
 };
 
 class LcdSettings
@@ -162,9 +160,7 @@ class HostRefreshRateComboBoxSetting : public HostComboBoxSetting
     ~HostRefreshRateComboBoxSetting() override = default;
 
   public slots:
-#if defined(USING_XRANDR) || CONFIG_DARWIN
     virtual void ChangeResolution(StandardSetting *setting);
-#endif
 
   private:
     static vector<double> GetRefreshRates(const QString &resolution);