Remove RGB controllers argument from standard detector

Controllers/AsusTUFLaptopController/AsusTUFLaptopWMIDetect.cpp

@@ -7,7 +7,7 @@
 #include "wmi.h"
 #include <string>
 
-static void DetectAsusTUFLaptopWMIControllers(std::vector<RGBController*>&)
+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

Controllers/AsusTUFLaptopLinuxController/AsusTUFLaptopLinuxDetect.cpp

@@ -5,7 +5,7 @@
 #include "Detector.h"
 #include <unistd.h>
 
-static void DetectAsusTUFLaptopLinuxControllers(std::vector<RGBController*>&)
+static void DetectAsusTUFLaptopLinuxControllers()
 {
     /*-------------------------------------------------------------------------------------*\
     | If /sys/devices/platform/asus-nb-wmi/leds/asus::kbd_backlight/kbd_rgb_mode exists,    |

Controllers/BlinkyTapeController/BlinkyTapeControllerDetect.cpp

@@ -19,7 +19,7 @@
 *                                                                                          *
 \******************************************************************************************/
 
-void DetectBlinkyTapeControllers(std::vector<RGBController*> &rgb_controllers)
+void DetectBlinkyTapeControllers()
 {
     std::vector<std::string *> device_locations = find_usb_serial_port(BLINKINLABS_VID, BLINKYTAPE_PID);
 

Controllers/CorsairHydro2Controller/CorsairHydro2ControllerDetect.cpp

@@ -20,7 +20,7 @@
 #define CORSAIR_VID     0x1B1C
 #define H100I_V2_PID    0x0C09
 
-void DetectCorsairHydro2Controllers(std::vector<RGBController*>& rgb_controllers)
+void DetectCorsairHydro2Controllers()
 {
     libusb_init(NULL);
 

Controllers/CorsairHydroController/CorsairHydroControllerDetect.cpp

@@ -49,7 +49,7 @@ static const corsair_hydro_device device_list[] =
 *                                                                                          *
 \******************************************************************************************/
 
-void DetectCorsairHydroControllers(std::vector<RGBController*>& rgb_controllers)
+void DetectCorsairHydroControllers()
 {
     libusb_init(NULL);
 

Controllers/DebugController/DebugControllerDetect.cpp

@@ -201,7 +201,7 @@ static const char *led_names[] =
 *                                                                                          *
 \******************************************************************************************/
 
-void DetectDebugControllers(std::vector<RGBController*> &rgb_controllers)
+void DetectDebugControllers()
 {
     json            debug_settings;
 

Controllers/DygmaRaiseController/DygmaRaiseControllerDetect.cpp

@@ -19,7 +19,7 @@
 *                                                                                          *
 \******************************************************************************************/
 
-void DetectDygmaRaiseControllers(std::vector<RGBController*> &rgb_controllers)
+void DetectDygmaRaiseControllers()
 {
     std::vector<std::string *> ports = find_usb_serial_port(DYGMA_RAISE_VID, DYGMA_RAISE_PID);
 

Controllers/E131Controller/E131ControllerDetect.cpp

@@ -20,7 +20,7 @@
 *                                                                                          *
 \******************************************************************************************/
 
-void DetectE131Controllers(std::vector<RGBController*> &rgb_controllers)
+void DetectE131Controllers()
 {
     json                e131_settings;
 

Controllers/ENESMBusController/XPGSpectrixS40GDetect.cpp

@@ -20,7 +20,7 @@
 *                                                                                          *
 \******************************************************************************************/
 
-void DetectSpectrixS40GControllers(std::vector<RGBController*>& rgb_controllers)
+void DetectSpectrixS40GControllers()
 {
     /*---------------------------------------------------------------------*\
     | Search for /dev/nvmeX nodes with model matching "XPG SPECTRIX S40G"   |

Controllers/ENESMBusController/XPGSpectrixS40GDetect_Windows.cpp

@@ -92,7 +92,7 @@ HANDLE OpenDevice(wchar_t buff[MAX_PATH])
 *                                                                                          *
 \******************************************************************************************/
 
-void DetectSpectrixS40GControllers(std::vector<RGBController*>& rgb_controllers)
+void DetectSpectrixS40GControllers()
 {
     /*-------------------------------------------------------------------------------------------------*\
     | https://docs.microsoft.com/en-us/windows-hardware/drivers/install/identifiers-for-scsi-devices    |

Controllers/ElgatoKeyLightController/ElgatoKeyLightControllerDetect.cpp

@@ -15,7 +15,7 @@
 *                                                                                          *
 \******************************************************************************************/
 
-void DetectElgatoKeyLightControllers(std::vector<RGBController*> &rgb_controllers)
+void DetectElgatoKeyLightControllers()
 {
     json                    elgato_keylight_settings;
 

Controllers/EspurnaController/EspurnaControllerDetect.cpp

@@ -15,7 +15,7 @@
 *                                                                                          *
 \******************************************************************************************/
 
-void DetectEspurnaControllers(std::vector<RGBController*> &rgb_controllers)
+void DetectEspurnaControllers()
 {
     json espurna_settings;
 

Controllers/FanBusController/FanBusControllerDetect.cpp

@@ -2,7 +2,7 @@
 #include "FanBusController.h"
 #include "RGBController_FanBus.h"
 
-void DetectFanBusControllers(std::vector<RGBController*> &rgb_controllers)
+void DetectFanBusControllers()
 {
     FanBusInterface*    new_interface;
     json                fanbus_settings;

Controllers/FaustusController/RGBController_Faustus.cpp

@@ -153,7 +153,7 @@ void RGBController_Faustus::DeviceUpdateMode()
     DeviceUpdateLEDs();
 }
 
-void DetectFaustusControllers(std::vector<RGBController*> &rgb_controllers)
+void DetectFaustusControllers()
 {
     const char* base_path = "/sys/devices/platform/faustus/kbbl";
     DIR* dir = opendir(base_path);

Controllers/GigabyteSuperIORGBController/GigabyteSuperIORGBControllerDetect.cpp

@@ -28,7 +28,7 @@ static gig_device compatible_devices[] =
     {"X570 UD"}
 };
 
-void DetectGigabyteSuperIORGBControllers(std::vector<RGBController*> &rgb_controllers)
+void DetectGigabyteSuperIORGBControllers()
 {
     int sio_addrs[2] = {0x2E, 0x4E};
 

Controllers/LEDStripController/LEDStripControllerDetect.cpp

@@ -15,7 +15,7 @@
 *                                                                                          *
 \******************************************************************************************/
 
-void DetectLEDStripControllers(std::vector<RGBController*> &rgb_controllers)
+void DetectLEDStripControllers()
 {
     json                    ledstrip_settings;
     LEDStripDevice          dev;

Controllers/LIFXController/LIFXControllerDetect.cpp

@@ -15,7 +15,7 @@
 *                                                                                          *
 \******************************************************************************************/
 
-void DetectLIFXControllers(std::vector<RGBController*> &rgb_controllers)
+void DetectLIFXControllers()
 {
     json                    lifx_settings;
 

Controllers/LianLiController/LianLiControllerDetect.cpp

@@ -56,7 +56,7 @@
 | requires libusb as hidapi provides no wIndex customization.                  |
 \*----------------------------------------------------------------------------*/
 
-void DetectLianLiUniHub(std::vector<RGBController*>&)
+void DetectLianLiUniHub()
 {
     libusb_device** devices = nullptr;
 
@@ -102,7 +102,7 @@ void DetectLianLiUniHub(std::vector<RGBController*>&)
     }
 }
 
-void DetectLianLiUniHub_AL10(std::vector<RGBController*>&)
+void DetectLianLiUniHub_AL10()
 {
     libusb_device** devices = nullptr;
 

Controllers/LinuxLEDController/LinuxLEDControllerDetect.cpp

@@ -18,7 +18,7 @@
 *                                                                                          *
 \******************************************************************************************/
 
-void DetectLinuxLEDControllers(std::vector<RGBController*> &rgb_controllers)
+void DetectLinuxLEDControllers()
 {
     json                    linux_led_settings;
 

Controllers/MSIRGBController/MSIRGBControllerDetect.cpp

@@ -77,7 +77,7 @@ static msi_device compatible_devices[] =
     {"7B87", true },
 };
 
-void DetectMSIRGBControllers(std::vector<RGBController*> &rgb_controllers)
+void DetectMSIRGBControllers()
 {
     int sio_addrs[2] = {0x2E, 0x4E};
 

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<RGBController*> &rgb_controllers)
+void DetectNVIDIAIllumGPUs()
 {
     static NV_PHYSICAL_GPU_HANDLE   gpu_handles[64];
     static NV_S32                   gpu_count = 0;

Controllers/NZXTHuePlusController/NZXTHuePlusControllerDetect.cpp

@@ -16,7 +16,7 @@
 *                                                                                          *
 \******************************************************************************************/
 
-void DetectNZXTHuePlusControllers(std::vector<RGBController*> &/*rgb_controllers*/)
+void DetectNZXTHuePlusControllers()
 {
     std::vector<std::string *> ports = find_usb_serial_port(NZXT_HUE_PLUS_VID, NZXT_HUE_PLUS_PID);
 

Controllers/NanoleafController/NanoleafControllerDetect.cpp

@@ -11,7 +11,7 @@
 |                                                                                          |
 \*----------------------------------------------------------------------------------------*/
 
-void DetectNanoleafControllers(std::vector<RGBController*> &rgb_controllers)
+void DetectNanoleafControllers()
 {
     json nanoleaf_settings = ResourceManager::get()->GetSettingsManager()->GetSettings("NanoleafDevices");
 

Controllers/OpenRazerController/OpenRazerDetect.cpp

@@ -19,7 +19,7 @@
 *                                                                                          *
 \******************************************************************************************/
 
-void DetectOpenRazerControllers(std::vector<RGBController*> &rgb_controllers)
+void DetectOpenRazerControllers()
 {
     char driver_path[512];
     DIR *dir;

Controllers/OpenRazerController/OpenRazerWindowsDetect.cpp

@@ -110,7 +110,7 @@ static void load_device_fn(device_fn_type* device_fn, device* dev)
 *                                                                                          *
 \******************************************************************************************/
 
-void DetectOpenRazerControllers(std::vector<RGBController*> &rgb_controllers)
+void DetectOpenRazerControllers()
 {
     static HMODULE module = LoadLibrary(OPENRAZERDLL);
 

Controllers/PhilipsHueController/PhilipsHueControllerDetect.cpp

@@ -23,7 +23,7 @@
 *                                                                                          *
 \******************************************************************************************/
 
-void DetectPhilipsHueControllers(std::vector<RGBController*>& rgb_controllers)
+void DetectPhilipsHueControllers()
 {
     json                    hue_settings;
 
@@ -210,11 +210,11 @@ void DetectPhilipsHueControllers(std::vector<RGBController*>& 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;
                             }
                         }

Controllers/PhilipsWizController/PhilipsWizControllerDetect.cpp

@@ -15,7 +15,7 @@
 *                                                                                          *
 \******************************************************************************************/
 
-void DetectPhilipsWizControllers(std::vector<RGBController*> &rgb_controllers)
+void DetectPhilipsWizControllers()
 {
     json                    wiz_settings;
 

Controllers/YeelightController/YeelightControllerDetect.cpp

@@ -15,7 +15,7 @@
 *                                                                                          *
 \******************************************************************************************/
 
-void DetectYeelightControllers(std::vector<RGBController*> &rgb_controllers)
+void DetectYeelightControllers()
 {
     json                    yeelight_settings;
 

ResourceManager.cpp

@@ -1461,26 +1461,10 @@ void ResourceManager::DetectDevicesThreadFunction()
         {
             DetectionProgressChanged();
 
-            device_detectors[detector_idx](rgb_controllers_hw);
+            device_detectors[detector_idx]();
         }
 
-        /*-------------------------------------------------*\
+        if(rgb_controllers_hw.size() == detection_prev_size)
-        | 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
         {
             LOG_DEBUG("[%s] no devices found", detection_string);
         }

ResourceManager.h

@@ -35,7 +35,7 @@
 struct hid_device_info;
 
 typedef std::function<bool()>                                                               I2CBusDetectorFunction;
-typedef std::function<void(std::vector<RGBController*>&)>                                   DeviceDetectorFunction;
+typedef std::function<void()>                                                               DeviceDetectorFunction;
 typedef std::function<void(std::vector<i2c_smbus_interface*>&)>                             I2CDeviceDetectorFunction;
 typedef std::function<void(i2c_smbus_interface*, uint8_t, const std::string&)>              I2CPCIDeviceDetectorFunction;
 typedef std::function<void(hid_device_info*, const std::string&)>                           HIDDeviceDetectorFunction;