Current version of Psi+ is 1.5.1729

It is based on: * psi: 65aed7cb * plugins: 3c71dec * psimedia: aa054ec * resources: 2ef1865
psi-plus · Mar 30, 2024 · 12213a7 · 12213a7
1 parent aaf6e65
commit 12213a7
Showing 1 changed file with 20 additions and 20 deletions.
diff --git a/plugins/generic/psimedia/psiplugin/psiplugin.cpp b/plugins/generic/psimedia/psiplugin/psiplugin.cpp
@@ -52,7 +52,7 @@ class PsiMediaPlugin : public QObject,
 public:
     PsiMediaPlugin() = default;
     QString             name() const override;
-    QWidget *           options() override;
+    QWidget            *options() override;
     bool                enable() override;
     bool                disable() override;
     void                optionChanged(const QString &option) override;
@@ -67,15 +67,15 @@ class PsiMediaPlugin : public QObject,
     PsiMedia::Provider *createProvider(const QVariantMap &) override;
 
 private:
-    OptionAccessingHost *         psiOptions = nullptr;
-    IconFactoryAccessingHost *    iconHost   = nullptr;
+    OptionAccessingHost          *psiOptions = nullptr;
+    IconFactoryAccessingHost     *iconHost   = nullptr;
     ApplicationInfoAccessingHost *appInfo    = nullptr;
-    PsiMediaHost *                mediaHost  = nullptr;
-    PluginAccessingHost *         pluginHost = nullptr;
+    PsiMediaHost                 *mediaHost  = nullptr;
+    PluginAccessingHost          *pluginHost = nullptr;
     bool                          enabled    = false;
     QPointer<QWidget>             options_;
 
-    OAH_PluginOptionsTab * tab      = nullptr;
+    OAH_PluginOptionsTab  *tab      = nullptr;
     PsiMedia::GstProvider *provider = nullptr;
 };
 
@@ -85,29 +85,29 @@ bool PsiMediaPlugin::enable()
 {
     if (!psiOptions || !mediaHost || !appInfo || !pluginHost)
         return false;
-    enabled = true;
 
     if (!provider) {
         QVariantMap params;
 #ifdef Q_OS_WIN
         params["resourcePath"] = QDir::toNativeSeparators(appInfo->appResourcesDir() + "/gstreamer-1.0");
 #endif
         provider = new PsiMedia::GstProvider(params);
-        connect(provider, &PsiMedia::GstProvider::initialized, this, [this]() {
-            mediaHost->setMediaProvider(provider);
-
-            tab = new OptionsTabAvCall(provider, psiOptions, mediaHost,
-                                       pluginHost->selfMetadata()["icon"].value<QIcon>());
-            psiOptions->addSettingPage(tab);
-
-            auto ain  = psiOptions->getPluginOption("devices.audio-input", QString()).toString();
-            auto aout = psiOptions->getPluginOption("devices.audio-output", QString()).toString();
-            auto vin  = psiOptions->getPluginOption("devices.video-input", QString()).toString();
-            mediaHost->selectMediaDevices(ain, aout, vin);
-        });
-        provider->init();
+        if (!provider->isInitialized()) {
+            delete provider;
+            return false;
+        }
+        mediaHost->setMediaProvider(provider);
+
+        tab = new OptionsTabAvCall(provider, psiOptions, mediaHost, pluginHost->selfMetadata()["icon"].value<QIcon>());
+        psiOptions->addSettingPage(tab);
+
+        auto ain  = psiOptions->getPluginOption("devices.audio-input", QString()).toString();
+        auto aout = psiOptions->getPluginOption("devices.audio-output", QString()).toString();
+        auto vin  = psiOptions->getPluginOption("devices.video-input", QString()).toString();
+        mediaHost->selectMediaDevices(ain, aout, vin);
     }
 
+    enabled = true;
     return enabled;
 }