Merge pull request #3446 from Be-ing/init_refactor

introduce CoreServices to decouple backend from QWidgets
mixxxdj · Dec 14, 2020 · 3c9435d · 3c9435d
2 parents dbe20f1 + 2b1eb59
commit 3c9435d
Show file tree

Hide file tree

Showing 45 changed files with 1,116 additions and 936 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -636,6 +636,7 @@ add_library(mixxx-lib STATIC EXCLUDE_FROM_ALL
   src/mixer/previewdeck.cpp
   src/mixer/sampler.cpp
   src/mixer/samplerbank.cpp
+  src/coreservices.cpp
   src/mixxx.cpp
   src/mixxxapplication.cpp
   src/musicbrainz/chromaprinter.cpp

diff --git a/src/controllers/dlgprefcontroller.cpp b/src/controllers/dlgprefcontroller.cpp
@@ -25,7 +25,7 @@ const QString kPresetExt(".midi.xml");
 DlgPrefController::DlgPrefController(
         QWidget* parent,
         Controller* controller,
-        ControllerManager* controllerManager,
+        std::shared_ptr<ControllerManager> controllerManager,
         UserSettingsPointer pConfig)
         : DlgPreferencePage(parent),
           m_pConfig(pConfig),
@@ -86,7 +86,7 @@ DlgPrefController::DlgPrefController(
     // Connect our signals to controller manager.
     connect(this,
             &DlgPrefController::applyPreset,
-            m_pControllerManager,
+            m_pControllerManager.get(),
             &ControllerManager::slotApplyPreset);
 
     // Open script file links

diff --git a/src/controllers/dlgprefcontroller.h b/src/controllers/dlgprefcontroller.h
@@ -2,15 +2,16 @@
 
 #include <QHash>
 #include <QSortFilterProxyModel>
+#include <memory>
 
 #include "controllers/controllerinputmappingtablemodel.h"
 #include "controllers/controlleroutputmappingtablemodel.h"
 #include "controllers/controllerpreset.h"
 #include "controllers/controllerpresetinfo.h"
 #include "controllers/dlgcontrollerlearning.h"
 #include "controllers/ui_dlgprefcontrollerdlg.h"
-#include "preferences/usersettings.h"
 #include "preferences/dlgpreferencepage.h"
+#include "preferences/usersettings.h"
 
 // Forward declarations
 class Controller;
@@ -21,9 +22,10 @@ class PresetInfoEnumerator;
 class DlgPrefController : public DlgPreferencePage {
     Q_OBJECT
   public:
-    DlgPrefController(QWidget *parent, Controller* controller,
-                      ControllerManager* controllerManager,
-                      UserSettingsPointer pConfig);
+    DlgPrefController(QWidget* parent,
+            Controller* controller,
+            std::shared_ptr<ControllerManager> controllerManager,
+            UserSettingsPointer pConfig);
     virtual ~DlgPrefController();
 
     QUrl helpUrl() const override;
@@ -106,7 +108,7 @@ class DlgPrefController : public DlgPreferencePage {
     Ui::DlgPrefControllerDlg m_ui;
     UserSettingsPointer m_pConfig;
     const QString m_pUserDir;
-    ControllerManager* m_pControllerManager;
+    std::shared_ptr<ControllerManager> m_pControllerManager;
     Controller* m_pController;
     DlgControllerLearning* m_pDlgControllerLearning;
     ControllerPresetPointer m_pPreset;

diff --git a/src/controllers/dlgprefcontrollers.cpp b/src/controllers/dlgprefcontrollers.cpp
@@ -10,9 +10,9 @@
 #include "preferences/dialog/dlgpreferences.h"
 
 DlgPrefControllers::DlgPrefControllers(DlgPreferences* pPreferences,
-                                       UserSettingsPointer pConfig,
-                                       ControllerManager* pControllerManager,
-                                       QTreeWidgetItem* pControllerTreeItem)
+        UserSettingsPointer pConfig,
+        std::shared_ptr<ControllerManager> pControllerManager,
+        QTreeWidgetItem* pControllerTreeItem)
         : DlgPreferencePage(pPreferences),
           m_pDlgPreferences(pPreferences),
           m_pConfig(pConfig),
@@ -27,7 +27,7 @@ DlgPrefControllers::DlgPrefControllers(DlgPreferences* pPreferences,
     });
 
     // Connections
-    connect(m_pControllerManager,
+    connect(m_pControllerManager.get(),
             &ControllerManager::devicesChanged,
             this,
             &DlgPrefControllers::rescanControllers);

diff --git a/src/controllers/dlgprefcontrollers.h b/src/controllers/dlgprefcontrollers.h
@@ -1,10 +1,11 @@
 #pragma once
 
 #include <QTreeWidgetItem>
+#include <memory>
 
-#include "preferences/usersettings.h"
 #include "controllers/ui_dlgprefcontrollersdlg.h"
 #include "preferences/dlgpreferencepage.h"
+#include "preferences/usersettings.h"
 
 class DlgPreferences;
 class DlgPrefController;
@@ -18,9 +19,9 @@ class DlgPrefControllers : public DlgPreferencePage, public Ui::DlgPrefControlle
     Q_OBJECT
   public:
     DlgPrefControllers(DlgPreferences* pDlgPreferences,
-                       UserSettingsPointer pConfig,
-                       ControllerManager* pControllerManager,
-                       QTreeWidgetItem* pControllerTreeItem);
+            UserSettingsPointer pConfig,
+            std::shared_ptr<ControllerManager> pControllerManager,
+            QTreeWidgetItem* pControllerTreeItem);
     virtual ~DlgPrefControllers();
 
     bool handleTreeItemClick(QTreeWidgetItem* clickedItem);
@@ -47,7 +48,7 @@ class DlgPrefControllers : public DlgPreferencePage, public Ui::DlgPrefControlle
 
     DlgPreferences* m_pDlgPreferences;
     UserSettingsPointer m_pConfig;
-    ControllerManager* m_pControllerManager;
+    std::shared_ptr<ControllerManager> m_pControllerManager;
     QTreeWidgetItem* m_pControllerTreeItem;
     QList<DlgPrefController*> m_controllerWindows;
     QList<QTreeWidgetItem*> m_controllerTreeItems;