mirror of
https://github.com/CalcProgrammer1/OpenRGB.git
synced 2026-04-04 06:11:07 -04:00
RGBController API Overhaul
* Reorganize and clean up RGBController API functions
* Add functions to get protected RGBController member values
* Make NetworkClient, ProfileManager, and ResourceManager friend classes so they can access protected members
* Protected previously-public RGBController members
* Information strings (name, vendor, description, version, serial location)
* Device type
* Active mode
* Flags
* LEDs vector
* LED alternate names vector
* Modes vector
* Colors vector
* Zones vector
* Add CONTROLLER_FLAG_HIDDEN to allow plugins to hide controllers from control GUI
* Add update reason codes to RGBController update callback and signal updates on more RGBController events
* Add loop zone types and segmented zone type
* Add matrix map field to segments
* Rework matrix_map_type from using pointers to vector to prevent memory leaks
* Rework KeyboardLayoutManager to return new matrix_map_type
* Add access mutex to RGBController API
* Add per-zone modes ot RGBController API
* Add JSON description functions to RGBController API
This commit is contained in:
@@ -239,13 +239,6 @@ RGBController_XPGSummoner::RGBController_XPGSummoner(XPGSummonerController *cont
|
||||
\*---------------------------------------------------------*/
|
||||
RGBController_XPGSummoner::~RGBController_XPGSummoner()
|
||||
{
|
||||
for(unsigned int zone_index = 0; zone_index < zones.size(); zone_index++)
|
||||
{
|
||||
if(zones[zone_index].matrix_map != NULL)
|
||||
{
|
||||
delete zones[zone_index].matrix_map;
|
||||
}
|
||||
}
|
||||
delete controller;
|
||||
}
|
||||
|
||||
@@ -270,15 +263,9 @@ void RGBController_XPGSummoner::SetupZones()
|
||||
|
||||
if(new_zone.type == ZONE_TYPE_MATRIX)
|
||||
{
|
||||
new_zone.matrix_map = new matrix_map_type;
|
||||
new_zone.matrix_map->height = 6;
|
||||
new_zone.matrix_map->width = 21;
|
||||
new_zone.matrix_map->map = (unsigned int *)&ordered_matrix;
|
||||
}
|
||||
else
|
||||
{
|
||||
new_zone.matrix_map = NULL;
|
||||
new_zone.matrix_map.Set(6, 21, (unsigned int *)&ordered_matrix);
|
||||
}
|
||||
|
||||
zones.push_back(new_zone);
|
||||
|
||||
size_t linear_idx = 0;
|
||||
@@ -301,14 +288,6 @@ void RGBController_XPGSummoner::SetupZones()
|
||||
SetupColors();
|
||||
}
|
||||
|
||||
/*---------------------------------------------------------*\
|
||||
| ResizeZone: Not supported for this device |
|
||||
\*---------------------------------------------------------*/
|
||||
void RGBController_XPGSummoner::ResizeZone(int /*zone*/, int /*new_size*/)
|
||||
{
|
||||
// This device does not support resizing zones
|
||||
}
|
||||
|
||||
/*---------------------------------------------------------*\
|
||||
| DeviceUpdateLEDs: Updates LED colors |
|
||||
\*---------------------------------------------------------*/
|
||||
@@ -405,17 +384,17 @@ void RGBController_XPGSummoner::DeviceUpdateLEDs()
|
||||
}
|
||||
|
||||
/*---------------------------------------------------------*\
|
||||
| UpdateZoneLEDs: Updates all LEDs in a zone |
|
||||
| DeviceUpdateZoneLEDs: Updates all LEDs in a zone |
|
||||
\*---------------------------------------------------------*/
|
||||
void RGBController_XPGSummoner::UpdateZoneLEDs(int /*zone*/)
|
||||
void RGBController_XPGSummoner::DeviceUpdateZoneLEDs(int /*zone*/)
|
||||
{
|
||||
DeviceUpdateLEDs();
|
||||
}
|
||||
|
||||
/*---------------------------------------------------------*\
|
||||
| UpdateSingleLED: Updates a single LED |
|
||||
| DeviceUpdateSingleLED: Updates a single LED |
|
||||
\*---------------------------------------------------------*/
|
||||
void RGBController_XPGSummoner::UpdateSingleLED(int /*led*/)
|
||||
void RGBController_XPGSummoner::DeviceUpdateSingleLED(int /*led*/)
|
||||
{
|
||||
DeviceUpdateLEDs();
|
||||
}
|
||||
@@ -427,4 +406,3 @@ void RGBController_XPGSummoner::DeviceUpdateMode()
|
||||
{
|
||||
DeviceUpdateLEDs();
|
||||
}
|
||||
|
||||
|
||||
@@ -21,10 +21,11 @@ public:
|
||||
~RGBController_XPGSummoner();
|
||||
|
||||
void SetupZones();
|
||||
void ResizeZone(int zone, int new_size);
|
||||
|
||||
void DeviceUpdateLEDs();
|
||||
void UpdateZoneLEDs(int zone);
|
||||
void UpdateSingleLED(int led);
|
||||
void DeviceUpdateZoneLEDs(int zone);
|
||||
void DeviceUpdateSingleLED(int led);
|
||||
|
||||
void DeviceUpdateMode();
|
||||
|
||||
private:
|
||||
|
||||
Reference in New Issue
Block a user