Initialize gstreamer independent of witch engine is used

src/engine/engine_fwd.h

@@ -37,4 +37,4 @@ Q_DECLARE_FLAGS(TrackChangeFlags, TrackChangeType);
 
 typedef Engine::Base EngineBase;
 
-#endif
+#endif  // ENGINE_FWD_H

src/engine/gstengine.cpp

@@ -33,9 +33,6 @@
 #include <gst/gst.h>
 
 #include <QtGlobal>
-#include <QCoreApplication>
-#include <QStandardPaths>
-#include <QtConcurrentRun>
 #include <QFuture>
 #include <QTimer>
 #include <QDir>
@@ -63,13 +60,6 @@
 #include "gstengine.h"
 #include "gstenginepipeline.h"
 #include "gstbufferconsumer.h"
-#ifdef HAVE_IMOBILEDEVICE_ // FIXME
-#  include "ext/gstafc/gstafcsrc.h"
-#endif
-
-#ifdef HAVE_MOODBAR
-#  include "ext/gstmoodbar/gstmoodbarplugin.h"
-#endif
 
 #include "settings/backendsettingspage.h"
 
@@ -119,10 +109,6 @@ GstEngine::~GstEngine() {
 
 bool GstEngine::Init() {
 
-  SetEnvironment();
-
-  initialising_ = QtConcurrent::run(this, &GstEngine::InitialiseGStreamer);
-
   return true;
 
 }
@@ -412,60 +398,6 @@ void GstEngine::ReloadSettings() {
 
 }
 
-void GstEngine::InitialiseGStreamer() {
-
-  gst_init(nullptr, nullptr);
-
-#ifdef HAVE_IMOBILEDEVICE_ // FIXME
-  afcsrc_register_static();
-#endif
-
-#ifdef HAVE_MOODBAR
-  gstfastspectrum_register_static();
-#endif
-
-}
-
-void GstEngine::SetEnvironment() {
-
-  QString scanner_path;
-  QString plugin_path;
-  QString registry_filename;
-
-// On Windows and macOS we bundle the gstreamer plugins with strawberry
-#ifdef USE_BUNDLE
-#if defined(Q_OS_MACOS)
-  scanner_path = QCoreApplication::applicationDirPath() + "/" + USE_BUNDLE_DIR + "/gst-plugin-scanner";
-  plugin_path = QCoreApplication::applicationDirPath() + "/" + USE_BUNDLE_DIR + "/gstreamer";
-#elif defined(Q_OS_WIN32)
-  plugin_path = QDir::toNativeSeparators(QCoreApplication::applicationDirPath() + "/gstreamer-plugins");
-#endif
-#endif
-
-#if defined(Q_OS_WIN32) || defined(Q_OS_MACOS)
-  registry_filename = QStandardPaths::writableLocation(QStandardPaths::AppLocalDataLocation) + QString("/gst-registry-%1-bin").arg(QCoreApplication::applicationVersion());
-#endif
-
-  if (!scanner_path.isEmpty()) Utilities::SetEnv("GST_PLUGIN_SCANNER", scanner_path);
-
-  if (!plugin_path.isEmpty()) {
-    Utilities::SetEnv("GST_PLUGIN_PATH", plugin_path);
-    // Never load plugins from anywhere else.
-    Utilities::SetEnv("GST_PLUGIN_SYSTEM_PATH", plugin_path);
-  }
-
-  if (!registry_filename.isEmpty()) {
-    Utilities::SetEnv("GST_REGISTRY", registry_filename);
-  }
-
-#if defined(Q_OS_MACOS) && defined(USE_BUNDLE)
-  Utilities::SetEnv("GIO_EXTRA_MODULES", QCoreApplication::applicationDirPath() + "/" + USE_BUNDLE_DIR + "/gio-modules");
-#endif
-
-  Utilities::SetEnv("PULSE_PROP_media.role", "music");
-
-}
-
 GstElement *GstEngine::CreateElement(const QString &factoryName, GstElement *bin, bool showerror) {
 
   // Make a unique name

src/engine/gstengine.h

@@ -44,6 +44,7 @@
 #include "core/timeconstants.h"
 #include "engine_fwd.h"
 #include "enginebase.h"
+#include "gststartup.h"
 #include "gstbufferconsumer.h"
 
 class TaskManager;
@@ -90,9 +91,8 @@ class GstEngine : public Engine::Base, public GstBufferConsumer {
   bool CustomDeviceSupport(const QString &output);
   bool ALSADeviceSupport(const QString &output);
 
-  void EnsureInitialised() { initialising_.waitForFinished(); }
-  void InitialiseGStreamer();
-  void SetEnvironment();
+  void SetStartup(GstStartup *gst_startup) { gst_startup_ = gst_startup; }
+  void EnsureInitialised() { gst_startup_->EnsureInitialised(); }
 
   GstElement *CreateElement(const QString &factoryName, GstElement *bin = nullptr, bool showerror = true);
   void ConsumeBuffer(GstBuffer *buffer, int pipeline_id);
@@ -168,10 +168,9 @@ class GstEngine : public Engine::Base, public GstBufferConsumer {
   static const qint64 kSeekDelayNanosec = 100 * kNsecPerMsec;       // 100msec
 
   TaskManager *task_manager_;
+  GstStartup *gst_startup_;
   int buffering_task_id_;
 
-  QFuture<void> initialising_;
-
   std::shared_ptr<GstEnginePipeline> current_pipeline_;
   std::shared_ptr<GstEnginePipeline> fadeout_pipeline_;
   std::shared_ptr<GstEnginePipeline> fadeout_pause_pipeline_;
@@ -209,4 +208,4 @@ class GstEngine : public Engine::Base, public GstBufferConsumer {
 
 };
 
-#endif /* GSTENGINE_H */
+#endif  /* GSTENGINE_H */

src/engine/gststartup.cpp

@@ -0,0 +1,106 @@
+/*
+ * Strawberry Music Player
+ * Copyright 2018, Jonas Kvinge <jonas@jkvinge.net>
+ *
+ * Strawberry is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Strawberry is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Strawberry.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include "config.h"
+
+#include <glib.h>
+#include <glib-object.h>
+#include <gio/gio.h>
+#include <memory>
+#include <vector>
+#include <math.h>
+#include <string>
+
+#include <gst/gst.h>
+
+#include <QtGlobal>
+#include <QObject>
+#include <QCoreApplication>
+#include <QStandardPaths>
+#include <QtConcurrentRun>
+#include <QFuture>
+#include <QString>
+
+#include "core/utilities.h"
+
+#ifdef HAVE_MOODBAR
+#  include "ext/gstmoodbar/gstmoodbarplugin.h"
+#endif
+
+#include "gststartup.h"
+
+GstStartup::GstStartup(QObject *parent) : QObject(parent) {
+  initialising_ = QtConcurrent::run(this, &GstStartup::InitialiseGStreamer);
+}
+
+GstStartup::~GstStartup() {
+}
+
+void GstStartup::InitialiseGStreamer() {
+
+  SetEnvironment();
+
+  gst_init(nullptr, nullptr);
+
+#ifdef HAVE_MOODBAR
+  gstfastspectrum_register_static();
+#endif
+
+}
+
+void GstStartup::SetEnvironment() {
+
+  QString scanner_path;
+  QString plugin_path;
+  QString registry_filename;
+
+// On Windows and macOS we bundle the gstreamer plugins with strawberry
+#ifdef USE_BUNDLE
+#if defined(Q_OS_MACOS)
+  scanner_path = QCoreApplication::applicationDirPath() + "/" + USE_BUNDLE_DIR + "/gst-plugin-scanner";
+  plugin_path = QCoreApplication::applicationDirPath() + "/" + USE_BUNDLE_DIR + "/gstreamer";
+#elif defined(Q_OS_WIN32)
+  plugin_path = QDir::toNativeSeparators(QCoreApplication::applicationDirPath() + "/gstreamer-plugins");
+#endif
+#endif
+
+#if defined(Q_OS_WIN32) || defined(Q_OS_MACOS)
+  registry_filename = QStandardPaths::writableLocation(QStandardPaths::AppLocalDataLocation) + QString("/gst-registry-%1-bin").arg(QCoreApplication::applicationVersion());
+#endif
+
+  if (!scanner_path.isEmpty()) Utilities::SetEnv("GST_PLUGIN_SCANNER", scanner_path);
+
+  if (!plugin_path.isEmpty()) {
+    Utilities::SetEnv("GST_PLUGIN_PATH", plugin_path);
+    // Never load plugins from anywhere else.
+    Utilities::SetEnv("GST_PLUGIN_SYSTEM_PATH", plugin_path);
+  }
+
+  if (!registry_filename.isEmpty()) {
+    Utilities::SetEnv("GST_REGISTRY", registry_filename);
+  }
+
+#if defined(Q_OS_MACOS) && defined(USE_BUNDLE)
+  Utilities::SetEnv("GIO_EXTRA_MODULES", QCoreApplication::applicationDirPath() + "/" + USE_BUNDLE_DIR + "/gio-modules");
+#endif
+
+  Utilities::SetEnv("PULSE_PROP_media.role", "music");
+
+}
+

src/engine/gststartup.h

@@ -0,0 +1,47 @@
+/*
+ * Strawberry Music Player
+ * Copyright 2018, Jonas Kvinge <jonas@jkvinge.net>
+ *
+ * Strawberry is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Strawberry is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Strawberry.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#ifndef GSTSTARTUP_H
+#define GSTSTARTUP_H
+
+#include "config.h"
+
+#include <gst/gst.h>
+
+#include <QtGlobal>
+#include <QObject>
+#include <QFuture>
+
+class GstStartup : public QObject {
+  Q_OBJECT
+
+ public:
+  explicit GstStartup(QObject *parent = nullptr);
+  ~GstStartup();
+
+  void EnsureInitialised() { initialising_.waitForFinished(); }
+
+ private:
+  void InitialiseGStreamer();
+  void SetEnvironment();
+  QFuture<void> initialising_;
+
+};
+
+#endif  /* GSTSTARTUP_H */