diff options
author | Be <be@mixxx.org> | 2020-12-07 21:08:48 -0600 |
---|---|---|
committer | Be <be@mixxx.org> | 2020-12-07 21:08:48 -0600 |
commit | 3085bbe95107fd789a8a966dfeb341cfe74cfad8 (patch) | |
tree | 7aac36fca1cce483218b3f06435d218283f156e3 /src/controllers/bulk | |
parent | 7d82224170a6e9b9a9242b65c2ccb82ba749949a (diff) |
merge 2.3
Diffstat (limited to 'src/controllers/bulk')
-rw-r--r-- | src/controllers/bulk/bulkcontroller.cpp | 7 | ||||
-rw-r--r-- | src/controllers/bulk/bulkcontroller.h | 13 | ||||
-rw-r--r-- | src/controllers/bulk/bulkenumerator.cpp | 7 | ||||
-rw-r--r-- | src/controllers/bulk/bulkenumerator.h | 13 | ||||
-rw-r--r-- | src/controllers/bulk/bulksupported.h | 12 |
5 files changed, 6 insertions, 46 deletions
diff --git a/src/controllers/bulk/bulkcontroller.cpp b/src/controllers/bulk/bulkcontroller.cpp index 5b8a89bcda..6ac4eaaacd 100644 --- a/src/controllers/bulk/bulkcontroller.cpp +++ b/src/controllers/bulk/bulkcontroller.cpp @@ -1,10 +1,3 @@ -/** - * @file bulkcontroller.cpp - * @author Neale Pickett neale@woozle.org - * @date Thu Jun 28 2012 - * @brief USB Bulk controller backend - * - */ #include "controllers/bulk/bulkcontroller.h" #include <libusb.h> diff --git a/src/controllers/bulk/bulkcontroller.h b/src/controllers/bulk/bulkcontroller.h index 6430a6f11e..2afb9b3220 100644 --- a/src/controllers/bulk/bulkcontroller.h +++ b/src/controllers/bulk/bulkcontroller.h @@ -1,12 +1,4 @@ -/** - * @file bulkcontroller.h - * @author Neale Picket neale@woozle.org - * @date Thu Jun 28 2012 - * @brief USB Bulk controller backend - */ - -#ifndef BULKCONTROLLER_H -#define BULKCONTROLLER_H +#pragma once #include <QAtomicInt> @@ -19,6 +11,7 @@ struct libusb_device_handle; struct libusb_context; struct libusb_device_descriptor; +/// USB Bulk controller backend class BulkReader : public QThread { Q_OBJECT public: @@ -107,5 +100,3 @@ class BulkController : public Controller { BulkReader* m_pReader; HidControllerPreset m_preset; }; - -#endif diff --git a/src/controllers/bulk/bulkenumerator.cpp b/src/controllers/bulk/bulkenumerator.cpp index ce154e4883..2e6abdde16 100644 --- a/src/controllers/bulk/bulkenumerator.cpp +++ b/src/controllers/bulk/bulkenumerator.cpp @@ -1,10 +1,3 @@ -/** - * @file bulkenumerator.cpp - * @author Neale Picket neale@woozle.org - * @date Thu Jun 28 2012 - * @brief USB Bulk controller backend - */ - #include <libusb.h> #include "controllers/bulk/bulkcontroller.h" diff --git a/src/controllers/bulk/bulkenumerator.h b/src/controllers/bulk/bulkenumerator.h index b281f49c01..b1c2569f33 100644 --- a/src/controllers/bulk/bulkenumerator.h +++ b/src/controllers/bulk/bulkenumerator.h @@ -1,17 +1,10 @@ -/** -* @file bulkenumerator.h -* @author Neale Pickett neale@woozle.org -* @date Thu Jun 28 2012 -* @brief Locate supported USB bulk controllers -*/ - -#ifndef BULKENUMERATOR_H -#define BULKENUMERATOR_H +#pragma once #include "controllers/controllerenumerator.h" struct libusb_context; +/// Locate supported USB bulk controllers class BulkEnumerator : public ControllerEnumerator { public: explicit BulkEnumerator(UserSettingsPointer pConfig); @@ -24,5 +17,3 @@ class BulkEnumerator : public ControllerEnumerator { libusb_context* m_context; UserSettingsPointer m_pConfig; }; - -#endif diff --git a/src/controllers/bulk/bulksupported.h b/src/controllers/bulk/bulksupported.h index d79ad88f7b..1ffbc3509a 100644 --- a/src/controllers/bulk/bulksupported.h +++ b/src/controllers/bulk/bulksupported.h @@ -1,12 +1,6 @@ -/** -* @file bulksupported.h -* @author Neale Picket neale@woozle.org -* @date Thu Jun 28 2012 -* @brief A list of supported USB bulk devices -*/ +// A list of supported USB bulk devices -#ifndef BULKSUPPORTED_H -#define BULKSUPPORTED_H +#pragma once typedef struct bulk_supported { unsigned short vendor_id; @@ -22,5 +16,3 @@ static bulk_supported_t bulk_supported[] = { {0x06f8, 0xb120, 0x82, 0x03}, // Hercules MP3 LE / Glow {0, 0, 0, 0} }; - -#endif |