Streamlined device loading/handling in device providers

RGB.NET.Devices.Corsair/CorsairDeviceProvider.cs

@@ -15,7 +15,7 @@ namespace RGB.NET.Devices.Corsair
     /// <summary>
     /// Represents a device provider responsible for corsair (CUE) devices.
     /// </summary>
-    public class CorsairDeviceProvider : IRGBDeviceProvider
+    public class CorsairDeviceProvider : AbstractRGBDeviceProvider
     {
         #region Properties & Fields
 
@@ -37,12 +37,6 @@ namespace RGB.NET.Devices.Corsair
         /// </summary>
         public static List<string> PossibleX64NativePaths { get; } = new() { "x64/CUESDK.dll", "x64/CUESDK_2015.dll", "x64/CUESDK_2013.dll" };
 
-        /// <inheritdoc />
-        /// <summary>
-        /// Indicates if the SDK is initialized and ready to use.
-        /// </summary>
-        public bool IsInitialized { get; private set; }
-
         /// <summary>
         /// Gets the protocol details for the current SDK-connection.
         /// </summary>
@@ -53,14 +47,6 @@ namespace RGB.NET.Devices.Corsair
         /// </summary>
         public CorsairError LastError => _CUESDK.CorsairGetLastError();
 
-        /// <inheritdoc />
-        public IEnumerable<IRGBDevice> Devices { get; private set; } = Enumerable.Empty<IRGBDevice>();
-
-        /// <summary>
-        /// The <see cref="DeviceUpdateTrigger"/> used to trigger the updates for corsair devices. 
-        /// </summary>
-        public DeviceUpdateTrigger UpdateTrigger { get; }
-
         #endregion
 
         #region Constructors
@@ -73,156 +59,108 @@ namespace RGB.NET.Devices.Corsair
         {
             if (_instance != null) throw new InvalidOperationException($"There can be only one instance of type {nameof(CorsairDeviceProvider)}");
             _instance = this;
-
-            UpdateTrigger = new DeviceUpdateTrigger();
         }
 
         #endregion
 
         #region Methods
 
-        /// <inheritdoc />
-        /// <exception cref="RGBDeviceException">Thrown if the SDK is already initialized or if the SDK is not compatible to CUE.</exception>
-        /// <exception cref="CUEException">Thrown if the CUE-SDK provides an error.</exception>
-        public bool Initialize(RGBDeviceType loadFilter = RGBDeviceType.All, bool throwExceptions = false)
+        protected override void InitializeSDK()
         {
-            IsInitialized = false;
+            _CUESDK.Reload();
 
-            try
-            {
-                UpdateTrigger.Stop();
+            ProtocolDetails = new CorsairProtocolDetails(_CUESDK.CorsairPerformProtocolHandshake());
 
-                _CUESDK.Reload();
+            CorsairError error = LastError;
+            if (error != CorsairError.Success)
+                Throw(new CUEException(error));
 
-                ProtocolDetails = new CorsairProtocolDetails(_CUESDK.CorsairPerformProtocolHandshake());
+            if (ProtocolDetails.BreakingChanges)
+                Throw(new RGBDeviceException("The SDK currently used isn't compatible with the installed version of CUE.\r\n"
+                                           + $"CUE-Version: {ProtocolDetails.ServerVersion} (Protocol {ProtocolDetails.ServerProtocolVersion})\r\n"
+                                           + $"SDK-Version: {ProtocolDetails.SdkVersion} (Protocol {ProtocolDetails.SdkProtocolVersion})"));
 
-                CorsairError error = LastError;
-                if (error != CorsairError.Success)
-                    throw new CUEException(error);
-
-                if (ProtocolDetails.BreakingChanges)
-                    throw new RGBDeviceException("The SDK currently used isn't compatible with the installed version of CUE.\r\n"
-                                              + $"CUE-Version: {ProtocolDetails.ServerVersion} (Protocol {ProtocolDetails.ServerProtocolVersion})\r\n"
-                                              + $"SDK-Version: {ProtocolDetails.SdkVersion} (Protocol {ProtocolDetails.SdkProtocolVersion})");
-
-                // DarthAffe 02.02.2021: 127 is iCUE
-                if (!_CUESDK.CorsairSetLayerPriority(128))
-                    throw new CUEException(LastError);
-
-                Dictionary<string, int> modelCounter = new();
-                IList<IRGBDevice> devices = new List<IRGBDevice>();
-                int deviceCount = _CUESDK.CorsairGetDeviceCount();
-                for (int i = 0; i < deviceCount; i++)
-                {
-                    try
-                    {
-                        _CorsairDeviceInfo nativeDeviceInfo = (_CorsairDeviceInfo)Marshal.PtrToStructure(_CUESDK.CorsairGetDeviceInfo(i), typeof(_CorsairDeviceInfo))!;
-                        CorsairRGBDeviceInfo info = new(i, RGBDeviceType.Unknown, nativeDeviceInfo, modelCounter);
-                        if (!info.CapsMask.HasFlag(CorsairDeviceCaps.Lighting))
-                            continue; // Everything that doesn't support lighting control is useless
-
-                        CorsairDeviceUpdateQueue? deviceUpdateQueue = null;
-                        foreach (ICorsairRGBDevice device in GetRGBDevice(info, i, nativeDeviceInfo, modelCounter))
-                        {
-                            if ((device == null) || !loadFilter.HasFlag(device.DeviceInfo.DeviceType)) continue;
-
-                            deviceUpdateQueue ??= new CorsairDeviceUpdateQueue(UpdateTrigger, info.CorsairDeviceIndex);
-
-                            device.Initialize(deviceUpdateQueue);
-
-                            error = LastError;
-                            if (error != CorsairError.Success)
-                                throw new CUEException(error);
-
-                            devices.Add(device);
-                        }
-                    }
-                    catch { if (throwExceptions) throw; }
-                }
-
-                UpdateTrigger.Start();
-
-                Devices = new ReadOnlyCollection<IRGBDevice>(devices);
-                IsInitialized = true;
-            }
-            catch
-            {
-                Reset();
-                if (throwExceptions) throw;
-                return false;
-            }
-
-            return true;
+            // DarthAffe 02.02.2021: 127 is iCUE
+            if (!_CUESDK.CorsairSetLayerPriority(128))
+                Throw(new CUEException(LastError));
         }
 
-        private static IEnumerable<ICorsairRGBDevice> GetRGBDevice(CorsairRGBDeviceInfo info, int i, _CorsairDeviceInfo nativeDeviceInfo, Dictionary<string, int> modelCounter)
+        protected override IEnumerable<IRGBDevice> LoadDevices()
         {
-            switch (info.CorsairDeviceType)
+            Dictionary<string, int> modelCounter = new();
+            int deviceCount = _CUESDK.CorsairGetDeviceCount();
+            for (int i = 0; i < deviceCount; i++)
             {
-                case CorsairDeviceType.Keyboard:
-                    yield return new CorsairKeyboardRGBDevice(new CorsairKeyboardRGBDeviceInfo(i, nativeDeviceInfo, modelCounter));
-                    break;
+                _CorsairDeviceInfo nativeDeviceInfo = (_CorsairDeviceInfo)Marshal.PtrToStructure(_CUESDK.CorsairGetDeviceInfo(i), typeof(_CorsairDeviceInfo))!;
+                CorsairRGBDeviceInfo info = new(i, RGBDeviceType.Unknown, nativeDeviceInfo, modelCounter);
+                if (!info.CapsMask.HasFlag(CorsairDeviceCaps.Lighting))
+                    continue; // Everything that doesn't support lighting control is useless
 
-                case CorsairDeviceType.Mouse:
-                    yield return new CorsairMouseRGBDevice(new CorsairMouseRGBDeviceInfo(i, nativeDeviceInfo, modelCounter));
-                    break;
+                CorsairDeviceUpdateQueue updateQueue = new(GetUpdateTrigger(), info.CorsairDeviceIndex);
+                switch (info.CorsairDeviceType)
+                {
+                    case CorsairDeviceType.Keyboard:
+                        yield return new CorsairKeyboardRGBDevice(new CorsairKeyboardRGBDeviceInfo(i, nativeDeviceInfo, modelCounter), updateQueue);
+                        break;
 
-                case CorsairDeviceType.Headset:
-                    yield return new CorsairHeadsetRGBDevice(new CorsairHeadsetRGBDeviceInfo(i, nativeDeviceInfo, modelCounter));
-                    break;
+                    case CorsairDeviceType.Mouse:
+                        yield return new CorsairMouseRGBDevice(new CorsairMouseRGBDeviceInfo(i, nativeDeviceInfo, modelCounter), updateQueue);
+                        break;
 
-                case CorsairDeviceType.Mousepad:
-                    yield return new CorsairMousepadRGBDevice(new CorsairMousepadRGBDeviceInfo(i, nativeDeviceInfo, modelCounter));
-                    break;
+                    case CorsairDeviceType.Headset:
+                        yield return new CorsairHeadsetRGBDevice(new CorsairHeadsetRGBDeviceInfo(i, nativeDeviceInfo, modelCounter), updateQueue);
+                        break;
 
-                case CorsairDeviceType.HeadsetStand:
-                    yield return new CorsairHeadsetStandRGBDevice(new CorsairHeadsetStandRGBDeviceInfo(i, nativeDeviceInfo, modelCounter));
-                    break;
+                    case CorsairDeviceType.Mousepad:
+                        yield return new CorsairMousepadRGBDevice(new CorsairMousepadRGBDeviceInfo(i, nativeDeviceInfo, modelCounter), updateQueue);
+                        break;
 
-                case CorsairDeviceType.MemoryModule:
-                    yield return new CorsairMemoryRGBDevice(new CorsairMemoryRGBDeviceInfo(i, nativeDeviceInfo, modelCounter));
-                    break;
+                    case CorsairDeviceType.HeadsetStand:
+                        yield return new CorsairHeadsetStandRGBDevice(new CorsairHeadsetStandRGBDeviceInfo(i, nativeDeviceInfo, modelCounter), updateQueue);
+                        break;
 
-                case CorsairDeviceType.Cooler:
-                case CorsairDeviceType.CommanderPro:
-                case CorsairDeviceType.LightningNodePro:
-                    _CorsairChannelsInfo? channelsInfo = nativeDeviceInfo.channels;
-                    if (channelsInfo != null)
-                    {
-                        IntPtr channelInfoPtr = channelsInfo.channels;
+                    case CorsairDeviceType.MemoryModule:
+                        yield return new CorsairMemoryRGBDevice(new CorsairMemoryRGBDeviceInfo(i, nativeDeviceInfo, modelCounter), updateQueue);
+                        break;
 
-                        for (int channel = 0; channel < channelsInfo.channelsCount; channel++)
+                    case CorsairDeviceType.Cooler:
+                    case CorsairDeviceType.CommanderPro:
+                    case CorsairDeviceType.LightningNodePro:
+                        _CorsairChannelsInfo? channelsInfo = nativeDeviceInfo.channels;
+                        if (channelsInfo != null)
                         {
-                            CorsairLedId referenceLed = GetChannelReferenceId(info.CorsairDeviceType, channel);
-                            if (referenceLed == CorsairLedId.Invalid) continue;
+                            IntPtr channelInfoPtr = channelsInfo.channels;
 
-                            _CorsairChannelInfo channelInfo = (_CorsairChannelInfo)Marshal.PtrToStructure(channelInfoPtr, typeof(_CorsairChannelInfo))!;
-
-                            int channelDeviceInfoStructSize = Marshal.SizeOf(typeof(_CorsairChannelDeviceInfo));
-                            IntPtr channelDeviceInfoPtr = channelInfo.devices;
-
-                            for (int device = 0; device < channelInfo.devicesCount; device++)
+                            for (int channel = 0; channel < channelsInfo.channelsCount; channel++)
                             {
-                                _CorsairChannelDeviceInfo channelDeviceInfo = (_CorsairChannelDeviceInfo)Marshal.PtrToStructure(channelDeviceInfoPtr, typeof(_CorsairChannelDeviceInfo))!;
+                                CorsairLedId referenceLed = GetChannelReferenceId(info.CorsairDeviceType, channel);
+                                if (referenceLed == CorsairLedId.Invalid) continue;
 
-                                yield return new CorsairCustomRGBDevice(new CorsairCustomRGBDeviceInfo(info, nativeDeviceInfo, channelDeviceInfo, referenceLed, modelCounter));
-                                referenceLed += channelDeviceInfo.deviceLedCount;
+                                _CorsairChannelInfo channelInfo = (_CorsairChannelInfo)Marshal.PtrToStructure(channelInfoPtr, typeof(_CorsairChannelInfo))!;
 
-                                channelDeviceInfoPtr = new IntPtr(channelDeviceInfoPtr.ToInt64() + channelDeviceInfoStructSize);
+                                int channelDeviceInfoStructSize = Marshal.SizeOf(typeof(_CorsairChannelDeviceInfo));
+                                IntPtr channelDeviceInfoPtr = channelInfo.devices;
+
+                                for (int device = 0; device < channelInfo.devicesCount; device++)
+                                {
+                                    _CorsairChannelDeviceInfo channelDeviceInfo = (_CorsairChannelDeviceInfo)Marshal.PtrToStructure(channelDeviceInfoPtr, typeof(_CorsairChannelDeviceInfo))!;
+
+                                    yield return new CorsairCustomRGBDevice(new CorsairCustomRGBDeviceInfo(info, nativeDeviceInfo, channelDeviceInfo, referenceLed, modelCounter), updateQueue);
+                                    referenceLed += channelDeviceInfo.deviceLedCount;
+
+                                    channelDeviceInfoPtr = new IntPtr(channelDeviceInfoPtr.ToInt64() + channelDeviceInfoStructSize);
+                                }
+
+                                int channelInfoStructSize = Marshal.SizeOf(typeof(_CorsairChannelInfo));
+                                channelInfoPtr = new IntPtr(channelInfoPtr.ToInt64() + channelInfoStructSize);
                             }
-
-                            int channelInfoStructSize = Marshal.SizeOf(typeof(_CorsairChannelInfo));
-                            channelInfoPtr = new IntPtr(channelInfoPtr.ToInt64() + channelInfoStructSize);
                         }
-                    }
+                        break;
 
-                    break;
-
-
-                // ReSharper disable once RedundantCaseLabel
-                case CorsairDeviceType.Unknown:
-                default:
-                    throw new RGBDeviceException("Unknown Device-Type");
+                    default:
+                        Throw(new RGBDeviceException("Unknown Device-Type"));
+                        break;
+                }
             }
         }
 
@@ -240,23 +178,17 @@ namespace RGB.NET.Devices.Corsair
             };
         }
 
-        private void Reset()
+        protected override void Reset()
         {
             ProtocolDetails = null;
-            Devices = Enumerable.Empty<IRGBDevice>();
-            IsInitialized = false;
+
+            base.Reset();
         }
 
         /// <inheritdoc />
-        public void Dispose()
+        public override void Dispose()
         {
-            try { UpdateTrigger.Dispose(); }
-            catch { /* at least we tried */ }
-
-            foreach (IRGBDevice device in Devices)
-                try { device.Dispose(); }
-                catch { /* at least we tried */ }
-            Devices = Enumerable.Empty<IRGBDevice>();
+            base.Dispose();
 
             try { _CUESDK.UnloadCUESDK(); }
             catch { /* at least we tried */ }

RGB.NET.Devices.Corsair/Custom/CorsairCustomRGBDevice.cs

@@ -25,16 +25,17 @@ namespace RGB.NET.Devices.Corsair
         /// Initializes a new instance of the <see cref="T:RGB.NET.Devices.Corsair.CorsairCustomRGBDevice" /> class.
         /// </summary>
         /// <param name="info">The specific information provided by CUE for the custom-device.</param>
-        internal CorsairCustomRGBDevice(CorsairCustomRGBDeviceInfo info)
-            : base(info)
-        { }
+        internal CorsairCustomRGBDevice(CorsairCustomRGBDeviceInfo info, CorsairDeviceUpdateQueue updateQueue)
+            : base(info, updateQueue)
+        {
+            InitializeLayout();
+        }
 
         #endregion
 
         #region Methods
 
-        /// <inheritdoc />
-        protected override void InitializeLayout()
+        private void InitializeLayout()
         {
             LedId referenceId = GetReferenceLed(DeviceInfo.DeviceType);
 
@@ -45,7 +46,7 @@ namespace RGB.NET.Devices.Corsair
                 AddLed(ledId, new Point(i * 10, 0), new Size(10, 10));
             }
         }
-        
+
         protected override object GetLedCustomData(LedId ledId) => _idMapping.TryGetValue(ledId, out CorsairLedId id) ? id : CorsairLedId.Invalid;
 
         protected virtual LedId GetReferenceLed(RGBDeviceType deviceType)

RGB.NET.Devices.Corsair/Generic/CorsairRGBDevice.cs

@@ -1,99 +1,23 @@
-using System.Collections.Generic;
-using System.Linq;
-using RGB.NET.Core;
+using RGB.NET.Core;
 
 namespace RGB.NET.Devices.Corsair
 {
     /// <inheritdoc cref="AbstractRGBDevice{TDeviceInfo}" />
-    /// <inheritdoc cref="ICorsairRGBDevice" />
     /// <summary>
     /// Represents a generic CUE-device. (keyboard, mouse, headset, mousepad).
     /// </summary>
     public abstract class CorsairRGBDevice<TDeviceInfo> : AbstractRGBDevice<TDeviceInfo>, ICorsairRGBDevice
         where TDeviceInfo : CorsairRGBDeviceInfo
     {
-        #region Properties & Fields
-
-        /// <inheritdoc />
-        /// <summary>
-        /// Gets information about the <see cref="T:RGB.NET.Devices.Corsair.CorsairRGBDevice" />.
-        /// </summary>
-        public override TDeviceInfo DeviceInfo { get; }
-
-        /// <summary>
-        /// Gets a dictionary containing all <see cref="Led"/> of the <see cref="CorsairRGBDevice{TDeviceInfo}"/>.
-        /// </summary>
-        // ReSharper disable once MemberCanBePrivate.Global
-        protected Dictionary<CorsairLedId, Led> InternalLedMapping { get; } = new();
-
-        /// <summary>
-        /// Gets or sets the update queue performing updates for this device.
-        /// </summary>
-        // ReSharper disable once MemberCanBePrivate.Global
-        protected CorsairDeviceUpdateQueue? DeviceUpdateQueue { get; set; }
-
-        #endregion
-
-        #region Indexer
-
-        /// <summary>
-        /// Gets the <see cref="Led"/> with the specified <see cref="CorsairLedId"/>.
-        /// </summary>
-        /// <param name="ledId">The <see cref="CorsairLedId"/> of the <see cref="Led"/> to get.</param>
-        /// <returns>The <see cref="Led"/> with the specified <see cref="CorsairLedId"/> or null if no <see cref="Led"/> is found.</returns>
-        // ReSharper disable once MemberCanBePrivate.Global
-        public Led? this[CorsairLedId ledId] => InternalLedMapping.TryGetValue(ledId, out Led? led) ? led : null;
-
-        #endregion
-
         #region Constructors
 
         /// <summary>
         /// Initializes a new instance of the <see cref="CorsairRGBDevice{TDeviceInfo}"/> class.
         /// </summary>
         /// <param name="info">The generic information provided by CUE for the device.</param>
-        protected CorsairRGBDevice(TDeviceInfo info)
-        {
-            this.DeviceInfo = info;
-        }
-
-        #endregion
-
-        #region Methods
-
-        /// <summary>
-        /// Initializes the device.
-        /// </summary>
-        public void Initialize(CorsairDeviceUpdateQueue deviceUpdateQueue)
-        {
-            DeviceUpdateQueue = deviceUpdateQueue;
-
-            InitializeLayout();
-
-            foreach (Led led in LedMapping.Values)
-            {
-                if (led.CustomData is CorsairLedId ledId && (ledId != CorsairLedId.Invalid))
-                    InternalLedMapping.Add(ledId, led);
-            }
-        }
-
-        /// <summary>
-        /// Initializes the <see cref="Led"/> and <see cref="Size"/> of the device.
-        /// </summary>
-        protected abstract void InitializeLayout();
-
-        /// <inheritdoc />
-        protected override void UpdateLeds(IEnumerable<Led> ledsToUpdate)
-            => DeviceUpdateQueue?.SetData(GetUpdateData(ledsToUpdate.Where(x => (x.Color.A > 0) && (x.CustomData is CorsairLedId ledId && (ledId != CorsairLedId.Invalid)))));
-
-        /// <inheritdoc />
-        public override void Dispose()
-        {
-            try { DeviceUpdateQueue?.Dispose(); }
-            catch { /* at least we tried */ }
-
-            base.Dispose();
-        }
+        protected CorsairRGBDevice(TDeviceInfo info, CorsairDeviceUpdateQueue updateQueue)
+            : base(info, updateQueue)
+        { }
 
         #endregion
     }

RGB.NET.Devices.Corsair/Generic/ICorsairRGBDevice.cs

@@ -5,8 +5,6 @@ namespace RGB.NET.Devices.Corsair
     /// <summary>
     /// Represents a corsair RGB-device.
     /// </summary>
-    internal interface ICorsairRGBDevice : IRGBDevice
-    {
-        void Initialize(CorsairDeviceUpdateQueue deviceUpdateQueue);
-    }
+    public interface ICorsairRGBDevice : IRGBDevice
+    { }
 }

RGB.NET.Devices.Corsair/Headset/CorsairHeadsetRGBDevice.cs

@@ -18,16 +18,17 @@ namespace RGB.NET.Devices.Corsair
         /// Initializes a new instance of the <see cref="T:RGB.NET.Devices.Corsair.CorsairHeadsetRGBDevice" /> class.
         /// </summary>
         /// <param name="info">The specific information provided by CUE for the headset</param>
-        internal CorsairHeadsetRGBDevice(CorsairHeadsetRGBDeviceInfo info)
-            : base(info)
-        { }
+        internal CorsairHeadsetRGBDevice(CorsairHeadsetRGBDeviceInfo info, CorsairDeviceUpdateQueue updateQueue)
+            : base(info, updateQueue)
+        {
+            InitializeLayout();
+        }
 
         #endregion
 
         #region Methods
 
-        /// <inheritdoc />
-        protected override void InitializeLayout()
+        private void InitializeLayout()
         {
             AddLed(LedId.Headset1, new Point(0, 0), new Size(10, 10));
             AddLed(LedId.Headset2, new Point(10, 0), new Size(10, 10));

RGB.NET.Devices.Corsair/HeadsetStand/CorsairHeadsetStandRGBDevice.cs

@@ -23,16 +23,17 @@ namespace RGB.NET.Devices.Corsair
         /// Initializes a new instance of the <see cref="T:RGB.NET.Devices.Corsair.CorsairHeadsetStandRGBDevice" /> class.
         /// </summary>
         /// <param name="info">The specific information provided by CUE for the headset stand</param>
-        internal CorsairHeadsetStandRGBDevice(CorsairHeadsetStandRGBDeviceInfo info)
-            : base(info)
-        { }
+        internal CorsairHeadsetStandRGBDevice(CorsairHeadsetStandRGBDeviceInfo info, CorsairDeviceUpdateQueue updateQueue)
+            : base(info, updateQueue)
+        {
+            InitializeLayout();
+        }
 
         #endregion
 
         #region Methods
 
-        /// <inheritdoc />
-        protected override void InitializeLayout()
+        private void InitializeLayout()
         {
             _CorsairLedPositions? nativeLedPositions = (_CorsairLedPositions?)Marshal.PtrToStructure(_CUESDK.CorsairGetLedPositionsByDeviceIndex(DeviceInfo.CorsairDeviceIndex), typeof(_CorsairLedPositions));
             if (nativeLedPositions == null) return;

RGB.NET.Devices.Corsair/Keyboard/CorsairKeyboardRGBDevice.cs

@@ -28,16 +28,17 @@ namespace RGB.NET.Devices.Corsair
         /// Initializes a new instance of the <see cref="T:RGB.NET.Devices.Corsair.CorsairKeyboardRGBDevice" /> class.
         /// </summary>
         /// <param name="info">The specific information provided by CUE for the keyboard</param>
-        internal CorsairKeyboardRGBDevice(CorsairKeyboardRGBDeviceInfo info)
-            : base(info)
-        { }
+        internal CorsairKeyboardRGBDevice(CorsairKeyboardRGBDeviceInfo info, CorsairDeviceUpdateQueue updateQueue)
+            : base(info, updateQueue)
+        {
+            InitializeLayout();
+        }
 
         #endregion
 
         #region Methods
 
-        /// <inheritdoc />
-        protected override void InitializeLayout()
+        private void InitializeLayout()
         {
             _CorsairLedPositions? nativeLedPositions = (_CorsairLedPositions?)Marshal.PtrToStructure(_CUESDK.CorsairGetLedPositionsByDeviceIndex(DeviceInfo.CorsairDeviceIndex), typeof(_CorsairLedPositions));
             if (nativeLedPositions == null) return;

RGB.NET.Devices.Corsair/Memory/CorsairMemoryRGBDevice.cs

@@ -22,16 +22,17 @@ namespace RGB.NET.Devices.Corsair
         /// Initializes a new instance of the <see cref="T:RGB.NET.Devices.Corsair.CorsairMemoryRGBDevice" /> class.
         /// </summary>
         /// <param name="info">The specific information provided by CUE for the memory.</param>
-        internal CorsairMemoryRGBDevice(CorsairMemoryRGBDeviceInfo info)
-            : base(info)
-        { }
+        internal CorsairMemoryRGBDevice(CorsairMemoryRGBDeviceInfo info, CorsairDeviceUpdateQueue updateQueue)
+            : base(info, updateQueue)
+        {
+            InitializeLayout();
+        }
 
         #endregion
 
         #region Methods
 
-        /// <inheritdoc />
-        protected override void InitializeLayout()
+        private void InitializeLayout()
         {
             _CorsairLedPositions? nativeLedPositions = (_CorsairLedPositions?)Marshal.PtrToStructure(_CUESDK.CorsairGetLedPositionsByDeviceIndex(DeviceInfo.CorsairDeviceIndex), typeof(_CorsairLedPositions));
             if (nativeLedPositions == null) return;

RGB.NET.Devices.Corsair/Mouse/CorsairMouseRGBDevice.cs

@@ -19,16 +19,17 @@ namespace RGB.NET.Devices.Corsair
         /// Initializes a new instance of the <see cref="T:RGB.NET.Devices.Corsair.CorsairMouseRGBDevice" /> class.
         /// </summary>
         /// <param name="info">The specific information provided by CUE for the mouse</param>
-        internal CorsairMouseRGBDevice(CorsairMouseRGBDeviceInfo info)
-            : base(info)
-        { }
+        internal CorsairMouseRGBDevice(CorsairMouseRGBDeviceInfo info, CorsairDeviceUpdateQueue updateQueue)
+            : base(info, updateQueue)
+        {
+            InitializeLayout();
+        }
 
         #endregion
 
         #region Methods
 
-        /// <inheritdoc />
-        protected override void InitializeLayout()
+        private void InitializeLayout()
         {
             switch (DeviceInfo.PhysicalLayout)
             {

RGB.NET.Devices.Corsair/Mousepad/CorsairMousepadRGBDevice.cs

@@ -23,16 +23,17 @@ namespace RGB.NET.Devices.Corsair
         /// Initializes a new instance of the <see cref="T:RGB.NET.Devices.Corsair.CorsairMousepadRGBDevice" /> class.
         /// </summary>
         /// <param name="info">The specific information provided by CUE for the mousepad</param>
-        internal CorsairMousepadRGBDevice(CorsairMousepadRGBDeviceInfo info)
-            : base(info)
-        { }
+        internal CorsairMousepadRGBDevice(CorsairMousepadRGBDeviceInfo info, CorsairDeviceUpdateQueue updateQueue)
+            : base(info, updateQueue)
+        {
+            InitializeLayout();
+        }
 
         #endregion
 
         #region Methods
 
-        /// <inheritdoc />
-        protected override void InitializeLayout()
+        private void InitializeLayout()
         {
             _CorsairLedPositions? nativeLedPositions = (_CorsairLedPositions?)Marshal.PtrToStructure(_CUESDK.CorsairGetLedPositionsByDeviceIndex(DeviceInfo.CorsairDeviceIndex), typeof(_CorsairLedPositions));
             if (nativeLedPositions == null) return;