From 9caf7802ed98322f722810044b3ed20040d6ca79 Mon Sep 17 00:00:00 2001 From: Adam Honse Date: Sun, 14 Aug 2022 18:49:33 -0500 Subject: [PATCH] Remove SetCustomMode from all controllers beginning with the letter M --- .../RGBController_MSI3Zone.cpp | 5 ---- .../RGBController_MSI3Zone.h | 1 - .../MSIGPUController/RGBController_MSIGPU.cpp | 5 ---- .../MSIGPUController/RGBController_MSIGPU.h | 2 -- .../RGBController_MSIMysticLight162.cpp | 5 ---- .../RGBController_MSIMysticLight162.h | 23 ++++--------------- .../RGBController_MSIMysticLight185.cpp | 5 ---- .../RGBController_MSIMysticLight185.h | 23 ++++--------------- .../RGBController_MSIOptix.cpp | 5 ---- .../RGBController_MSIOptix.h | 3 ++- .../MSIRGBController/RGBController_MSIRGB.cpp | 13 ++++------- .../MSIRGBController/RGBController_MSIRGB.h | 6 ++--- .../RGBController_MSIVigorGK30.cpp | 5 ---- .../RGBController_MSIVigorGK30.h | 3 ++- 14 files changed, 18 insertions(+), 86 deletions(-) diff --git a/Controllers/MSI3ZoneController/RGBController_MSI3Zone.cpp b/Controllers/MSI3ZoneController/RGBController_MSI3Zone.cpp index 877fa1ab2..8d6d22ecf 100644 --- a/Controllers/MSI3ZoneController/RGBController_MSI3Zone.cpp +++ b/Controllers/MSI3ZoneController/RGBController_MSI3Zone.cpp @@ -113,11 +113,6 @@ void RGBController_MSI3Zone::UpdateSingleLED(int /*led*/) controller->SetLEDs(colors); } -void RGBController_MSI3Zone::SetCustomMode() -{ - -} - void RGBController_MSI3Zone::DeviceUpdateMode() { diff --git a/Controllers/MSI3ZoneController/RGBController_MSI3Zone.h b/Controllers/MSI3ZoneController/RGBController_MSI3Zone.h index d1a1d6457..9d61e6590 100644 --- a/Controllers/MSI3ZoneController/RGBController_MSI3Zone.h +++ b/Controllers/MSI3ZoneController/RGBController_MSI3Zone.h @@ -25,7 +25,6 @@ public: void UpdateZoneLEDs(int zone); void UpdateSingleLED(int led); - void SetCustomMode(); void DeviceUpdateMode(); private: diff --git a/Controllers/MSIGPUController/RGBController_MSIGPU.cpp b/Controllers/MSIGPUController/RGBController_MSIGPU.cpp index 91ac4b11f..c890e9205 100644 --- a/Controllers/MSIGPUController/RGBController_MSIGPU.cpp +++ b/Controllers/MSIGPUController/RGBController_MSIGPU.cpp @@ -420,11 +420,6 @@ void RGBController_MSIGPU::UpdateSingleLED(int /*led*/) DeviceUpdateLEDs(); } -void RGBController_MSIGPU::SetCustomMode() -{ - active_mode = 2; //Set to MSI_GPU_MODE_STATIC -} - void RGBController_MSIGPU::DeviceUpdateMode() { if (modes[active_mode].flags & MODE_FLAG_HAS_BRIGHTNESS) diff --git a/Controllers/MSIGPUController/RGBController_MSIGPU.h b/Controllers/MSIGPUController/RGBController_MSIGPU.h index 3cd5c15a7..9bcdf5612 100644 --- a/Controllers/MSIGPUController/RGBController_MSIGPU.h +++ b/Controllers/MSIGPUController/RGBController_MSIGPU.h @@ -17,14 +17,12 @@ public: ~RGBController_MSIGPU(); void SetupZones(); - void ResizeZone(int zone, int new_size); void DeviceUpdateLEDs(); void UpdateZoneLEDs(int zone); void UpdateSingleLED(int led); - void SetCustomMode(); void DeviceUpdateMode(); void DeviceSaveMode(); diff --git a/Controllers/MSIMysticLightController/RGBController_MSIMysticLight162.cpp b/Controllers/MSIMysticLightController/RGBController_MSIMysticLight162.cpp index 1f30c9ed9..4a1ce5ef8 100644 --- a/Controllers/MSIMysticLightController/RGBController_MSIMysticLight162.cpp +++ b/Controllers/MSIMysticLightController/RGBController_MSIMysticLight162.cpp @@ -159,11 +159,6 @@ void RGBController_MSIMysticLight162::ResizeZone { } -void RGBController_MSIMysticLight162::SetCustomMode() -{ - active_mode = 0; -} - void RGBController_MSIMysticLight162::DeviceUpdateLEDs() { for(std::size_t zone_idx = 0; zone_idx < zones.size(); ++zone_idx) diff --git a/Controllers/MSIMysticLightController/RGBController_MSIMysticLight162.h b/Controllers/MSIMysticLightController/RGBController_MSIMysticLight162.h index a51cd5f93..381b11715 100644 --- a/Controllers/MSIMysticLightController/RGBController_MSIMysticLight162.h +++ b/Controllers/MSIMysticLightController/RGBController_MSIMysticLight162.h @@ -15,31 +15,16 @@ class RGBController_MSIMysticLight162: public RGBController { public: - RGBController_MSIMysticLight162 - ( - MSIMysticLight162Controller* controller_ptr - ); + RGBController_MSIMysticLight162(MSIMysticLight162Controller* controller_ptr); ~RGBController_MSIMysticLight162(); void SetupZones(); - - void ResizeZone - ( - int zone, - int new_size - ); + void ResizeZone(int zone, int new_size); void DeviceUpdateLEDs(); - void UpdateZoneLEDs - ( - int zone - ); - void UpdateSingleLED - ( - int led - ); + void UpdateZoneLEDs(int zone); + void UpdateSingleLED(int led); - void SetCustomMode(); void DeviceUpdateMode(); void DeviceSaveMode(); diff --git a/Controllers/MSIMysticLightController/RGBController_MSIMysticLight185.cpp b/Controllers/MSIMysticLightController/RGBController_MSIMysticLight185.cpp index fa2252849..7d453b5cf 100644 --- a/Controllers/MSIMysticLightController/RGBController_MSIMysticLight185.cpp +++ b/Controllers/MSIMysticLightController/RGBController_MSIMysticLight185.cpp @@ -219,11 +219,6 @@ void RGBController_MSIMysticLight185::ResizeZone } } -void RGBController_MSIMysticLight185::SetCustomMode() -{ - active_mode = 0; -} - void RGBController_MSIMysticLight185::DeviceUpdateLEDs() { for(std::size_t zone_idx = 0; zone_idx < zones.size(); ++zone_idx) diff --git a/Controllers/MSIMysticLightController/RGBController_MSIMysticLight185.h b/Controllers/MSIMysticLightController/RGBController_MSIMysticLight185.h index 9a629d0c5..9c96b2a10 100644 --- a/Controllers/MSIMysticLightController/RGBController_MSIMysticLight185.h +++ b/Controllers/MSIMysticLightController/RGBController_MSIMysticLight185.h @@ -16,31 +16,16 @@ class RGBController_MSIMysticLight185: public RGBController { public: - RGBController_MSIMysticLight185 - ( - MSIMysticLight185Controller* controller_ptr - ); + RGBController_MSIMysticLight185(MSIMysticLight185Controller* controller_ptr); ~RGBController_MSIMysticLight185(); void SetupZones(); - - void ResizeZone - ( - int zone, - int new_size - ); + void ResizeZone(int zone, int new_size); void DeviceUpdateLEDs(); - void UpdateZoneLEDs - ( - int zone - ); - void UpdateSingleLED - ( - int led - ); + void UpdateZoneLEDs(int zone); + void UpdateSingleLED(int led); - void SetCustomMode(); void DeviceUpdateMode(); void DeviceSaveMode(); diff --git a/Controllers/MSIOptixController/RGBController_MSIOptix.cpp b/Controllers/MSIOptixController/RGBController_MSIOptix.cpp index 22446c415..3b28106cc 100644 --- a/Controllers/MSIOptixController/RGBController_MSIOptix.cpp +++ b/Controllers/MSIOptixController/RGBController_MSIOptix.cpp @@ -382,11 +382,6 @@ void RGBController_MSIOptix::UpdateSingleLED(int led) UpdateZoneLEDs(led); } -void RGBController_MSIOptix::SetCustomMode() -{ - active_mode = 0; -} - void RGBController_MSIOptix::DeviceUpdateMode() { if(modes[active_mode].flags & MODE_FLAG_HAS_PER_LED_COLOR) diff --git a/Controllers/MSIOptixController/RGBController_MSIOptix.h b/Controllers/MSIOptixController/RGBController_MSIOptix.h index 641620577..74f3ca014 100644 --- a/Controllers/MSIOptixController/RGBController_MSIOptix.h +++ b/Controllers/MSIOptixController/RGBController_MSIOptix.h @@ -20,11 +20,12 @@ public: void SetupZones(); void ResizeZone(int zone, int new_size); + void DeviceUpdateLEDs(); void UpdateZoneLEDs(int zone); void UpdateSingleLED(int led); + void DeviceUpdateMode(); - void SetCustomMode(); private: MSIOptixController* controller; diff --git a/Controllers/MSIRGBController/RGBController_MSIRGB.cpp b/Controllers/MSIRGBController/RGBController_MSIRGB.cpp index 523073cf1..b3bf98053 100644 --- a/Controllers/MSIRGBController/RGBController_MSIRGB.cpp +++ b/Controllers/MSIRGBController/RGBController_MSIRGB.cpp @@ -19,9 +19,9 @@ @comment \*-------------------------------------------------------------------*/ -RGBController_MSIRGB::RGBController_MSIRGB(MSIRGBController* msi_ptr) +RGBController_MSIRGB::RGBController_MSIRGB(MSIRGBController* controller_ptr) { - msi = msi_ptr; + controller = controller_ptr; name = "MSI Motherboard"; vendor = "MSI"; @@ -40,7 +40,7 @@ RGBController_MSIRGB::RGBController_MSIRGB(MSIRGBController* msi_ptr) RGBController_MSIRGB::~RGBController_MSIRGB() { - delete msi; + delete controller; } void RGBController_MSIRGB::SetupZones() @@ -73,7 +73,7 @@ void RGBController_MSIRGB::DeviceUpdateLEDs() unsigned char grn = RGBGetGValue(color); unsigned char blu = RGBGetBValue(color); - msi->SetColor(red, grn, blu); + controller->SetColor(red, grn, blu); } void RGBController_MSIRGB::UpdateZoneLEDs(int /*zone*/) @@ -86,11 +86,6 @@ void RGBController_MSIRGB::UpdateSingleLED(int /*led*/) DeviceUpdateLEDs(); } -void RGBController_MSIRGB::SetCustomMode() -{ - -} - void RGBController_MSIRGB::DeviceUpdateMode() { diff --git a/Controllers/MSIRGBController/RGBController_MSIRGB.h b/Controllers/MSIRGBController/RGBController_MSIRGB.h index c7c727e65..ef77243c8 100644 --- a/Controllers/MSIRGBController/RGBController_MSIRGB.h +++ b/Controllers/MSIRGBController/RGBController_MSIRGB.h @@ -13,20 +13,18 @@ class RGBController_MSIRGB : public RGBController { public: - RGBController_MSIRGB(MSIRGBController* msi_ptr); + RGBController_MSIRGB(MSIRGBController* controller_ptr); ~RGBController_MSIRGB(); void SetupZones(); - void ResizeZone(int zone, int new_size); void DeviceUpdateLEDs(); void UpdateZoneLEDs(int zone); void UpdateSingleLED(int led); - void SetCustomMode(); void DeviceUpdateMode(); private: - MSIRGBController* msi; + MSIRGBController* controller; }; diff --git a/Controllers/MSIVigorController/RGBController_MSIVigorGK30.cpp b/Controllers/MSIVigorController/RGBController_MSIVigorGK30.cpp index 324f98798..c9c969a3d 100644 --- a/Controllers/MSIVigorController/RGBController_MSIVigorGK30.cpp +++ b/Controllers/MSIVigorController/RGBController_MSIVigorGK30.cpp @@ -195,11 +195,6 @@ void RGBController_MSIVigorGK30::UpdateSingleLED(int /*led*/) ); } -void RGBController_MSIVigorGK30::SetCustomMode() -{ - active_mode = 0; -} - void RGBController_MSIVigorGK30::DeviceUpdateMode() { DeviceUpdateLEDs(); diff --git a/Controllers/MSIVigorController/RGBController_MSIVigorGK30.h b/Controllers/MSIVigorController/RGBController_MSIVigorGK30.h index 9ca3f6478..8fdb60c7f 100644 --- a/Controllers/MSIVigorController/RGBController_MSIVigorGK30.h +++ b/Controllers/MSIVigorController/RGBController_MSIVigorGK30.h @@ -20,11 +20,12 @@ public: void SetupZones(); void ResizeZone(int zone, int new_size); + void DeviceUpdateLEDs(); void UpdateZoneLEDs(int zone); void UpdateSingleLED(int led); + void DeviceUpdateMode(); - void SetCustomMode(); private: MSIVigorGK30Controller* controller;