Mirrored_Repos/DisplayMagician
1
0
Fork 0
mirror of https://github.com/terrymacdonald/DisplayMagician.git synced 2024-08-30 18:32:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

[WIP] Graphic library integration part 1

Browse Source
This commit is contained in:
Terry MacDonald 2021-08-22 12:54:39 +12:00
parent 7753e26917
commit 01ffda8428
6 changed files with 79 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
DisplayMagician/Program.cs
View File

@ -602,7 +602,7 @@ namespace DisplayMagician {
{ {
Console.WriteLine("Program/ApplyProfile : Applying AMD Profile " + profile.Name); Console.WriteLine("Program/ApplyProfile : Applying AMD Profile " + profile.Name);
AMDProfileItem amdProfile = (AMDProfileItem)profile; AMDProfileItem amdProfile = (AMDProfileItem)profile;
if (!AMDLibrary.GetLibrary().SetActiveConfig(amdProfile.DisplayConfig)) if (!AMDLibrary.GetLibrary().SetActiveConfig(amdProfile.AMDDisplayConfig))
{ {
// Somehow return that this profile topology didn't apply // Somehow return that this profile topology didn't apply
throw new ApplyTopologyException("Program/ApplyProfile: amdApplyProfileTask: Error applying the AMD Profile!"); throw new ApplyTopologyException("Program/ApplyProfile: amdApplyProfileTask: Error applying the AMD Profile!");

2
DisplayMagicianShared/AMD/AMDLibrary.cs
View File

@ -53,7 +53,7 @@ namespace DisplayMagicianShared.AMD
} }
} }
class AMDLibrary : IDisposable public class AMDLibrary : IDisposable
{ {
// Static members are 'eagerly initialized', that is, // Static members are 'eagerly initialized', that is,

112
DisplayMagicianShared/AMD/AMDProfileItem.cs
View File

@ -6,49 +6,11 @@ using System.Windows.Forms;
using DisplayMagicianShared.Resources; using DisplayMagicianShared.Resources;
using Newtonsoft.Json; using Newtonsoft.Json;
using System.Drawing; using System.Drawing;
using System.Drawing.Imaging; using DisplayMagicianShared.Windows;
using System.Text.RegularExpressions;
using IWshRuntimeLibrary;
//using ATI.ADL;
//using WK.Libraries.HotkeyListenerNS;
namespace DisplayMagicianShared.AMD namespace DisplayMagicianShared.AMD
{ {
/*// Struct to be used as the AMD Profile
[JsonObject(MemberSerialization.Fields)]
public struct AMDProfile
{
public List<AMDAdapter> Adapters;
}
// Struct to store the Display
[JsonObject(MemberSerialization.Fields)]
public struct AMDAdapter
{
public int AdapterIndex;
public string AdapterName;
public string DisplayName;
[JsonProperty]
public ADLAdapterInfoX2 AdapterInfoX2;
public List<AMDDisplay> Displays;
}
// Struct to store the Display
[JsonObject(MemberSerialization.Fields)]
public struct AMDDisplay
{
public string DisplayName;
public string DisplayConnector;
public string UDID;
[JsonRequired]
public List<ADLMode> DisplayModes;
public bool HDRSupported;
public bool HDREnabled;
public bool IsEyefinity;
}*/
public class AMDProfileItem : ProfileItem, IComparable public class AMDProfileItem : ProfileItem, IComparable
{ {
private static List<AMDProfileItem> _allSavedProfiles = new List<AMDProfileItem>(); private static List<AMDProfileItem> _allSavedProfiles = new List<AMDProfileItem>();
@ -56,7 +18,8 @@ namespace DisplayMagicianShared.AMD
private Bitmap _profileBitmap, _profileShortcutBitmap; private Bitmap _profileBitmap, _profileShortcutBitmap;
private List<string> _profileDisplayIdentifiers = new List<string>(); private List<string> _profileDisplayIdentifiers = new List<string>();
private List<ScreenPosition> _screens; private List<ScreenPosition> _screens;
private AMD_DISPLAY_CONFIG _displayConfig = new AMD_DISPLAY_CONFIG(); private AMD_DISPLAY_CONFIG _amdDisplayConfig = new AMD_DISPLAY_CONFIG();
private WINDOWS_DISPLAY_CONFIG _windowsDisplayConfig = new WINDOWS_DISPLAY_CONFIG();
private static readonly string uuidV4Regex = @"(?im)^[{(]?[0-9A-F]{8}[-]?(?:[0-9A-F]{4}[-]?){3}[0-9A-F]{12}[)}]?$"; private static readonly string uuidV4Regex = @"(?im)^[{(]?[0-9A-F]{8}[-]?(?:[0-9A-F]{4}[-]?){3}[0-9A-F]{12}[)}]?$";
private string _uuid = ""; private string _uuid = "";
@ -107,18 +70,31 @@ namespace DisplayMagicianShared.AMD
//public Topology.Path[] Paths { get; set; } = new Topology.Path[0]; //public Topology.Path[] Paths { get; set; } = new Topology.Path[0];
[JsonRequired] [JsonRequired]
public AMD_DISPLAY_CONFIG DisplayConfig public AMD_DISPLAY_CONFIG AMDDisplayConfig
{ {
get get
{ {
return _displayConfig; return _amdDisplayConfig;
} }
set set
{ {
_displayConfig = value; _amdDisplayConfig = value;
} }
} }
[JsonRequired]
public WINDOWS_DISPLAY_CONFIG WindowsDisplayConfig
{
get
{
return _windowsDisplayConfig;
}
set
{
_windowsDisplayConfig = value;
}
}
public override List<string> ProfileDisplayIdentifiers public override List<string> ProfileDisplayIdentifiers
{ {
@ -137,7 +113,7 @@ namespace DisplayMagicianShared.AMD
} }
} }
[JsonIgnore] [JsonRequired]
public override List<ScreenPosition> Screens public override List<ScreenPosition> Screens
{ {
get get
@ -213,7 +189,7 @@ namespace DisplayMagicianShared.AMD
ProfileTightestBitmap is Bitmap && ProfileTightestBitmap is Bitmap &&
ProfileDisplayIdentifiers.Count > 0) ProfileDisplayIdentifiers.Count > 0)
{ {
if (DisplayConfig.AdapterConfigs.Count > 0) if (AMDDisplayConfig.AdapterConfigs.Count > 0)
return true; return true;
else else
return false; return false;
@ -234,7 +210,8 @@ namespace DisplayMagicianShared.AMD
// Copy all our profile data over to the other profile // Copy all our profile data over to the other profile
profile.Name = Name; profile.Name = Name;
profile.DisplayConfig = DisplayConfig; profile.AMDDisplayConfig = AMDDisplayConfig;
profile.WindowsDisplayConfig = WindowsDisplayConfig;
profile.ProfileIcon = ProfileIcon; profile.ProfileIcon = ProfileIcon;
profile.SavedProfileIconCacheFilename = SavedProfileIconCacheFilename; profile.SavedProfileIconCacheFilename = SavedProfileIconCacheFilename;
profile.ProfileBitmap = ProfileBitmap; profile.ProfileBitmap = ProfileBitmap;
@ -299,7 +276,8 @@ namespace DisplayMagicianShared.AMD
if (amdLibrary.IsInstalled) if (amdLibrary.IsInstalled)
{ {
// Create the profile data from the current config // Create the profile data from the current config
_displayConfig = amdLibrary.GetActiveConfig(); _amdDisplayConfig = amdLibrary.GetActiveConfig();
_windowsDisplayConfig = WinLibrary.GetLibrary().GetActiveConfig();
// Now, since the ActiveProfile has changed, we need to regenerate screen positions // Now, since the ActiveProfile has changed, we need to regenerate screen positions
_screens = GetScreenPositions(); _screens = GetScreenPositions();
@ -326,11 +304,11 @@ namespace DisplayMagicianShared.AMD
// Now we create the screens structure from the AMD profile information // Now we create the screens structure from the AMD profile information
_screens = new List<ScreenPosition>(); _screens = new List<ScreenPosition>();
if ( _displayConfig.AdapterConfigs.Count > 0) if ( _displayConfig.W.Count > 0)
{ {
foreach ( var adapter in _displayConfig.AdapterConfigs) foreach ( var adapter in _displayConfig.AdapterConfigs)
{ {
foreach (var display in adapter.Displays) foreach (var display in adapter.SLSMapIndex)
{ {
foreach (var mode in display.DisplayModes) foreach (var mode in display.DisplayModes)
{ {
@ -422,8 +400,12 @@ namespace DisplayMagicianShared.AMD
if (this.GetType() != other.GetType()) if (this.GetType() != other.GetType())
return false; return false;
// If the DisplayConfig's equal each other // If the AMDDisplayConfig's do not equal each other
if (DisplayConfig.Equals(other.DisplayConfig)) if (!AMDDisplayConfig.Equals(other.AMDDisplayConfig))
return false;
// If the WindowsDisplayConfig's equal each other
if (!WindowsDisplayConfig.Equals(other.WindowsDisplayConfig))
return false; return false;
// Check if the profile identifiers are not the same, then return false // Check if the profile identifiers are not the same, then return false
@ -510,11 +492,14 @@ namespace DisplayMagicianShared.AMD
// Get hash code for the ProfileDisplayIdentifiers field if it is not null. // Get hash code for the ProfileDisplayIdentifiers field if it is not null.
int hashIds = ProfileDisplayIdentifiers == null ? 0 : ProfileDisplayIdentifiers.GetHashCode(); int hashIds = ProfileDisplayIdentifiers == null ? 0 : ProfileDisplayIdentifiers.GetHashCode();
// Get ProfileData too // Get AMD Profile Data too
int hashProfileData = DisplayConfig.GetHashCode(); int hashProfileAMDData = AMDDisplayConfig.GetHashCode();
// Get AMD Profile Data too
int hashProfileWindowsData = WindowsDisplayConfig.GetHashCode();
// Calculate the hash code for the product. // Calculate the hash code for the product.
return (hashIds, hashProfileData).GetHashCode(); return (hashIds, hashProfileAMDData, hashProfileWindowsData).GetHashCode();
} }
@ -589,8 +574,12 @@ namespace DisplayMagicianShared.AMD
return false; return false;
// Now we need to check the Display Configs themselves // Now we need to check the AMD Display Configs themselves
if (x.DisplayConfig.Equals(y.DisplayConfig)) if (!x.AMDDisplayConfig.Equals(y.AMDDisplayConfig))
return false;
// Now we need to check the AMD Display Configs themselves
if (!x.WindowsDisplayConfig.Equals(y.WindowsDisplayConfig))
return false; return false;
return true; return true;
@ -621,11 +610,14 @@ namespace DisplayMagicianShared.AMD
// Get hash code for the ProfileDisplayIdentifiers field if it is not null. // Get hash code for the ProfileDisplayIdentifiers field if it is not null.
int hashIds = profile.ProfileDisplayIdentifiers == null ? 0 : profile.ProfileDisplayIdentifiers.GetHashCode(); int hashIds = profile.ProfileDisplayIdentifiers == null ? 0 : profile.ProfileDisplayIdentifiers.GetHashCode();
// Get hash code for the Paths // Get hash code for the AMD Display Config
int hashProfileData = profile.DisplayConfig.GetHashCode(); int hashProfileAMDData = profile.AMDDisplayConfig.GetHashCode();
// Get hash code for the Windows Display Config
int hashProfileWinData = profile.WindowsDisplayConfig.GetHashCode();
//Calculate the hash code for the product. //Calculate the hash code for the product.
return (hashIds, hashProfileData).GetHashCode(); return (hashIds, hashProfileAMDData, hashProfileWinData).GetHashCode();
} }
} }

2
DisplayMagicianShared/NVIDIA/NVIDIALibrary.cs
View File

@ -77,7 +77,7 @@ namespace DisplayMagicianShared.NVIDIA
} }
} }
class NVIDIALibrary : IDisposable public class NVIDIALibrary : IDisposable
{ {
// Static members are 'eagerly initialized', that is, // Static members are 'eagerly initialized', that is,

30
DisplayMagicianShared/NVIDIA/NVIDIAProfileItem.cs
View File

@ -9,6 +9,7 @@ using System.Drawing;
using System.Drawing.Imaging; using System.Drawing.Imaging;
using System.Text.RegularExpressions; using System.Text.RegularExpressions;
using IWshRuntimeLibrary; using IWshRuntimeLibrary;
using DisplayMagicianShared.Windows;
namespace DisplayMagicianShared.NVIDIA namespace DisplayMagicianShared.NVIDIA
{ {
@ -19,7 +20,8 @@ namespace DisplayMagicianShared.NVIDIA
private Bitmap _profileBitmap, _profileShortcutBitmap; private Bitmap _profileBitmap, _profileShortcutBitmap;
private List<string> _profileDisplayIdentifiers = new List<string>(); private List<string> _profileDisplayIdentifiers = new List<string>();
private List<ScreenPosition> _screens; private List<ScreenPosition> _screens;
private NVIDIA_DISPLAY_CONFIG _displayConfig = new NVIDIA_DISPLAY_CONFIG(); private NVIDIA_DISPLAY_CONFIG _nvidiaDisplayConfig = new NVIDIA_DISPLAY_CONFIG();
private WINDOWS_DISPLAY_CONFIG _windowsDisplayConfig = new WINDOWS_DISPLAY_CONFIG();
private static readonly string uuidV4Regex = @"(?im)^[{(]?[0-9A-F]{8}[-]?(?:[0-9A-F]{4}[-]?){3}[0-9A-F]{12}[)}]?$"; private static readonly string uuidV4Regex = @"(?im)^[{(]?[0-9A-F]{8}[-]?(?:[0-9A-F]{4}[-]?){3}[0-9A-F]{12}[)}]?$";
private string _uuid = ""; private string _uuid = "";
@ -71,15 +73,28 @@ namespace DisplayMagicianShared.NVIDIA
//public NVIDIALibrary.NVIDIAProfile ProfileData { get; set; } = new NVIDIALibrary.NVIDIAProfile(); //public NVIDIALibrary.NVIDIAProfile ProfileData { get; set; } = new NVIDIALibrary.NVIDIAProfile();
[JsonRequired] [JsonRequired]
public NVIDIA_DISPLAY_CONFIG DisplayConfig public NVIDIA_DISPLAY_CONFIG NVIDIADisplayConfig
{ {
get get
{ {
return _displayConfig; return _nvidiaDisplayConfig;
} }
set set
{ {
_displayConfig = value; _nvidiaDisplayConfig = value;
}
}
[JsonRequired]
public WINDOWS_DISPLAY_CONFIG WindowsDisplayConfig
{
get
{
return _windowsDisplayConfig;
}
set
{
_windowsDisplayConfig = value;
} }
} }
@ -121,7 +136,7 @@ namespace DisplayMagicianShared.NVIDIA
} }
} }
[JsonIgnore] [JsonRequired]
public override List<ScreenPosition> Screens public override List<ScreenPosition> Screens
{ {
get get
@ -251,7 +266,8 @@ namespace DisplayMagicianShared.NVIDIA
if (nvidiaLibrary.IsInstalled) if (nvidiaLibrary.IsInstalled)
{ {
// Create the profile data from the current config // Create the profile data from the current config
_displayConfig = nvidiaLibrary.GetActiveConfig(); _nvidiaDisplayConfig = nvidiaLibrary.GetActiveConfig();
_windowsDisplayConfig= WinLibrary.GetLibrary().GetActiveConfig();
// Now, since the ActiveProfile has changed, we need to regenerate screen positions // Now, since the ActiveProfile has changed, we need to regenerate screen positions
_screens = GetScreenPositions(); _screens = GetScreenPositions();
@ -278,7 +294,7 @@ namespace DisplayMagicianShared.NVIDIA
// Now we create the screens structure from the AMD profile information // Now we create the screens structure from the AMD profile information
_screens = new List<ScreenPosition>(); _screens = new List<ScreenPosition>();
if (_displayConfig.AdapterConfigs.Count > 0) if (_displayConfig. .Count > 0)
{ {
foreach (var adapter in _displayConfig.AdapterConfigs) foreach (var adapter in _displayConfig.AdapterConfigs)
{ {

2
DisplayMagicianShared/Windows/WinLibrary.cs
View File

@ -49,7 +49,7 @@ namespace DisplayMagicianShared.Windows
} }
} }
class WinLibrary : IDisposable public class WinLibrary : IDisposable
{ {
// Static members are 'eagerly initialized', that is, // Static members are 'eagerly initialized', that is,