diff options
| author | Jan Holthuis <jan.holthuis@ruhr-uni-bochum.de> | 2020-04-18 14:46:17 +0200 |
|---|---|---|
| committer | Jan Holthuis <jan.holthuis@ruhr-uni-bochum.de> | 2020-04-18 14:46:17 +0200 |
| commit | 863b59c6c12eac8dc9c0c86607f2b64b08cb2a0f (patch) | |
| tree | f250cbd908c48ebb8995657ee0b199df1130799a /src/controllers/bulk/bulkcontroller.cpp | |
| parent | 9b658d10124eb9c43816c380d09d1254a4ebc263 (diff) | |
| parent | 381214a6d13a01cae53403f1390592318ff7b62a (diff) | |
Merge branch 'migrate-to-QJSEngine' of https://github.com/ferranpujolcamins/mixxx into migrate-to-QJSEngine
Diffstat (limited to 'src/controllers/bulk/bulkcontroller.cpp')
| -rw-r--r-- | src/controllers/bulk/bulkcontroller.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/controllers/bulk/bulkcontroller.cpp b/src/controllers/bulk/bulkcontroller.cpp index 4280cc75be..f97e132f74 100644 --- a/src/controllers/bulk/bulkcontroller.cpp +++ b/src/controllers/bulk/bulkcontroller.cpp @@ -69,11 +69,11 @@ static QString get_string(libusb_device_handle *handle, u_int8_t id) { return QString::fromLatin1((char*)buf); } -BulkController::BulkController(UserSettingsPointer pConfig, +BulkController::BulkController( libusb_context* context, libusb_device_handle* handle, struct libusb_device_descriptor* desc) - : Controller(pConfig), + : Controller(), m_context(context), m_phandle(handle), in_epaddr(0), |