From 92f07206393c876419ef0a5a3487871857c9553a Mon Sep 17 00:00:00 2001 From: Adam Honse Date: Thu, 26 Jan 2023 20:19:45 -0600 Subject: [PATCH] Remove RGB controllers argument from standard detector --- .../AsusTUFLaptopWMIDetect.cpp | 2 +- .../AsusTUFLaptopLinuxDetect.cpp | 2 +- .../BlinkyTapeControllerDetect.cpp | 2 +- .../CorsairHydro2ControllerDetect.cpp | 2 +- .../CorsairHydroControllerDetect.cpp | 2 +- .../DebugController/DebugControllerDetect.cpp | 2 +- .../DygmaRaiseControllerDetect.cpp | 2 +- .../E131Controller/E131ControllerDetect.cpp | 2 +- .../XPGSpectrixS40GDetect.cpp | 2 +- .../XPGSpectrixS40GDetect_Windows.cpp | 2 +- .../ElgatoKeyLightControllerDetect.cpp | 2 +- .../EspurnaControllerDetect.cpp | 2 +- .../FanBusControllerDetect.cpp | 2 +- .../RGBController_Faustus.cpp | 2 +- .../GigabyteSuperIORGBControllerDetect.cpp | 2 +- .../LEDStripControllerDetect.cpp | 2 +- .../LIFXController/LIFXControllerDetect.cpp | 2 +- .../LianLiControllerDetect.cpp | 4 ++-- .../LinuxLEDControllerDetect.cpp | 2 +- .../MSIRGBControllerDetect.cpp | 2 +- .../NVIDIAIlluminationControllerDetect.cpp | 2 +- .../NZXTHuePlusControllerDetect.cpp | 2 +- .../NanoleafControllerDetect.cpp | 2 +- .../OpenRazerController/OpenRazerDetect.cpp | 2 +- .../OpenRazerWindowsDetect.cpp | 2 +- .../PhilipsHueControllerDetect.cpp | 8 ++++---- .../PhilipsWizControllerDetect.cpp | 2 +- .../YeelightControllerDetect.cpp | 2 +- ResourceManager.cpp | 20 ++----------------- ResourceManager.h | 2 +- 30 files changed, 35 insertions(+), 51 deletions(-) diff --git a/Controllers/AsusTUFLaptopController/AsusTUFLaptopWMIDetect.cpp b/Controllers/AsusTUFLaptopController/AsusTUFLaptopWMIDetect.cpp index 45d03a99..db9ff7f8 100644 --- a/Controllers/AsusTUFLaptopController/AsusTUFLaptopWMIDetect.cpp +++ b/Controllers/AsusTUFLaptopController/AsusTUFLaptopWMIDetect.cpp @@ -7,7 +7,7 @@ #include "wmi.h" #include -static void DetectAsusTUFLaptopWMIControllers(std::vector&) +static void DetectAsusTUFLaptopWMIControllers() { // Try to retrieve ProductID / Device name from WMI; Possibly can be rewritten to use wmi.cpp // IF you encounter false detection ( e.g. if your laptop keyboard backlight uses USB interface diff --git a/Controllers/AsusTUFLaptopLinuxController/AsusTUFLaptopLinuxDetect.cpp b/Controllers/AsusTUFLaptopLinuxController/AsusTUFLaptopLinuxDetect.cpp index 4e73df45..bbb93164 100644 --- a/Controllers/AsusTUFLaptopLinuxController/AsusTUFLaptopLinuxDetect.cpp +++ b/Controllers/AsusTUFLaptopLinuxController/AsusTUFLaptopLinuxDetect.cpp @@ -5,7 +5,7 @@ #include "Detector.h" #include -static void DetectAsusTUFLaptopLinuxControllers(std::vector&) +static void DetectAsusTUFLaptopLinuxControllers() { /*-------------------------------------------------------------------------------------*\ | If /sys/devices/platform/asus-nb-wmi/leds/asus::kbd_backlight/kbd_rgb_mode exists, | diff --git a/Controllers/BlinkyTapeController/BlinkyTapeControllerDetect.cpp b/Controllers/BlinkyTapeController/BlinkyTapeControllerDetect.cpp index 3c57b3a0..1415dedf 100644 --- a/Controllers/BlinkyTapeController/BlinkyTapeControllerDetect.cpp +++ b/Controllers/BlinkyTapeController/BlinkyTapeControllerDetect.cpp @@ -19,7 +19,7 @@ * * \******************************************************************************************/ -void DetectBlinkyTapeControllers(std::vector &rgb_controllers) +void DetectBlinkyTapeControllers() { std::vector device_locations = find_usb_serial_port(BLINKINLABS_VID, BLINKYTAPE_PID); diff --git a/Controllers/CorsairHydro2Controller/CorsairHydro2ControllerDetect.cpp b/Controllers/CorsairHydro2Controller/CorsairHydro2ControllerDetect.cpp index 6ec36d39..62018d67 100644 --- a/Controllers/CorsairHydro2Controller/CorsairHydro2ControllerDetect.cpp +++ b/Controllers/CorsairHydro2Controller/CorsairHydro2ControllerDetect.cpp @@ -20,7 +20,7 @@ #define CORSAIR_VID 0x1B1C #define H100I_V2_PID 0x0C09 -void DetectCorsairHydro2Controllers(std::vector& rgb_controllers) +void DetectCorsairHydro2Controllers() { libusb_init(NULL); diff --git a/Controllers/CorsairHydroController/CorsairHydroControllerDetect.cpp b/Controllers/CorsairHydroController/CorsairHydroControllerDetect.cpp index 2a7f9fa7..9b8dd62d 100644 --- a/Controllers/CorsairHydroController/CorsairHydroControllerDetect.cpp +++ b/Controllers/CorsairHydroController/CorsairHydroControllerDetect.cpp @@ -49,7 +49,7 @@ static const corsair_hydro_device device_list[] = * * \******************************************************************************************/ -void DetectCorsairHydroControllers(std::vector& rgb_controllers) +void DetectCorsairHydroControllers() { libusb_init(NULL); diff --git a/Controllers/DebugController/DebugControllerDetect.cpp b/Controllers/DebugController/DebugControllerDetect.cpp index 3550f067..59adc3d4 100644 --- a/Controllers/DebugController/DebugControllerDetect.cpp +++ b/Controllers/DebugController/DebugControllerDetect.cpp @@ -201,7 +201,7 @@ static const char *led_names[] = * * \******************************************************************************************/ -void DetectDebugControllers(std::vector &rgb_controllers) +void DetectDebugControllers() { json debug_settings; diff --git a/Controllers/DygmaRaiseController/DygmaRaiseControllerDetect.cpp b/Controllers/DygmaRaiseController/DygmaRaiseControllerDetect.cpp index aa095985..33f4b1c8 100644 --- a/Controllers/DygmaRaiseController/DygmaRaiseControllerDetect.cpp +++ b/Controllers/DygmaRaiseController/DygmaRaiseControllerDetect.cpp @@ -19,7 +19,7 @@ * * \******************************************************************************************/ -void DetectDygmaRaiseControllers(std::vector &rgb_controllers) +void DetectDygmaRaiseControllers() { std::vector ports = find_usb_serial_port(DYGMA_RAISE_VID, DYGMA_RAISE_PID); diff --git a/Controllers/E131Controller/E131ControllerDetect.cpp b/Controllers/E131Controller/E131ControllerDetect.cpp index 15298194..68235644 100644 --- a/Controllers/E131Controller/E131ControllerDetect.cpp +++ b/Controllers/E131Controller/E131ControllerDetect.cpp @@ -20,7 +20,7 @@ * * \******************************************************************************************/ -void DetectE131Controllers(std::vector &rgb_controllers) +void DetectE131Controllers() { json e131_settings; diff --git a/Controllers/ENESMBusController/XPGSpectrixS40GDetect.cpp b/Controllers/ENESMBusController/XPGSpectrixS40GDetect.cpp index c14f7c0b..c6c765ef 100644 --- a/Controllers/ENESMBusController/XPGSpectrixS40GDetect.cpp +++ b/Controllers/ENESMBusController/XPGSpectrixS40GDetect.cpp @@ -20,7 +20,7 @@ * * \******************************************************************************************/ -void DetectSpectrixS40GControllers(std::vector& rgb_controllers) +void DetectSpectrixS40GControllers() { /*---------------------------------------------------------------------*\ | Search for /dev/nvmeX nodes with model matching "XPG SPECTRIX S40G" | diff --git a/Controllers/ENESMBusController/XPGSpectrixS40GDetect_Windows.cpp b/Controllers/ENESMBusController/XPGSpectrixS40GDetect_Windows.cpp index d07fe156..072d52a4 100644 --- a/Controllers/ENESMBusController/XPGSpectrixS40GDetect_Windows.cpp +++ b/Controllers/ENESMBusController/XPGSpectrixS40GDetect_Windows.cpp @@ -92,7 +92,7 @@ HANDLE OpenDevice(wchar_t buff[MAX_PATH]) * * \******************************************************************************************/ -void DetectSpectrixS40GControllers(std::vector& rgb_controllers) +void DetectSpectrixS40GControllers() { /*-------------------------------------------------------------------------------------------------*\ | https://docs.microsoft.com/en-us/windows-hardware/drivers/install/identifiers-for-scsi-devices | diff --git a/Controllers/ElgatoKeyLightController/ElgatoKeyLightControllerDetect.cpp b/Controllers/ElgatoKeyLightController/ElgatoKeyLightControllerDetect.cpp index 3d8481cc..a68605c5 100644 --- a/Controllers/ElgatoKeyLightController/ElgatoKeyLightControllerDetect.cpp +++ b/Controllers/ElgatoKeyLightController/ElgatoKeyLightControllerDetect.cpp @@ -15,7 +15,7 @@ * * \******************************************************************************************/ -void DetectElgatoKeyLightControllers(std::vector &rgb_controllers) +void DetectElgatoKeyLightControllers() { json elgato_keylight_settings; diff --git a/Controllers/EspurnaController/EspurnaControllerDetect.cpp b/Controllers/EspurnaController/EspurnaControllerDetect.cpp index 5113003f..160108d9 100644 --- a/Controllers/EspurnaController/EspurnaControllerDetect.cpp +++ b/Controllers/EspurnaController/EspurnaControllerDetect.cpp @@ -15,7 +15,7 @@ * * \******************************************************************************************/ -void DetectEspurnaControllers(std::vector &rgb_controllers) +void DetectEspurnaControllers() { json espurna_settings; diff --git a/Controllers/FanBusController/FanBusControllerDetect.cpp b/Controllers/FanBusController/FanBusControllerDetect.cpp index 517d1f9b..1de05f24 100644 --- a/Controllers/FanBusController/FanBusControllerDetect.cpp +++ b/Controllers/FanBusController/FanBusControllerDetect.cpp @@ -2,7 +2,7 @@ #include "FanBusController.h" #include "RGBController_FanBus.h" -void DetectFanBusControllers(std::vector &rgb_controllers) +void DetectFanBusControllers() { FanBusInterface* new_interface; json fanbus_settings; diff --git a/Controllers/FaustusController/RGBController_Faustus.cpp b/Controllers/FaustusController/RGBController_Faustus.cpp index b4d80cae..1ae028ff 100644 --- a/Controllers/FaustusController/RGBController_Faustus.cpp +++ b/Controllers/FaustusController/RGBController_Faustus.cpp @@ -153,7 +153,7 @@ void RGBController_Faustus::DeviceUpdateMode() DeviceUpdateLEDs(); } -void DetectFaustusControllers(std::vector &rgb_controllers) +void DetectFaustusControllers() { const char* base_path = "/sys/devices/platform/faustus/kbbl"; DIR* dir = opendir(base_path); diff --git a/Controllers/GigabyteSuperIORGBController/GigabyteSuperIORGBControllerDetect.cpp b/Controllers/GigabyteSuperIORGBController/GigabyteSuperIORGBControllerDetect.cpp index e8104d75..0ca0e77c 100644 --- a/Controllers/GigabyteSuperIORGBController/GigabyteSuperIORGBControllerDetect.cpp +++ b/Controllers/GigabyteSuperIORGBController/GigabyteSuperIORGBControllerDetect.cpp @@ -28,7 +28,7 @@ static gig_device compatible_devices[] = {"X570 UD"} }; -void DetectGigabyteSuperIORGBControllers(std::vector &rgb_controllers) +void DetectGigabyteSuperIORGBControllers() { int sio_addrs[2] = {0x2E, 0x4E}; diff --git a/Controllers/LEDStripController/LEDStripControllerDetect.cpp b/Controllers/LEDStripController/LEDStripControllerDetect.cpp index 94d83b40..3ecd3527 100644 --- a/Controllers/LEDStripController/LEDStripControllerDetect.cpp +++ b/Controllers/LEDStripController/LEDStripControllerDetect.cpp @@ -15,7 +15,7 @@ * * \******************************************************************************************/ -void DetectLEDStripControllers(std::vector &rgb_controllers) +void DetectLEDStripControllers() { json ledstrip_settings; LEDStripDevice dev; diff --git a/Controllers/LIFXController/LIFXControllerDetect.cpp b/Controllers/LIFXController/LIFXControllerDetect.cpp index 22600d8f..a9ddf44b 100644 --- a/Controllers/LIFXController/LIFXControllerDetect.cpp +++ b/Controllers/LIFXController/LIFXControllerDetect.cpp @@ -15,7 +15,7 @@ * * \******************************************************************************************/ -void DetectLIFXControllers(std::vector &rgb_controllers) +void DetectLIFXControllers() { json lifx_settings; diff --git a/Controllers/LianLiController/LianLiControllerDetect.cpp b/Controllers/LianLiController/LianLiControllerDetect.cpp index 0a937a60..325a31fa 100644 --- a/Controllers/LianLiController/LianLiControllerDetect.cpp +++ b/Controllers/LianLiController/LianLiControllerDetect.cpp @@ -56,7 +56,7 @@ | requires libusb as hidapi provides no wIndex customization. | \*----------------------------------------------------------------------------*/ -void DetectLianLiUniHub(std::vector&) +void DetectLianLiUniHub() { libusb_device** devices = nullptr; @@ -102,7 +102,7 @@ void DetectLianLiUniHub(std::vector&) } } -void DetectLianLiUniHub_AL10(std::vector&) +void DetectLianLiUniHub_AL10() { libusb_device** devices = nullptr; diff --git a/Controllers/LinuxLEDController/LinuxLEDControllerDetect.cpp b/Controllers/LinuxLEDController/LinuxLEDControllerDetect.cpp index e7f34c12..eb488b86 100644 --- a/Controllers/LinuxLEDController/LinuxLEDControllerDetect.cpp +++ b/Controllers/LinuxLEDController/LinuxLEDControllerDetect.cpp @@ -18,7 +18,7 @@ * * \******************************************************************************************/ -void DetectLinuxLEDControllers(std::vector &rgb_controllers) +void DetectLinuxLEDControllers() { json linux_led_settings; diff --git a/Controllers/MSIRGBController/MSIRGBControllerDetect.cpp b/Controllers/MSIRGBController/MSIRGBControllerDetect.cpp index 56f325f0..756ca30e 100644 --- a/Controllers/MSIRGBController/MSIRGBControllerDetect.cpp +++ b/Controllers/MSIRGBController/MSIRGBControllerDetect.cpp @@ -77,7 +77,7 @@ static msi_device compatible_devices[] = {"7B87", true }, }; -void DetectMSIRGBControllers(std::vector &rgb_controllers) +void DetectMSIRGBControllers() { int sio_addrs[2] = {0x2E, 0x4E}; diff --git a/Controllers/NVIDIAIlluminationController/NVIDIAIlluminationControllerDetect.cpp b/Controllers/NVIDIAIlluminationController/NVIDIAIlluminationControllerDetect.cpp index 4c97bc1f..37eaa980 100644 --- a/Controllers/NVIDIAIlluminationController/NVIDIAIlluminationControllerDetect.cpp +++ b/Controllers/NVIDIAIlluminationController/NVIDIAIlluminationControllerDetect.cpp @@ -61,7 +61,7 @@ static const gpu_pci_device device_list[] = {NVIDIA_VEN, NVIDIA_RTX4090_DEV, NVIDIA_VEN, NVIDIA_RTX4090_FE_SUB_DEV, NVIDIA_ILLUMINATION_V1, TREATS_RGBW_AS_RGBW, "NVIDIA 4090 FE" }, }; -void DetectNVIDIAIllumGPUs(std::vector &rgb_controllers) +void DetectNVIDIAIllumGPUs() { static NV_PHYSICAL_GPU_HANDLE gpu_handles[64]; static NV_S32 gpu_count = 0; diff --git a/Controllers/NZXTHuePlusController/NZXTHuePlusControllerDetect.cpp b/Controllers/NZXTHuePlusController/NZXTHuePlusControllerDetect.cpp index 59828042..6bc2ae0d 100644 --- a/Controllers/NZXTHuePlusController/NZXTHuePlusControllerDetect.cpp +++ b/Controllers/NZXTHuePlusController/NZXTHuePlusControllerDetect.cpp @@ -16,7 +16,7 @@ * * \******************************************************************************************/ -void DetectNZXTHuePlusControllers(std::vector &/*rgb_controllers*/) +void DetectNZXTHuePlusControllers() { std::vector ports = find_usb_serial_port(NZXT_HUE_PLUS_VID, NZXT_HUE_PLUS_PID); diff --git a/Controllers/NanoleafController/NanoleafControllerDetect.cpp b/Controllers/NanoleafController/NanoleafControllerDetect.cpp index dd9eb935..5f7ae49f 100644 --- a/Controllers/NanoleafController/NanoleafControllerDetect.cpp +++ b/Controllers/NanoleafController/NanoleafControllerDetect.cpp @@ -11,7 +11,7 @@ | | \*----------------------------------------------------------------------------------------*/ -void DetectNanoleafControllers(std::vector &rgb_controllers) +void DetectNanoleafControllers() { json nanoleaf_settings = ResourceManager::get()->GetSettingsManager()->GetSettings("NanoleafDevices"); diff --git a/Controllers/OpenRazerController/OpenRazerDetect.cpp b/Controllers/OpenRazerController/OpenRazerDetect.cpp index 56254580..9c02f1af 100644 --- a/Controllers/OpenRazerController/OpenRazerDetect.cpp +++ b/Controllers/OpenRazerController/OpenRazerDetect.cpp @@ -19,7 +19,7 @@ * * \******************************************************************************************/ -void DetectOpenRazerControllers(std::vector &rgb_controllers) +void DetectOpenRazerControllers() { char driver_path[512]; DIR *dir; diff --git a/Controllers/OpenRazerController/OpenRazerWindowsDetect.cpp b/Controllers/OpenRazerController/OpenRazerWindowsDetect.cpp index db644cbc..bc092bf5 100644 --- a/Controllers/OpenRazerController/OpenRazerWindowsDetect.cpp +++ b/Controllers/OpenRazerController/OpenRazerWindowsDetect.cpp @@ -110,7 +110,7 @@ static void load_device_fn(device_fn_type* device_fn, device* dev) * * \******************************************************************************************/ -void DetectOpenRazerControllers(std::vector &rgb_controllers) +void DetectOpenRazerControllers() { static HMODULE module = LoadLibrary(OPENRAZERDLL); diff --git a/Controllers/PhilipsHueController/PhilipsHueControllerDetect.cpp b/Controllers/PhilipsHueController/PhilipsHueControllerDetect.cpp index 2e15c6fa..9d78c52f 100644 --- a/Controllers/PhilipsHueController/PhilipsHueControllerDetect.cpp +++ b/Controllers/PhilipsHueController/PhilipsHueControllerDetect.cpp @@ -23,7 +23,7 @@ * * \******************************************************************************************/ -void DetectPhilipsHueControllers(std::vector& rgb_controllers) +void DetectPhilipsHueControllers() { json hue_settings; @@ -210,11 +210,11 @@ void DetectPhilipsHueControllers(std::vector& rgb_controllers) \*-------------------------------------------------*/ if(auto_connect) { - for(unsigned int controller_idx = 0; controller_idx < rgb_controllers.size(); controller_idx++) + for(unsigned int controller_idx = 0; controller_idx < ResourceManager::get()->GetRGBControllers().size(); controller_idx++) { - if(rgb_controllers[controller_idx]->description == "Philips Hue Entertainment Mode Device") + if(ResourceManager::get()->GetRGBControllers()[controller_idx]->description == "Philips Hue Entertainment Mode Device") { - rgb_controllers[controller_idx]->SetMode(0); + ResourceManager::get()->GetRGBControllers()[controller_idx]->SetMode(0); break; } } diff --git a/Controllers/PhilipsWizController/PhilipsWizControllerDetect.cpp b/Controllers/PhilipsWizController/PhilipsWizControllerDetect.cpp index 024f65d8..83c8d77d 100644 --- a/Controllers/PhilipsWizController/PhilipsWizControllerDetect.cpp +++ b/Controllers/PhilipsWizController/PhilipsWizControllerDetect.cpp @@ -15,7 +15,7 @@ * * \******************************************************************************************/ -void DetectPhilipsWizControllers(std::vector &rgb_controllers) +void DetectPhilipsWizControllers() { json wiz_settings; diff --git a/Controllers/YeelightController/YeelightControllerDetect.cpp b/Controllers/YeelightController/YeelightControllerDetect.cpp index 85b5c6af..9dca69a6 100644 --- a/Controllers/YeelightController/YeelightControllerDetect.cpp +++ b/Controllers/YeelightController/YeelightControllerDetect.cpp @@ -15,7 +15,7 @@ * * \******************************************************************************************/ -void DetectYeelightControllers(std::vector &rgb_controllers) +void DetectYeelightControllers() { json yeelight_settings; diff --git a/ResourceManager.cpp b/ResourceManager.cpp index 89dde34b..0c9c8939 100644 --- a/ResourceManager.cpp +++ b/ResourceManager.cpp @@ -1461,26 +1461,10 @@ void ResourceManager::DetectDevicesThreadFunction() { DetectionProgressChanged(); - device_detectors[detector_idx](rgb_controllers_hw); + device_detectors[detector_idx](); } - /*-------------------------------------------------*\ - | If the device list size has changed, call the | - | device list changed callbacks | - \*-------------------------------------------------*/ - if(rgb_controllers_hw.size() != detection_prev_size) - { - /*-------------------------------------------------*\ - | First, load sizes for the new controllers | - \*-------------------------------------------------*/ - for(unsigned int controller_size_idx = detection_prev_size; controller_size_idx < rgb_controllers_hw.size(); controller_size_idx++) - { - profile_manager->LoadDeviceFromListWithOptions(rgb_controllers_sizes, detection_size_entry_used, rgb_controllers_hw[controller_size_idx], true, false); - } - - UpdateDeviceList(); - } - else + if(rgb_controllers_hw.size() == detection_prev_size) { LOG_DEBUG("[%s] no devices found", detection_string); } diff --git a/ResourceManager.h b/ResourceManager.h index e81e1f3b..6939ba30 100644 --- a/ResourceManager.h +++ b/ResourceManager.h @@ -35,7 +35,7 @@ struct hid_device_info; typedef std::function I2CBusDetectorFunction; -typedef std::function&)> DeviceDetectorFunction; +typedef std::function DeviceDetectorFunction; typedef std::function&)> I2CDeviceDetectorFunction; typedef std::function I2CPCIDeviceDetectorFunction; typedef std::function HIDDeviceDetectorFunction;