jalr/OpenRGB
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use NULL (shared) libusb context

Browse source
This commit is contained in:
Adam Honse 2021-04-19 18:30:31 -05:00
parent 0da484bffc
commit f06b0ee952
2 changed files with 5 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Controllers/CorsairHydroController/CorsairHydroControllerDetect.cpp
View file

@ -47,16 +47,15 @@ static const corsair_hydro_device device_list[] =
void DetectCorsairHydroControllers(std::vector<RGBController*>& rgb_controllers) void DetectCorsairHydroControllers(std::vector<RGBController*>& rgb_controllers)
{ {
libusb_context * ctx; libusb_init(NULL);
libusb_init(&ctx);
#ifdef _WIN32 #ifdef _WIN32
libusb_set_option(ctx, LIBUSB_OPTION_USE_USBDK); libusb_set_option(NULL, LIBUSB_OPTION_USE_USBDK);
#endif #endif
for(std::size_t device_idx = 0; device_idx < CORSAIR_NUM_DEVICES; device_idx++) for(std::size_t device_idx = 0; device_idx < CORSAIR_NUM_DEVICES; device_idx++)
{ {
libusb_device_handle * dev = libusb_open_device_with_vid_pid(ctx, device_list[device_idx].usb_vid, device_list[device_idx].usb_pid); libusb_device_handle * dev = libusb_open_device_with_vid_pid(NULL, device_list[device_idx].usb_vid, device_list[device_idx].usb_pid);
//Look for Corsair RGB Peripheral //Look for Corsair RGB Peripheral
if(dev) if(dev)

6
Controllers/LianLiController/LianLiControllerDetect.cpp
View file

@ -28,19 +28,17 @@
void DetectLianLiUniHub(std::vector<RGBController*>&) void DetectLianLiUniHub(std::vector<RGBController*>&)
{ {
libusb_context * ctx;
libusb_device** devices = nullptr; libusb_device** devices = nullptr;
int ret; int ret;
ret = libusb_init(&ctx); ret = libusb_init(NULL);
if(ret < 0) if(ret < 0)
{ {
return; return;
} }
ret = libusb_get_device_list(ctx, &devices); ret = libusb_get_device_list(NULL, &devices);
if(ret < 0) if(ret < 0)
{ {
return; return;