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

Removed WindowsDisplayAPI

Browse Source 
No longer need WindowsDisplayAPI as I've build a Windows CCD library as part of DisplayMagician itself now.
This commit is contained in:
Terry MacDonald 2021-08-22 15:51:13 +12:00
parent 40b8525dd8
commit bd89993770
2 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
DisplayMagician/DisplayRepresentation.cs
View File

@ -2,8 +2,6 @@
using System.Collections.Generic; using System.Collections.Generic;
using System.Drawing; using System.Drawing;
using System.Linq; using System.Linq;
using WindowsDisplayAPI;
using WindowsDisplayAPI.DisplayConfig;
using DisplayMagicianShared; using DisplayMagicianShared;
using DisplayMagicianShared.Topology; using DisplayMagicianShared.Topology;

21
DisplayMagicianShared/ProfileRepository.cs
View File

@ -571,7 +571,7 @@ namespace DisplayMagicianShared
SharedLogger.logger.Debug($"ProfileRepository/UpdateActiveProfile: Updating the profile currently active (in use now)."); SharedLogger.logger.Debug($"ProfileRepository/UpdateActiveProfile: Updating the profile currently active (in use now).");
SharedLogger.logger.Debug($"ProfileRepository/UpdateActiveProfile: Attempting to access configuration through NVIDIA, then AMD, then Windows CCD interfaces, in that order."); SharedLogger.logger.Debug($"ProfileRepository/UpdateActiveProfile: Attempting to access configuration through NVIDIA, then AMD, then Windows CCD interfaces, in that order.");
if (NVIDIALibrary.GetLibrary().IsInstalled) if (_videoMode == VIDEO_MODE.NVIDIA)
{ {
SharedLogger.logger.Debug($"ProfileRepository/UpdateActiveProfile: NVIDIA NVAPI Driver is installed, so using that for this display profile."); SharedLogger.logger.Debug($"ProfileRepository/UpdateActiveProfile: NVIDIA NVAPI Driver is installed, so using that for this display profile.");
NVIDIAProfileItem nvidiaProfile = new NVIDIAProfileItem NVIDIAProfileItem nvidiaProfile = new NVIDIAProfileItem
@ -586,7 +586,7 @@ namespace DisplayMagicianShared
nvidiaProfile.CreateProfileFromCurrentDisplaySettings(); nvidiaProfile.CreateProfileFromCurrentDisplaySettings();
activeProfile = nvidiaProfile; activeProfile = nvidiaProfile;
} }
else if (AMDLibrary.GetLibrary().IsInstalled) else if (_videoMode == VIDEO_MODE.AMD)
{ {
SharedLogger.logger.Debug($"ProfileRepository/UpdateActiveProfile: NVIDIA is not installed but the AMD ADL Driver IS installed, so using that for this display profile."); SharedLogger.logger.Debug($"ProfileRepository/UpdateActiveProfile: NVIDIA is not installed but the AMD ADL Driver IS installed, so using that for this display profile.");
AMDProfileItem amdProfile = new AMDProfileItem AMDProfileItem amdProfile = new AMDProfileItem
@ -616,8 +616,6 @@ namespace DisplayMagicianShared
activeProfile = winProfile; activeProfile = winProfile;
} }
if (_profilesLoaded && _allProfiles.Count > 0) if (_profilesLoaded && _allProfiles.Count > 0)
{ {
foreach (ProfileItem loadedProfile in ProfileRepository.AllProfiles) foreach (ProfileItem loadedProfile in ProfileRepository.AllProfiles)
@ -633,8 +631,6 @@ namespace DisplayMagicianShared
SharedLogger.logger.Debug($"ProfileRepository/UpdateActiveProfile: The current profile is a new profile that doesn't already exist in the Profile Repository."); SharedLogger.logger.Debug($"ProfileRepository/UpdateActiveProfile: The current profile is a new profile that doesn't already exist in the Profile Repository.");
_currentProfile = activeProfile; _currentProfile = activeProfile;
//IsPossibleRefresh();
} }
public static ProfileItem GetActiveProfile() public static ProfileItem GetActiveProfile()
@ -716,30 +712,37 @@ namespace DisplayMagicianShared
// and check if the current profile is used // and check if the current profile is used
foreach (ProfileItem loadedProfile in _allProfiles) foreach (ProfileItem loadedProfile in _allProfiles)
{ {
if (loadedProfile.Driver.Equals("AMD")) if (loadedProfile is NVIDIAProfileItem)
{ {
// NVIDIA config! // NVIDIA config!
SharedLogger.logger.Debug($"ProfileRepository/LoadProfiles: Profile {loadedProfile.Name} is a NVIDIA Profile");
NVIDIAProfileItem nvidiaLoadedProfile = (NVIDIAProfileItem)loadedProfile; NVIDIAProfileItem nvidiaLoadedProfile = (NVIDIAProfileItem)loadedProfile;
nvidiaLoadedProfile.PerformPostLoadingTasks(); nvidiaLoadedProfile.PerformPostLoadingTasks();
if (ProfileRepository.IsActiveProfile(nvidiaLoadedProfile)) if (ProfileRepository.IsActiveProfile(nvidiaLoadedProfile))
_currentProfile = nvidiaLoadedProfile; _currentProfile = nvidiaLoadedProfile;
} }
else if (loadedProfile.Driver.Equals("AMD")) else if (loadedProfile is AMDProfileItem)
{ {
// AMD config! // AMD config!
SharedLogger.logger.Debug($"ProfileRepository/LoadProfiles: Profile {loadedProfile.Name} is an AMD Profile");
AMDProfileItem amdLoadedProfile = (AMDProfileItem) loadedProfile; AMDProfileItem amdLoadedProfile = (AMDProfileItem) loadedProfile;
amdLoadedProfile.PerformPostLoadingTasks(); amdLoadedProfile.PerformPostLoadingTasks();
if (ProfileRepository.IsActiveProfile(amdLoadedProfile)) if (ProfileRepository.IsActiveProfile(amdLoadedProfile))
_currentProfile = amdLoadedProfile; _currentProfile = amdLoadedProfile;
} }
else else if (loadedProfile is WinProfileItem)
{ {
// Windows CCD config! // Windows CCD config!
SharedLogger.logger.Debug($"ProfileRepository/LoadProfiles: Profile {loadedProfile.Name} is a Windows Profile");
WinProfileItem winLoadedProfile = (WinProfileItem)loadedProfile; WinProfileItem winLoadedProfile = (WinProfileItem)loadedProfile;
winLoadedProfile.PerformPostLoadingTasks(); winLoadedProfile.PerformPostLoadingTasks();
if (ProfileRepository.IsActiveProfile(winLoadedProfile)) if (ProfileRepository.IsActiveProfile(winLoadedProfile))
_currentProfile = winLoadedProfile; _currentProfile = winLoadedProfile;
} }
else
{
SharedLogger.logger.Error($"ProfileRepository/LoadProfiles: ERROR - Profile {loadedProfile.Name} is not a recognised profile!");
}
} }
// Sort the profiles alphabetically // Sort the profiles alphabetically