summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoerg <JoergAtGithub@worldwartweb.com>2023-05-13 10:58:14 +0200
committerJoerg <JoergAtGithub@worldwartweb.com>2023-05-13 10:58:14 +0200
commitaf6e60ac48b20f5d7b097976680992350bce3fac (patch)
treeaa5243307db68a74a8c50a53ef8b4a8a6010b608
parent95adfcac5ca916057b11dce0213183a356e0ccf4 (diff)
Clarified that array contains the ReportID
-rw-r--r--src/controllers/hid/hidioglobaloutputreportfifo.cpp9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/controllers/hid/hidioglobaloutputreportfifo.cpp b/src/controllers/hid/hidioglobaloutputreportfifo.cpp
index 8198341f7c..c8cb0c958f 100644
--- a/src/controllers/hid/hidioglobaloutputreportfifo.cpp
+++ b/src/controllers/hid/hidioglobaloutputreportfifo.cpp
@@ -59,7 +59,8 @@ bool HidIoGlobalOutputReportFifo::sendNextReportDataset(QMutex* pHidDeviceAndPol
return false;
}
- QByteArray dataToSend(std::move(*pFront));
+ // Array containing the ReportID byte followed by the data to be send
+ QByteArray reportToSend(std::move(*pFront));
m_fifoQueue.pop();
auto hidDeviceLock = lockMutex(pHidDeviceAndPollMutex);
@@ -67,8 +68,8 @@ bool HidIoGlobalOutputReportFifo::sendNextReportDataset(QMutex* pHidDeviceAndPol
// hid_write can take several milliseconds, because hidapi synchronizes
// the asyncron HID communication from the OS
int result = hid_write(pHidDevice,
- reinterpret_cast<const unsigned char*>(dataToSend.constData()),
- dataToSend.size());
+ reinterpret_cast<const unsigned char*>(reportToSend.constData()),
+ reportToSend.size());
if (result == -1) {
qCWarning(logOutput) << "Unable to send data to" << deviceInfo.formatName() << ":"
<< mixxx::convertWCStringToQString(
@@ -81,7 +82,7 @@ bool HidIoGlobalOutputReportFifo::sendNextReportDataset(QMutex* pHidDeviceAndPol
if (result != -1) {
qCDebug(logOutput) << "t:" << startOfHidWrite.formatMillisWithUnit()
<< " " << result << "bytes (including ReportID of"
- << static_cast<quint8>(dataToSend[0])
+ << static_cast<quint8>(reportToSend[0])
<< ") sent from non-skipping FIFO - Needed: "
<< (mixxx::Time::elapsed() - startOfHidWrite)
.formatMicrosWithUnit();