diff --git a/DisplayMagicianShared/AMD/AMDLibrary.cs b/DisplayMagicianShared/AMD/AMDLibrary.cs index f43c173..2162ab4 100644 --- a/DisplayMagicianShared/AMD/AMDLibrary.cs +++ b/DisplayMagicianShared/AMD/AMDLibrary.cs @@ -8,10 +8,11 @@ using ATI.ADL; using Microsoft.Win32.SafeHandles; using DisplayMagicianShared; using System.Threading; +using static DisplayMagicianShared.AMD.AMDProfileData; namespace DisplayMagicianShared.AMD { - public class AMDLibrary : IDisposable + internal class AMDLibrary : IDisposable { // Static members are 'eagerly initialized', that is, // immediately when class is loaded for the first time. @@ -25,27 +26,7 @@ namespace DisplayMagicianShared.AMD // Instantiate a SafeHandle instance. private SafeHandle _safeHandle = new SafeFileHandle(IntPtr.Zero, true); - private IntPtr _adlContextHandle = IntPtr.Zero; - - // Struct to be used as the AMD Profile - internal struct AMDProfile - { - internal List Adapters; - } - - // Struct to store the Display - internal struct AMDAdapter - { - internal ADLAdapterInfoX2 AdapterInfoX2; - internal List Displays; - } - - // Struct to store the Display - internal struct AMDDisplay - { - internal List DisplayModes; - } - + private IntPtr _adlContextHandle = IntPtr.Zero; static AMDLibrary() { } public AMDLibrary() diff --git a/DisplayMagicianShared/AMD/AMDProfileData.cs b/DisplayMagicianShared/AMD/AMDProfileData.cs new file mode 100644 index 0000000..ab2473d --- /dev/null +++ b/DisplayMagicianShared/AMD/AMDProfileData.cs @@ -0,0 +1,35 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using ATI.ADL; + +namespace DisplayMagicianShared.AMD +{ + internal class AMDProfileData : VideoLibraryProfileData + { + + // Struct to be used as the AMD Profile + internal struct AMDProfile + { + public List Adapters; + } + + // Struct to store the Display + internal struct AMDAdapter + { + internal ADLAdapterInfoX2 AdapterInfoX2; + internal List Displays; + } + + // Struct to store the Display + internal struct AMDDisplay + { + internal List DisplayModes; + } + + internal AMDProfile ProfileData {get; set;} + + } +} diff --git a/DisplayMagicianShared/DisplayMagicianShared.csproj b/DisplayMagicianShared/DisplayMagicianShared.csproj index 6a4e9d4..1db0a0c 100644 --- a/DisplayMagicianShared/DisplayMagicianShared.csproj +++ b/DisplayMagicianShared/DisplayMagicianShared.csproj @@ -53,6 +53,7 @@ + True @@ -87,6 +88,7 @@ DisplayView.cs + diff --git a/DisplayMagicianShared/ProfileItem.cs b/DisplayMagicianShared/ProfileItem.cs index f8cda05..2120e54 100644 --- a/DisplayMagicianShared/ProfileItem.cs +++ b/DisplayMagicianShared/ProfileItem.cs @@ -155,6 +155,8 @@ namespace DisplayMagicianShared public string Name { get; set; } public Topology.Path[] Paths { get; set; } = new Topology.Path[0]; + + internal VideoLibraryProfileData ProfileData { get; set; } [JsonIgnore] public ProfileIcon ProfileIcon diff --git a/DisplayMagicianShared/ProfileRepository.cs b/DisplayMagicianShared/ProfileRepository.cs index b7a95ac..8624d41 100644 --- a/DisplayMagicianShared/ProfileRepository.cs +++ b/DisplayMagicianShared/ProfileRepository.cs @@ -14,6 +14,7 @@ using System.Text.RegularExpressions; using NvAPIWrapper.Native.GPU; using DisplayMagicianShared.AMD; using System.Windows.Forms; +using static DisplayMagicianShared.AMD.AMDProfileData; namespace DisplayMagicianShared { @@ -563,12 +564,12 @@ namespace DisplayMagicianShared AMDLibrary amdLibrary = AMDLibrary.GetLibrary(); if (amdLibrary.IsInstalled) { - AMDLibrary.AMDProfile thisOne = amdLibrary.GetActiveProfile(); + AMDProfile thisOne = amdLibrary.GetActiveProfile(); activeProfile = new ProfileItem { Name = "Current Display Profile", //Driver = "AMD", - //ProfileData = amdLibrary.GetActiveProfile() + ProfileData = amdLibrary.GetActiveProfile() //ProfileDisplayIdentifiers = ProfileRepository.GenerateProfileDisplayIdentifiers() }; activeProfile.ProfileIcon = new ProfileIcon(activeProfile); diff --git a/DisplayMagicianShared/VideoLibraryProfileData.cs b/DisplayMagicianShared/VideoLibraryProfileData.cs new file mode 100644 index 0000000..e1d0552 --- /dev/null +++ b/DisplayMagicianShared/VideoLibraryProfileData.cs @@ -0,0 +1,14 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace DisplayMagicianShared +{ + class VideoLibraryProfileData + { + // Empty Class + + } +}