Minor code-style changes:

- The color transformation list now retains order. - The output vector of the corsair SDK is now reserved with the highest led count available. (possible minor performance boost)
MartB · Sep 5, 2018 · ed1126a · ed1126a
1 parent c146da3
commit ed1126a
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 5 deletions.
diff --git a/server-exe/CorsairSDK.cpp b/server-exe/CorsairSDK.cpp
@@ -62,6 +62,7 @@ bool CorsairSDK::initialize() {
  } 
  }
 
+ size_t maxLeds = 0;
  for (auto i = 0; i < devCount; i++) {
  const CorsairDeviceInfo* devInfo = CorsairGetDeviceInfo(i);
 
@@ -122,9 +123,16 @@ bool CorsairSDK::initialize() {
  continue;
  }
 
+ // Get the max number of leds so we can later reserve the output color vector.
+ const auto ledCount = ledVector.size();
+ if (ledCount > maxLeds) {
+ maxLeds = ledCount;
+ }
+
  enableSupportFor(devType);
  }
 
+ m_outputColorVector.reserve(maxLeds);
  return true;
 }
 
@@ -170,7 +178,7 @@ RZRESULT CorsairSDK::playEffect(RETCDeviceType deviceType, int effectType, const
  }
 
  CorsairSetLedsColors(static_cast<int>(m_outputColorVector.size()), m_outputColorVector.data());
- m_outputColorVector.resize(0);
+ m_outputColorVector.clear(); // resize(0) not needed anymore standard states capacity remains unchanged.
 
  if (const auto error = CorsairGetLastError()) {
  LOG_D("{0}", errToString(error));

diff --git a/server-exe/LightingSDK.h b/server-exe/LightingSDK.h
@@ -2,13 +2,15 @@
 // PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com
 
 #pragma once
+#include <set>
+#include <algorithm>
+
 #include "../rpc-midl/rpc_retc.h"
 #include "SDKLoader.h"
 #include "commonData.h"
 #include "RzErrors.h"
 #include "RzChromaSDKDefines.h"
 #include "RzChromaSDKTypes.h"
-#include <algorithm>
 #include "colorTransformation.h"
 #include "gammaTransformation.h"
 
@@ -70,7 +72,7 @@ class LightingSDK {
  // Gamma adjustment
  auto gammaTransformationValues = CONFIG->GetVec3D(SDK_CONFIG_SECTION, L"gamma_adjustment", Vec3D());
  if (!gammaTransformationValues.isZero()) { // Skip the transformation if we got the default vector.
- m_activeColorTransformations.push_back(std::make_unique<GammaTransformation>(gammaTransformationValues));
+ m_activeColorTransformations.insert(std::make_unique<GammaTransformation>(gammaTransformationValues));
  }
 
  return true;
@@ -138,7 +140,7 @@ class LightingSDK {
  supportArray_t m_supportedDevices;
 
  // Color transformation
- std::vector<std::unique_ptr<ColorTransformation>> m_activeColorTransformations;
+ std::set<std::unique_ptr<ColorTransformation>> m_activeColorTransformations;
 
 private:
  SDKLoader* m_sdkLoader;

diff --git a/server-exe/SDKManager.cpp b/server-exe/SDKManager.cpp
@@ -106,7 +106,7 @@ void SDKManager::checkAvailability() {
  }
 
  // Force enable the mousepad support if a headset_stand is connected, this does not assign a sdk!
- if (m_clientConfig->supportedDeviceTypes[MOUSEPAD] == FALSE && m_clientConfig->supportedDeviceTypes[HEADSET_STAND] == TRUE) {
+ if (m_clientConfig->supportedDeviceTypes[MOUSEPAD] == FALSE && m_clientConfig->supportedDeviceTypes[HEADSET_STAND] != FALSE) {
  m_clientConfig->supportedDeviceTypes[MOUSEPAD] = TRUE;
  }