Refactor display/input disabling

Dale Glass committed 3 years ago

Commit b05dd341 parent ec29cfc3 files · +39 −35Browse files

Showing the changes to interface/src/Application.cpp (1 of 3 files). Show all

Unified · Split

     DependencyManager::set<PathUtils>();
 }
-void Application::initializePluginManager() {
+void Application::initializePluginManager(const QCommandLineParser& parser) {
     DependencyManager::set<PluginManager>();
     auto pluginManager = PluginManager::getInstance();
-    qWarning() << "Input plugins: " << getInputPlugins().size();
     // To avoid any confusion: the getInputPlugins and getDisplayPlugins are not the ones
     // from PluginManager, but functions exported by input-plugins/InputPlugin.cpp and
     // display-plugins/DisplayPlugin.cpp.
     pluginManager->setInputPluginProvider([] { return getInputPlugins(); });
     pluginManager->setDisplayPluginProvider([] { return getDisplayPlugins(); });
     pluginManager->setInputPluginSettingsPersister([](const InputPluginList& plugins) { saveInputPluginSettings(plugins); });
+    // This must be a member function -- PluginManager must exist, and for that
+    // QApplication must exist, or it can't find the plugin path, as QCoreApplication:applicationDirPath
+    // won't work yet.
+    if (parser.isSet("display")) {
+        auto preferredDisplays = parser.value("display").split(',', Qt::SkipEmptyParts);
+        qInfo() << "Setting prefered display plugins:" << preferredDisplays;
+        PluginManager::getInstance()->setPreferredDisplayPlugins(preferredDisplays);
+    }
+    if (parser.isSet("disableDisplays")) {
+        auto disabledDisplays = parser.value("disableDisplays").split(',', Qt::SkipEmptyParts);
+        qInfo() << "Disabling following display plugins:"  << disabledDisplays;
+        PluginManager::getInstance()->disableDisplays(disabledDisplays);
+    }
+    if (parser.isSet("disableInputs")) {
+        auto disabledInputs = parser.value("disableInputs").split(',', Qt::SkipEmptyParts);
+        qInfo() << "Disabling following input plugins:" << disabledInputs;
+        PluginManager::getInstance()->disableInputs(disabledInputs);
+    }
 }
 void Application::initialize(const QCommandLineParser &parser) {
     }
 }
-void Application::configurePlugins(const QCommandLineParser& parser) {
-    // This must be a member function -- PluginManager must exist, and for that
-    // QApplication must exist, or it can't find the plugin path, as QCoreApplication:applicationDirPath
-    // won't work yet.
-    if (parser.isSet("display")) {
-        auto preferredDisplays = parser.value("display").split(',', Qt::SkipEmptyParts);
-        qInfo() << "Setting prefered display plugins:" << preferredDisplays;
-        PluginManager::getInstance()->setPreferredDisplayPlugins(preferredDisplays);
-    }
-    if (parser.isSet("disable-displays")) {
-        auto disabledDisplays = parser.value("disable-displays").split(',', Qt::SkipEmptyParts);
-        qInfo() << "Disabling following display plugins:"  << disabledDisplays;
-        PluginManager::getInstance()->disableDisplays(disabledDisplays);
-    }
-    if (parser.isSet("disable-inputs")) {
-        auto disabledInputs = parser.value("disable-inputs").split(',', Qt::SkipEmptyParts);
-        qInfo() << "Disabling following input plugins:" << disabledInputs;
-        PluginManager::getInstance()->disableInputs(disabledInputs);
-    }
-}
 void Application::shutdownPlugins() {
 }