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

Add detector names and display them in the progress bar

Browse source
This commit is contained in:
Adam Honse 2020-08-06 15:18:32 -05:00
parent 75899f973b
commit f716a05947
50 changed files with 80 additions and 56 deletions
Download patch file Download diff file Expand all files Collapse all files

17
ResourceManager.cpp
View file

@ -53,13 +53,15 @@ void ResourceManager::RegisterI2CBusDetector(I2CBusDetectorFunction detector)
i2c_bus_detectors.push_back(detector);
}
void ResourceManager::RegisterI2CDeviceDetector(I2CDeviceDetectorFunction detector)
void ResourceManager::RegisterI2CDeviceDetector(std::string name, I2CDeviceDetectorFunction detector)
{
i2c_device_detector_strings.push_back(name);
i2c_device_detectors.push_back(detector);
}
void ResourceManager::RegisterDeviceDetector(DeviceDetectorFunction detector)
void ResourceManager::RegisterDeviceDetector(std::string name, DeviceDetectorFunction detector)
{
device_detector_strings.push_back(name);
device_detectors.push_back(detector);
}
@ -89,6 +91,11 @@ unsigned int ResourceManager::GetDetectionPercent()
return(detection_percent);
}
std::string ResourceManager::GetDetectionString()
{
return(detection_string);
}
void ResourceManager::DetectDevices()
{
/*-------------------------------------------------*\
@ -122,6 +129,9 @@ void ResourceManager::DetectDevicesThreadFunction()
\*-------------------------------------------------*/
for(int i2c_detector_idx = 0; i2c_detector_idx < i2c_device_detectors.size(); i2c_detector_idx++)
{
detection_string = i2c_device_detector_strings[i2c_detector_idx];
DeviceListChanged();
i2c_device_detectors[i2c_detector_idx](busses, rgb_controllers);
/*-------------------------------------------------*\
@ -144,6 +154,9 @@ void ResourceManager::DetectDevicesThreadFunction()
\*-------------------------------------------------*/
for(int detector_idx = 0; detector_idx < device_detectors.size(); detector_idx++)
{
detection_string = device_detector_strings[detector_idx];
DeviceListChanged();
device_detectors[detector_idx](rgb_controllers);
/*-------------------------------------------------*\