mirror of
https://github.com/terrymacdonald/DisplayMagician.git
synced 2024-08-30 18:32:20 +00:00
First working new NVIDIA library build!
Amazing! This is the first working version of DisplayMagician using the new NVIDIA and Windows CCD library. It works properly, and now I can start to tidy up some of the additioanl functionality I need to sort out before a release. I also then need to work on the AMD library as well!
This commit is contained in:
Terry MacDonald
parent
b65c1572bd
commit
e2ca69e404
@ -19,6 +19,8 @@ using NLog.Config;
|
|||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.Collections;
|
using System.Collections;
|
||||||
using DisplayMagicianShared.AMD;
|
using DisplayMagicianShared.AMD;
|
||||||
|
using DisplayMagicianShared.NVIDIA;
|
||||||
|
using DisplayMagicianShared.Windows;
|
||||||
|
|
||||||
namespace DisplayMagician {
|
namespace DisplayMagician {
|
||||||
|
|
||||||
@ -569,203 +571,55 @@ namespace DisplayMagician {
|
|||||||
// ApplyProfile lives here so that the UI works.
|
// ApplyProfile lives here so that the UI works.
|
||||||
public static ApplyProfileResult ApplyProfile(ProfileItem profile)
|
public static ApplyProfileResult ApplyProfile(ProfileItem profile)
|
||||||
{
|
{
|
||||||
logger.Debug($"Program/ApplyProfile: Starting");
|
logger.Trace($"Program/ApplyProfile: Starting");
|
||||||
|
NVIDIAProfileItem nvidiaProfile = null;
|
||||||
|
AMDProfileItem amdProfile = null;
|
||||||
|
WinProfileItem winProfile = null;
|
||||||
|
|
||||||
profile.RefreshPossbility();
|
if (profile == null)
|
||||||
|
|
||||||
// We need to check if the profile is valid
|
|
||||||
if (!profile.IsPossible)
|
|
||||||
{
|
{
|
||||||
logger.Debug($"Program/ApplyProfile: The supplied profile {profile.Name} isn't currently possible to use, so we can't apply it. This means a display that existed before has been removed, or moved.");
|
logger.Debug($"Program/ApplyProfile: The supplied profile is null! Can't be used.");
|
||||||
return ApplyProfileResult.Error;
|
return ApplyProfileResult.Error;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
// We need to check if the profile is the same one that we're on
|
|
||||||
if (profile.UUID == ProfileRepository.GetActiveProfile().UUID)
|
|
||||||
{
|
|
||||||
logger.Debug($"Program/ApplyProfile: The supplied profile {profile.Name} is currently in use, so we don't need to apply it.");
|
|
||||||
return ApplyProfileResult.Successful;
|
|
||||||
}
|
|
||||||
|
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
// Set up some things to be used later
|
// We try to swap profiles. The profiles have checking logic in them
|
||||||
ApplyingProfileForm timeoutForm = new ApplyingProfileForm(null, 3, $"Changing to '{profile.Name}' Profile", "Press ESC to cancel", Color.Orange, true);
|
if (profile is NVIDIAProfileItem)
|
||||||
|
|
||||||
// If this is an AMD profile, then we need to set it up as such
|
|
||||||
if (profile.VideoMode.Equals("AMD"))
|
|
||||||
{
|
{
|
||||||
|
logger.Trace($"Program/ApplyProfile: Profile is an NVIDIA Profile, so changing type to NVIDIAProfileItem");
|
||||||
// Now lets prepare a task to apply the profile in a separate thread
|
nvidiaProfile = (NVIDIAProfileItem)profile;
|
||||||
Task amdApplyProfileTask = new Task(() =>
|
if (!nvidiaProfile.SetActive())
|
||||||
{
|
{
|
||||||
Console.WriteLine("Program/ApplyProfile : Applying AMD Profile " + profile.Name);
|
logger.Error($"Program/ApplyProfile: Error applying the NVIDIA Profile!");
|
||||||
AMDProfileItem amdProfile = (AMDProfileItem)profile;
|
return ApplyProfileResult.Error;
|
||||||
if (!AMDLibrary.GetLibrary().SetActiveConfig(amdProfile.AMDDisplayConfig))
|
}
|
||||||
|
}
|
||||||
|
else if (profile is AMDProfileItem)
|
||||||
|
{
|
||||||
|
logger.Trace($"Program/ApplyProfile: Profile is an AMD Profile, so changing type to AMDProfileItem");
|
||||||
|
amdProfile = (AMDProfileItem)profile;
|
||||||
|
if (!amdProfile.SetActive())
|
||||||
|
{
|
||||||
|
logger.Error($"Program/ApplyProfile: Error applying the AMD Profile!");
|
||||||
|
return ApplyProfileResult.Error;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else if (profile is WinProfileItem)
|
||||||
|
{
|
||||||
|
logger.Trace($"Program/ApplyProfile: Profile is a Windows CCD Profile, so changing type to WinProfileItem");
|
||||||
|
winProfile = (WinProfileItem)profile;
|
||||||
|
if (!winProfile.SetActive())
|
||||||
{
|
{
|
||||||
// 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!");
|
||||||
}
|
}
|
||||||
});
|
|
||||||
|
|
||||||
ApplyingProfileForm amdApplyProfileForm = new ApplyingProfileForm(amdApplyProfileTask, 30, $"Changing to '{profile.Name}' Profile", "Applying AMD configuration", Color.FromArgb(200, 237, 28, 36));
|
|
||||||
|
|
||||||
if (timeoutForm.ShowDialog() == DialogResult.Cancel)
|
|
||||||
{
|
|
||||||
return ApplyProfileResult.Cancelled;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// We always want to do the WindowsDisplayAPI PathInfo part
|
|
||||||
logger.Debug($"Program/ApplyProfile: Running the AMD ApplyProfile Task to change the screen layout");
|
|
||||||
amdApplyProfileForm.ShowDialog();
|
|
||||||
try
|
|
||||||
{
|
|
||||||
amdApplyProfileTask.Wait();
|
|
||||||
}
|
|
||||||
catch (AggregateException ae)
|
|
||||||
{
|
|
||||||
logger.Error(ae, $"Program/ApplyProfile exception during AMD ApplyProfile Task");
|
|
||||||
foreach (var e in ae.InnerExceptions)
|
|
||||||
{
|
|
||||||
// Handle the custom exception.
|
|
||||||
if (e is ApplyPathInfoException)
|
|
||||||
{
|
|
||||||
Console.WriteLine(e.Message);
|
|
||||||
}
|
|
||||||
// Rethrow any other exception.
|
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
throw;
|
logger.Trace($"Program/ApplyProfile: Profile type is not one that is supported by DisplayMagician, so returning an ApplyProfileResult error");
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (amdApplyProfileTask.IsFaulted)
|
|
||||||
logger.Debug($"Program/ApplyProfile: Applying AMD Profile failed to complete");
|
|
||||||
|
|
||||||
if (!amdApplyProfileTask.IsCompleted)
|
|
||||||
return ApplyProfileResult.Error;
|
|
||||||
|
|
||||||
}
|
|
||||||
/*// Now lets prepare changing the display topology task
|
|
||||||
Task applyTopologyTask = new Task(() =>
|
|
||||||
{
|
|
||||||
Console.WriteLine("Program/ApplyProfile : Applying Profile Topology " + profile.Name);
|
|
||||||
if (!ProfileRepository.ApplyNVIDIAGridTopology(profile))
|
|
||||||
{
|
|
||||||
// Somehow return that this profile topology didn't apply
|
|
||||||
throw new ApplyTopologyException("Program/ApplyProfile: ApplyNVIDIAGridTopology: Error setting up the NVIDIA Surround Grid Topology");
|
|
||||||
}
|
|
||||||
});
|
|
||||||
*/
|
|
||||||
/*Task applyPathInfoTask = new Task(() => {
|
|
||||||
Console.WriteLine("Program/ApplyProfile : Applying Profile Path " + profile.Name);
|
|
||||||
if (!ProfileRepository.ApplyWindowsDisplayPathInfo(profile))
|
|
||||||
{
|
|
||||||
// Somehow return that this profile path info didn't apply
|
|
||||||
throw new ApplyPathInfoException("Program/ApplyProfile: ApplyWindowsDisplayPathInfo: Error configuring the Windows Display Devices");
|
|
||||||
}
|
|
||||||
|
|
||||||
});*/
|
|
||||||
|
|
||||||
|
|
||||||
/*if (timeoutForm.ShowDialog() == DialogResult.Cancel)
|
|
||||||
{
|
|
||||||
return ApplyProfileResult.Cancelled;
|
|
||||||
}
|
|
||||||
|
|
||||||
// We only want to do the topology change if the profile we're on now
|
|
||||||
// or the profile we're going to are NVIDIA surround profiles
|
|
||||||
int toProfileSurroundTopologyCount =
|
|
||||||
profile.Paths.SelectMany(paths => paths.TargetDisplays)
|
|
||||||
.Select(target => target.SurroundTopology)
|
|
||||||
.Where(topology => topology != null)
|
|
||||||
.Select(topology => topology.ToGridTopology())
|
|
||||||
.Count();
|
|
||||||
if (toProfileSurroundTopologyCount > 0)
|
|
||||||
logger.Debug($"Program/ApplyProfile: {profile.Name} profile we want to use is a NVIDIA Surround profile, so we need to change the NVIDIA GRID topology.");
|
|
||||||
else
|
|
||||||
logger.Debug($"Program/ApplyProfile: {profile.Name} profile we want to use does not use NVIDIA Surround.");
|
|
||||||
|
|
||||||
int fromProfileSurroundTopologyCount =
|
|
||||||
ProfileRepository.CurrentProfile.Paths.SelectMany(paths => paths.TargetDisplays)
|
|
||||||
.Select(target => target.SurroundTopology)
|
|
||||||
.Where(topology => topology != null)
|
|
||||||
.Select(topology => topology.ToGridTopology())
|
|
||||||
.Count();
|
|
||||||
if (fromProfileSurroundTopologyCount > 0)
|
|
||||||
logger.Debug($"Program/ApplyProfile: {ProfileRepository.CurrentProfile} profile currently in use is a NVIDIA Surround profile, so we need to change the NVIDIA GRID topology.");
|
|
||||||
else
|
|
||||||
logger.Debug($"Program/ApplyProfile: {ProfileRepository.CurrentProfile} profile currently in use does not use NVIDIA Surround.");
|
|
||||||
|
|
||||||
if (toProfileSurroundTopologyCount > 0 || fromProfileSurroundTopologyCount > 0)
|
|
||||||
{
|
|
||||||
logger.Debug($"Program/ApplyProfile: Changing the NVIDIA GRID topology to apply or remove a NVIDIA Surround profile");
|
|
||||||
topologyForm.ShowDialog();
|
|
||||||
|
|
||||||
try
|
|
||||||
{
|
|
||||||
applyTopologyTask.Wait();
|
|
||||||
}
|
|
||||||
catch (AggregateException ae)
|
|
||||||
{
|
|
||||||
logger.Error(ae, $"Program/ApplyProfile exception during applyTopologyTask");
|
|
||||||
foreach (var e in ae.InnerExceptions)
|
|
||||||
{
|
|
||||||
// Handle the custom exception.
|
|
||||||
if (e is ApplyTopologyException)
|
|
||||||
{
|
|
||||||
Console.WriteLine(e.Message);
|
|
||||||
}
|
|
||||||
// Rethrow any other exception.
|
|
||||||
else
|
|
||||||
{
|
|
||||||
throw;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (applyTopologyTask.IsFaulted)
|
|
||||||
Console.WriteLine("Program/ApplyProfile : Applying Profile Topology stage failed to complete");
|
|
||||||
|
|
||||||
if (!applyTopologyTask.IsCompleted)
|
|
||||||
{
|
|
||||||
logger.Debug($"Program/ApplyProfile: Failed to complete applying or removing the NVIDIA Surround profile");
|
|
||||||
return ApplyProfileResult.Error;
|
return ApplyProfileResult.Error;
|
||||||
}
|
}
|
||||||
}*/
|
|
||||||
|
|
||||||
/*// We always want to do the WindowsDisplayAPI PathInfo part
|
|
||||||
logger.Debug($"Program/ApplyProfile: Changing the Windows Display Path Info to change the Windows Display layout");
|
|
||||||
pathInfoForm.ShowDialog();
|
|
||||||
try
|
|
||||||
{
|
|
||||||
applyPathInfoTask.Wait();
|
|
||||||
}
|
|
||||||
catch (AggregateException ae)
|
|
||||||
{
|
|
||||||
logger.Error(ae, $"Program/ApplyProfile exception during applyPathInfoTask");
|
|
||||||
foreach (var e in ae.InnerExceptions)
|
|
||||||
{
|
|
||||||
// Handle the custom exception.
|
|
||||||
if (e is ApplyPathInfoException)
|
|
||||||
{
|
|
||||||
Console.WriteLine(e.Message);
|
|
||||||
}
|
|
||||||
// Rethrow any other exception.
|
|
||||||
else
|
|
||||||
{
|
|
||||||
throw;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (applyPathInfoTask.IsFaulted)
|
|
||||||
logger.Debug($"Program/ApplyProfile: Applying Profile PathInfo stage failed to complete");
|
|
||||||
|
|
||||||
if (!applyPathInfoTask.IsCompleted)
|
|
||||||
return ApplyProfileResult.Error;*/
|
|
||||||
|
|
||||||
}
|
}
|
||||||
catch (Exception ex)
|
catch (Exception ex)
|
||||||
|
|||||||
@ -185,6 +185,57 @@ namespace DisplayMagicianShared.AMD
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Actually set this profile active
|
||||||
|
public override bool SetActive()
|
||||||
|
{
|
||||||
|
AMDLibrary amdLibrary = AMDLibrary.GetLibrary();
|
||||||
|
WinLibrary winLibrary = WinLibrary.GetLibrary();
|
||||||
|
if (amdLibrary.IsInstalled)
|
||||||
|
{
|
||||||
|
if (!amdLibrary.IsActiveConfig(_amdDisplayConfig) && !winLibrary.IsActiveConfig(_windowsDisplayConfig))
|
||||||
|
{
|
||||||
|
if (amdLibrary.IsPossibleConfig(_amdDisplayConfig))
|
||||||
|
{
|
||||||
|
SharedLogger.logger.Trace($"ProfileRepository/SetActive: The AMD display settings within profile {Name} are possible to use right now, so we'll use attempt to use them.");
|
||||||
|
bool itWorkedforAMD = amdLibrary.SetActiveConfig(_amdDisplayConfig);
|
||||||
|
|
||||||
|
if (itWorkedforAMD)
|
||||||
|
{
|
||||||
|
SharedLogger.logger.Trace($"ProfileRepository/SetActive: The AMD display settings within profile {Name} were successfully applied.");
|
||||||
|
// Then let's try to also apply the windows changes
|
||||||
|
// Note: we are unable to check if the Windows CCD display config is possible, as it won't match if either the current display config is a ADL config,
|
||||||
|
// or if the display config we want to change to is a ADL config. So we just have to assume that it will work!
|
||||||
|
bool itWorkedforWindows = winLibrary.SetActiveConfig(_windowsDisplayConfig);
|
||||||
|
if (itWorkedforWindows)
|
||||||
|
{
|
||||||
|
SharedLogger.logger.Trace($"ProfileRepository/SetActive: The Windows CCD display settings within profile {Name} were successfully applied.");
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
SharedLogger.logger.Trace($"ProfileRepository/SetActive: The Windows CCD display settings within profile {Name} were NOT applied correctly.");
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
SharedLogger.logger.Trace($"ProfileRepository/SetActive: The AMD display settings within profile {Name} were NOT applied correctly.");
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
SharedLogger.logger.Error($"ProfileRepository/SetActive: ERROR - Cannot apply the AMD display config in profile {Name} as it is not currently possible to use it.");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
SharedLogger.logger.Info($"ProfileRepository/SetActive: The display settings in profile {Name} are already installed. No need to install them again. Exiting.");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
public override bool CreateProfileFromCurrentDisplaySettings()
|
public override bool CreateProfileFromCurrentDisplaySettings()
|
||||||
{
|
{
|
||||||
|
|
||||||
|
|||||||
@ -179,6 +179,57 @@ namespace DisplayMagicianShared.NVIDIA
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Actually set this profile active
|
||||||
|
public override bool SetActive()
|
||||||
|
{
|
||||||
|
NVIDIALibrary nvidiaLibrary = NVIDIALibrary.GetLibrary();
|
||||||
|
WinLibrary winLibrary = WinLibrary.GetLibrary();
|
||||||
|
if (nvidiaLibrary.IsInstalled)
|
||||||
|
{
|
||||||
|
if (!nvidiaLibrary.IsActiveConfig(_nvidiaDisplayConfig) && !winLibrary.IsActiveConfig(_windowsDisplayConfig))
|
||||||
|
{
|
||||||
|
if (nvidiaLibrary.IsPossibleConfig(_nvidiaDisplayConfig))
|
||||||
|
{
|
||||||
|
SharedLogger.logger.Trace($"ProfileRepository/SetActive: The NVIDIA display settings within profile {Name} are possible to use right now, so we'll use attempt to use them.");
|
||||||
|
bool itWorkedforNVIDIA = nvidiaLibrary.SetActiveConfig(_nvidiaDisplayConfig);
|
||||||
|
|
||||||
|
if (itWorkedforNVIDIA)
|
||||||
|
{
|
||||||
|
SharedLogger.logger.Trace($"ProfileRepository/SetActive: The NVIDIA display settings within profile {Name} were successfully applied.");
|
||||||
|
// Then let's try to also apply the windows changes
|
||||||
|
// Note: we are unable to check if the Windows CCD display config is possible, as it won't match if either the current display config is a Mosaic config,
|
||||||
|
// or if the display config we want to change to is a Mosaic config. So we just have to assume that it will work!
|
||||||
|
bool itWorkedforWindows = winLibrary.SetActiveConfig(_windowsDisplayConfig);
|
||||||
|
if (itWorkedforWindows)
|
||||||
|
{
|
||||||
|
SharedLogger.logger.Trace($"ProfileRepository/SetActive: The Windows CCD display settings within profile {Name} were successfully applied.");
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
SharedLogger.logger.Trace($"ProfileRepository/SetActive: The Windows CCD display settings within profile {Name} were NOT applied correctly.");
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
SharedLogger.logger.Trace($"ProfileRepository/SetActive: The NVIDIA display settings within profile {Name} were NOT applied correctly.");
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
SharedLogger.logger.Error($"ProfileRepository/SetActive: ERROR - Cannot apply the NVIDIA display config in profile {Name} as it is not currently possible to use it.");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
SharedLogger.logger.Info($"ProfileRepository/SetActive: The display settings in profile {Name} are already installed. No need to install them again. Exiting.");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
public override bool CreateProfileFromCurrentDisplaySettings()
|
public override bool CreateProfileFromCurrentDisplaySettings()
|
||||||
{
|
{
|
||||||
|
|
||||||
|
|||||||
@ -501,6 +501,13 @@ namespace DisplayMagicianShared
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Actually set this profile active
|
||||||
|
public virtual bool SetActive()
|
||||||
|
{
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
public virtual List<ScreenPosition> GetScreenPositions()
|
public virtual List<ScreenPosition> GetScreenPositions()
|
||||||
{
|
{
|
||||||
return new List<ScreenPosition>();
|
return new List<ScreenPosition>();
|
||||||
|
|||||||
@ -167,6 +167,32 @@ namespace DisplayMagicianShared.Windows
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Actually set this profile active
|
||||||
|
public override bool SetActive()
|
||||||
|
{
|
||||||
|
WinLibrary winLibrary = WinLibrary.GetLibrary();
|
||||||
|
if (winLibrary.IsInstalled)
|
||||||
|
{
|
||||||
|
if (!winLibrary.IsActiveConfig(_windowsDisplayConfig))
|
||||||
|
{
|
||||||
|
if (winLibrary.SetActiveConfig(_windowsDisplayConfig))
|
||||||
|
{
|
||||||
|
SharedLogger.logger.Trace($"ProfileRepository/SetActive: The Windows CCD display settings within profile {Name} were successfully applied.");
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
SharedLogger.logger.Trace($"ProfileRepository/SetActive: The Windows CCD display settings within profile {Name} were NOT applied correctly.");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
SharedLogger.logger.Info($"ProfileRepository/SetActive: The display settings in profile {Name} are already installed. No need to install them again. Exiting.");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
public override bool CreateProfileFromCurrentDisplaySettings()
|
public override bool CreateProfileFromCurrentDisplaySettings()
|
||||||
{
|
{
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user