Revert "Fixing deprecated calls" (incompatible with older libusb)

This reverts commit 49757bd.
fpoussin · Aug 6, 2019 · a96a698 · a96a698
1 parent 49757bd
commit a96a698
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/src/usb/qusbdevice.cpp b/src/usb/qusbdevice.cpp
@@ -208,7 +208,7 @@ QUsbDevice::IdList QUsbDevice::devices()
     libusb_context *ctx;
 
     libusb_init(&ctx);
-    libusb_set_option(ctx, LIBUSB_OPTION_LOG_LEVEL, LIBUSB_LOG_LEVEL_NONE);
+    libusb_set_debug(ctx, LIBUSB_LOG_LEVEL_NONE);
     cnt = libusb_get_device_list(ctx, &devs); // get the list of devices
     if (cnt < 0) {
         qCritical("libusb_get_device_list Error");
@@ -365,9 +365,9 @@ void QUsbDevice::setLogLevel(LogLevel level)
     Q_D(QUsbDevice);
     m_log_level = level;
     if (level >= logDebugAll)
-        libusb_set_option(d->m_ctx, LIBUSB_OPTION_LOG_LEVEL, LIBUSB_LOG_LEVEL_DEBUG);
+        libusb_set_debug(d->m_ctx, LIBUSB_LOG_LEVEL_DEBUG);
     else
-        libusb_set_option(d->m_ctx, LIBUSB_OPTION_LOG_LEVEL, LIBUSB_LOG_LEVEL_NONE);
+        libusb_set_debug(d->m_ctx, LIBUSB_LOG_LEVEL_NONE);
 }
 
 /*!

diff --git a/src/usb/qusbinfo.cpp b/src/usb/qusbinfo.cpp
@@ -140,7 +140,7 @@ QUsbInfo::QUsbInfo(QObject *parent)
         return;
     }
 
-    libusb_set_option(d->m_ctx, LIBUSB_OPTION_LOG_LEVEL, LIBUSB_LOG_LEVEL_WARNING);
+    libusb_set_debug(d->m_ctx, LIBUSB_LOG_LEVEL_WARNING);
 
     // Populate list once
     m_system_list = QUsbDevice::devices();
@@ -292,9 +292,9 @@ void QUsbInfo::setLogLevel(QUsbDevice::LogLevel level)
     Q_D(QUsbInfo);
     m_log_level = level;
     if (m_log_level >= QUsbDevice::logDebug)
-        libusb_set_option(d->m_ctx, LIBUSB_OPTION_LOG_LEVEL, LIBUSB_LOG_LEVEL_DEBUG);
+        libusb_set_debug(d->m_ctx, LIBUSB_LOG_LEVEL_DEBUG);
     else
-        libusb_set_option(d->m_ctx, LIBUSB_OPTION_LOG_LEVEL, LIBUSB_LOG_LEVEL_WARNING);
+        libusb_set_debug(d->m_ctx, LIBUSB_LOG_LEVEL_WARNING);
 }
 
 /*!