DarthAffe/Artemis
1
0
Fork 0
mirror of https://github.com/Artemis-RGB/Artemis synced 2025-12-13 05:48:35 +00:00
Code Issues Releases Wiki Activity

Updated the Corsair-Headset-DeviceProvider to benefit from CUE.NET 1.0.3

Browse Source
This commit is contained in:
Darth Affe 2016-06-04 10:01:07 +02:00
parent 7ed9114805
commit 841207225d
1 changed files with 12 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
Artemis/Artemis/DeviceProviders/Corsair/CorsairHeadsets.cs
View File

@ -1,12 +1,10 @@
using System; using System.Linq;
using System.Linq;
using System.Threading; using System.Threading;
using System.Windows; using System.Windows;
using System.Windows.Media; using System.Windows.Media;
using Artemis.Utilities; using Artemis.Utilities;
using CUE.NET; using CUE.NET;
using CUE.NET.Devices.Generic.Enums; using CUE.NET.Devices.Generic.Enums;
using CUE.NET.Exceptions;
using Ninject.Extensions.Logging; using Ninject.Extensions.Logging;
namespace Artemis.DeviceProviders.Corsair namespace Artemis.DeviceProviders.Corsair
@ -24,8 +22,8 @@ namespace Artemis.DeviceProviders.Corsair
public override bool TryEnable() public override bool TryEnable()
{ {
CanUse = CanInitializeSdk(); CanUse = CanInitializeSdk();
if (CanUse) if (CanUse && !CueSDK.IsInitialized)
CueSDK.HeadsetSDK.UpdateMode = UpdateMode.Manual; CueSDK.Initialize();
Logger.Debug("Attempted to enable Corsair headset. CanUse: {0}", CanUse); Logger.Debug("Attempted to enable Corsair headset. CanUse: {0}", CanUse);
return CanUse; return CanUse;
@ -33,7 +31,7 @@ namespace Artemis.DeviceProviders.Corsair
public override void Disable() public override void Disable()
{ {
if (CueSDK.ProtocolDetails != null) if (CueSDK.IsInitialized)
CueSDK.Reinitialize(); CueSDK.Reinitialize();
} }
@ -61,34 +59,19 @@ namespace Artemis.DeviceProviders.Corsair
: img.GetPixel((ledIndex + 1) * 20 - 1, (ledIndex + 1) * 20 - 1); : img.GetPixel((ledIndex + 1) * 20 - 1, (ledIndex + 1) * 20 - 1);
ledIndex++; ledIndex++;
} }
CueSDK.HeadsetSDK.Update(true);
CueSDK.HeadsetSDK.Update();
} }
private static bool CanInitializeSdk() private static bool CanInitializeSdk()
{ {
// If already initialized, return result right away
if (CueSDK.ProtocolDetails != null)
return CueSDK.HeadsetSDK != null;
// Else try to enable the SDK
for (var tries = 0; tries < 9; tries++) for (var tries = 0; tries < 9; tries++)
{ {
if (CueSDK.ProtocolDetails != null) if (CueSDK.IsSDKAvailable(CorsairDeviceType.Headset))
break; return true;
try
{
CueSDK.Initialize();
}
catch (Exception)
{
Thread.Sleep(2000); Thread.Sleep(2000);
} }
}
if (CueSDK.ProtocolDetails == null)
return false; return false;
return CueSDK.HeadsetSDK != null;
} }
} }
} }