Pass UserSettings to Controller constructor

mixxxdj · Nov 11, 2019 · 85a3762 · 85a3762
1 parent fc22b25
commit 85a3762
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 15 deletions.
diff --git a/src/controllers/bulk/bulkcontroller.cpp b/src/controllers/bulk/bulkcontroller.cpp
@@ -68,15 +68,15 @@ static QString get_string(libusb_device_handle *handle, u_int8_t id) {
     return QString::fromLatin1((char*)buf);
 }
 
-
-BulkController::BulkController(libusb_context* context,
-                               libusb_device_handle *handle,
-                               struct libusb_device_descriptor *desc)
-        : m_context(context),
+BulkController::BulkController(UserSettingsPointer pConfig,
+        libusb_context* context,
+        libusb_device_handle* handle,
+        struct libusb_device_descriptor* desc)
+        : Controller(pConfig),
+          m_context(context),
           m_phandle(handle),
           in_epaddr(0),
-          out_epaddr(0)
-{
+          out_epaddr(0) {
     vendor_id = desc->idVendor;
     product_id = desc->idProduct;
 

diff --git a/src/controllers/bulk/bulkcontroller.h b/src/controllers/bulk/bulkcontroller.h
@@ -42,8 +42,10 @@ class BulkReader : public QThread {
 class BulkController : public Controller {
     Q_OBJECT
   public:
-    BulkController(libusb_context* context, libusb_device_handle *handle,
-                   struct libusb_device_descriptor *desc);
+    BulkController(UserSettingsPointer pConfig,
+            libusb_context* context,
+            libusb_device_handle* handle,
+            struct libusb_device_descriptor* desc);
     ~BulkController() override;
 
     QString presetExtension() override;

diff --git a/src/controllers/bulk/bulkenumerator.cpp b/src/controllers/bulk/bulkenumerator.cpp
@@ -11,9 +11,8 @@
 #include "controllers/bulk/bulkenumerator.h"
 #include "controllers/bulk/bulksupported.h"
 
-BulkEnumerator::BulkEnumerator()
-        : ControllerEnumerator(),
-          m_context(NULL) {
+BulkEnumerator::BulkEnumerator(UserSettingsPointer pConfig)
+        : ControllerEnumerator(), m_context(NULL), m_pConfig(pConfig) {
     libusb_init(&m_context);
 }
 
@@ -55,7 +54,8 @@ QList<Controller*> BulkEnumerator::queryDevices() {
                 continue;
             }
 
-            BulkController* currentDevice = new BulkController(m_context, handle, &desc);
+            BulkController* currentDevice =
+                    new BulkController(m_pConfig, m_context, handle, &desc);
             m_devices.push_back(currentDevice);
         }
     }

diff --git a/src/controllers/bulk/bulkenumerator.h b/src/controllers/bulk/bulkenumerator.h
@@ -14,14 +14,15 @@ struct libusb_context;
 
 class BulkEnumerator : public ControllerEnumerator {
   public:
-    BulkEnumerator();
+    BulkEnumerator(UserSettingsPointer pConfig);
     virtual ~BulkEnumerator();
 
     QList<Controller*> queryDevices();
 
   private:
     QList<Controller*> m_devices;
     libusb_context* m_context;
+    UserSettingsPointer m_pConfig;
 };
 
 #endif
diff --git a/src/controllers/controllermanager.cpp b/src/controllers/controllermanager.cpp
@@ -132,7 +132,7 @@ void ControllerManager::slotInitialize() {
     m_enumerators.append(new Hss1394Enumerator());
 #endif
 #ifdef __BULK__
-    m_enumerators.append(new BulkEnumerator());
+    m_enumerators.append(new BulkEnumerator(m_pConfig));
 #endif
 #ifdef __HID__
     m_enumerators.append(new HidEnumerator(m_pConfig));