MythDisplay: Pass the full command line object to ConfigureQtGUI

- allowing us to use other command line args, over and above the display setting
MythTV · Jan 18, 2021 · 373ec9f · 373ec9f
1 parent 6b3b2d6
commit 373ec9f
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 9 deletions.
diff --git a/mythtv/libs/libmythui/mythdisplay.cpp b/mythtv/libs/libmythui/mythdisplay.cpp
@@ -1041,7 +1041,7 @@ void MythDisplay::DebugModes() const
  * \note This function must be called before Qt/QPA is initialised i.e. before
  * any call to QApplication.
 */
-void MythDisplay::ConfigureQtGUI(int SwapInterval, const QString& _Display)
+void MythDisplay::ConfigureQtGUI(int SwapInterval, const MythCommandLineParser& CmdLine)
 {
 #ifdef USING_QTWEBENGINE
     QApplication::setAttribute(Qt::AA_ShareOpenGLContexts);
@@ -1098,8 +1098,9 @@ void MythDisplay::ConfigureQtGUI(int SwapInterval, const QString& _Display)
     QApplication::setAttribute(Qt::AA_DisableHighDpiScaling);
 
 #ifdef USING_X11
-    MythXDisplay::SetQtX11Display(_Display);
+    if (auto display = CmdLine.toString("display"); !display.isEmpty())
+        MythXDisplay::SetQtX11Display(display);
 #else
-    (void)_Display;
+    (void)CmdLine;
 #endif
 }
diff --git a/mythtv/libs/libmythui/mythdisplay.h b/mythtv/libs/libmythui/mythdisplay.h
@@ -11,6 +11,7 @@
 #include "referencecounter.h"
 #include "mythdisplaymode.h"
 #include "mythedid.h"
+#include "mythcommandlineparser.h"
 
 // Std
 #include <cmath>
@@ -27,7 +28,7 @@ class MUI_PUBLIC MythDisplay : public QObject, public ReferenceCounter
     virtual bool  IsPlanar             () { return false; }
     virtual const MythDisplayModes& GetVideoModes();
 
-    static void  ConfigureQtGUI        (int SwapInterval = 1, const QString& Display = QString());
+    static void  ConfigureQtGUI        (int SwapInterval, const MythCommandLineParser& CmdLine);
     static bool  SpanAllScreens        ();
     static QString GetExtraScreenInfo  (QScreen *qScreen);
     QStringList  GetDescription        ();

diff --git a/mythtv/programs/mythavtest/main.cpp b/mythtv/programs/mythavtest/main.cpp
@@ -203,7 +203,7 @@ int main(int argc, char *argv[])
         swapinterval = 0;
     }
 
-    MythDisplay::ConfigureQtGUI(swapinterval, cmdline.toString("display"));
+    MythDisplay::ConfigureQtGUI(swapinterval, cmdline);
 
     QApplication a(argc, argv);
     QCoreApplication::setApplicationName(MYTH_APPNAME_MYTHAVTEST);

diff --git a/mythtv/programs/mythfrontend/main.cpp b/mythtv/programs/mythfrontend/main.cpp
@@ -1844,7 +1844,7 @@ int main(int argc, char **argv)
         return GENERIC_EXIT_OK;
     }
 
-    MythDisplay::ConfigureQtGUI(1, cmdline.toString("display"));
+    MythDisplay::ConfigureQtGUI(1, cmdline);
     QApplication::setSetuidAllowed(true);
     QApplication a(argc, argv);
     QCoreApplication::setApplicationName(MYTH_APPNAME_MYTHFRONTEND);

diff --git a/mythtv/programs/mythscreenwizard/main.cpp b/mythtv/programs/mythscreenwizard/main.cpp
@@ -117,7 +117,7 @@ int main(int argc, char **argv)
         return GENERIC_EXIT_OK;
     }
 
-    MythDisplay::ConfigureQtGUI(1, cmdline.toString("display"));
+    MythDisplay::ConfigureQtGUI(1, cmdline);
     QApplication a(argc, argv);
     QCoreApplication::setApplicationName(MYTH_APPNAME_MYTHSCREENWIZARD);
 

diff --git a/mythtv/programs/mythtv-setup/main.cpp b/mythtv/programs/mythtv-setup/main.cpp
@@ -289,7 +289,7 @@ int main(int argc, char *argv[])
 
     if (use_display)
     {
-        MythDisplay::ConfigureQtGUI(1, cmdline.toString("display"));
+        MythDisplay::ConfigureQtGUI(1, cmdline);
         app = std::make_unique<QApplication>(argc, argv);
     }
     else

diff --git a/mythtv/programs/mythwelcome/main.cpp b/mythtv/programs/mythwelcome/main.cpp
@@ -63,7 +63,7 @@ int main(int argc, char **argv)
         return GENERIC_EXIT_OK;
     }
 
-    MythDisplay::ConfigureQtGUI(1, cmdline.toString("display"));
+    MythDisplay::ConfigureQtGUI(1, cmdline);
     QApplication a(argc, argv);
     QCoreApplication::setApplicationName(MYTH_APPNAME_MYTHWELCOME);