Increase minimum hidapi to 0.11.2, which solves the FIXME from mixxxd…

…j#4054.
JoergAtGithub · May 30, 2022 · 5b9ace7 · 5b9ace7
1 parent f027cd0
commit 5b9ace7
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -2792,7 +2792,9 @@ find_package(LibUSB)
 # USB HID controller support
 option(HID "USB HID controller support" ON)
 if(HID)
-  find_package(hidapi 0.10.1)
+  # hidapi 0.11.2 is the first release, that implements hid_get_input_report
+  # for the Linux hidraw backend.
+  find_package(hidapi 0.11.2)
   if(NOT hidapi_FOUND)
     message(STATUS "Linking internal libhidapi statically")
     add_library(mixxx-hidapi STATIC EXCLUDE_FROM_ALL)

diff --git a/src/controllers/hid/hidiothread.cpp b/src/controllers/hid/hidiothread.cpp
@@ -148,8 +148,6 @@ QByteArray HidIoThread::getInputReport(quint8 reportID) {
     auto hidDeviceLock = lockMutex(&m_hidDeviceAndPollMutex);
 
     m_pPollData[m_pollingBufferIndex][0] = reportID;
-    // FIXME: implement upstream for hidraw backend on Linux
-    // https://github.com/libusb/hidapi/issues/259
     int bytesRead = hid_get_input_report(
             m_pHidDevice, m_pPollData[m_pollingBufferIndex], kBufferSize);
     if (bytesRead <= kReportIdSize) {