diff --git a/CommonHelpers/CommonHelpers.csproj b/CommonHelpers/CommonHelpers.csproj index 19b440a..fa385ec 100644 --- a/CommonHelpers/CommonHelpers.csproj +++ b/CommonHelpers/CommonHelpers.csproj @@ -12,10 +12,19 @@ + + + RTSSSharedMemoryNET.dll + + + PreserveNewest + + PreserveNewest + diff --git a/CommonHelpers/OSDHelpers.cs b/CommonHelpers/OSDHelpers.cs new file mode 100644 index 0000000..422675f --- /dev/null +++ b/CommonHelpers/OSDHelpers.cs @@ -0,0 +1,26 @@ +using RTSSSharedMemoryNET; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace CommonHelpers +{ + public static class OSDHelpers + { + public static uint OSDIndex(this OSD? osd) + { + if (osd is null) + return uint.MaxValue; + + var osdSlot = typeof(OSD).GetField("m_osdSlot", + System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.Instance); + var value = osdSlot.GetValue(osd); + if (value is null) + return uint.MaxValue; + + return (uint)value; + } + } +} diff --git a/PerformanceOverlay/RTSSSharedMemoryNET.dll b/CommonHelpers/RTSSSharedMemoryNET.dll similarity index 100% rename from PerformanceOverlay/RTSSSharedMemoryNET.dll rename to CommonHelpers/RTSSSharedMemoryNET.dll diff --git a/PerformanceOverlay/PerformanceOverlay.csproj b/PerformanceOverlay/PerformanceOverlay.csproj index b88a21f..50d944e 100644 --- a/PerformanceOverlay/PerformanceOverlay.csproj +++ b/PerformanceOverlay/PerformanceOverlay.csproj @@ -33,7 +33,7 @@ - RTSSSharedMemoryNET.dll + ..\CommonHelpers\RTSSSharedMemoryNET.dll @@ -58,9 +58,6 @@ - - PreserveNewest - SettingsSingleFileGenerator Settings.Designer.cs diff --git a/PowerControl/PowerControl.csproj b/PowerControl/PowerControl.csproj index d07f1dd..00b420c 100644 --- a/PowerControl/PowerControl.csproj +++ b/PowerControl/PowerControl.csproj @@ -35,11 +35,8 @@ hidapi.net.dll - - NeptuneHid\neptune-hidapi.net.dll - - ..\PerformanceOverlay\RTSSSharedMemoryNET.dll + ..\CommonHelpers\RTSSSharedMemoryNET.dll