From a4662bed6cb5d08fd5d2156f4c3322d630cec38a Mon Sep 17 00:00:00 2001
From: Terry MacDonald <terry.macdonald@cosive.com>
Date: Sat, 21 Aug 2021 22:09:41 +1200
Subject: [PATCH] Removed prior graphics libraries to enable new lib
 integration.

Tweaked some easy to fix integration errors.
---
 DisplayMagician/DisplayMagician.csproj            | 12 ++++++------
 DisplayMagician/ShortcutRepository.cs             | 13 +------------
 DisplayMagicianShared/NVIDIA/NVIDIAProfileItem.cs |  6 +++---
 DisplayMagicianShared/ProfileRepository.cs        | 13 ++++---------
 4 files changed, 14 insertions(+), 30 deletions(-)

diff --git a/DisplayMagician/DisplayMagician.csproj b/DisplayMagician/DisplayMagician.csproj
index ba764ba..df2f162 100644
--- a/DisplayMagician/DisplayMagician.csproj
+++ b/DisplayMagician/DisplayMagician.csproj
@@ -262,7 +262,7 @@
       <Version>4.0.0-alpha5</Version>
     </PackageReference>
     <PackageReference Include="Autoupdater.NET.Official">
-      <Version>1.6.4</Version>
+      <Version>1.7.0</Version>
     </PackageReference>
     <PackageReference Include="BootMeUp">
       <Version>1.2.0</Version>
@@ -271,10 +271,10 @@
       <Version>2.8.0.16</Version>
     </PackageReference>
     <PackageReference Include="EDIDParser">
-      <Version>1.2.0.1</Version>
+      <Version>1.2.5.4</Version>
     </PackageReference>
     <PackageReference Include="HtmlAgilityPack">
-      <Version>1.11.33</Version>
+      <Version>1.11.36</Version>
     </PackageReference>
     <PackageReference Include="IconLib.Unofficial">
       <Version>0.73.0</Version>
@@ -286,10 +286,10 @@
       <Version>13.8.2</Version>
     </PackageReference>
     <PackageReference Include="McMaster.Extensions.CommandLineUtils">
-      <Version>3.1.0</Version>
+      <Version>4.0.0-beta.74</Version>
     </PackageReference>
     <PackageReference Include="Microsoft.Toolkit.Uwp.Notifications">
-      <Version>7.0.2</Version>
+      <Version>7.1.0-preview1</Version>
     </PackageReference>
     <PackageReference Include="MintPlayer.IconUtils">
       <Version>1.0.4</Version>
@@ -304,7 +304,7 @@
       <Version>2.1.0</Version>
     </PackageReference>
     <PackageReference Include="NLog">
-      <Version>4.7.10</Version>
+      <Version>4.7.11</Version>
     </PackageReference>
     <PackageReference Include="QueryString.NET">
       <Version>1.0.0</Version>
diff --git a/DisplayMagician/ShortcutRepository.cs b/DisplayMagician/ShortcutRepository.cs
index 46ff58b..7f58951 100644
--- a/DisplayMagician/ShortcutRepository.cs
+++ b/DisplayMagician/ShortcutRepository.cs
@@ -41,17 +41,7 @@ namespace DisplayMagician
 
         #region Class Constructors
         static ShortcutRepository()
-        {
-
-            try
-            {
-                NvAPIWrapper.NVIDIA.Initialize();
-            }
-            catch (Exception ex)
-            {
-                logger.Warn(ex, $"ShortcutRepository/ShortcutRepository: Initialising NVIDIA NvAPIWrapper or CoreAudioController caused an exception.");
-            }
-
+        {            
             try
             {
                 _audioController = new CoreAudioController();
@@ -63,7 +53,6 @@ namespace DisplayMagician
 
             // Load the Shortcuts from storage
             LoadShortcuts();
-
         }
 
         #endregion
diff --git a/DisplayMagicianShared/NVIDIA/NVIDIAProfileItem.cs b/DisplayMagicianShared/NVIDIA/NVIDIAProfileItem.cs
index a694bc1..937c4d1 100644
--- a/DisplayMagicianShared/NVIDIA/NVIDIAProfileItem.cs
+++ b/DisplayMagicianShared/NVIDIA/NVIDIAProfileItem.cs
@@ -247,11 +247,11 @@ namespace DisplayMagicianShared.NVIDIA
         public override bool CreateProfileFromCurrentDisplaySettings()
         {
 
-            AMDLibrary amdLibrary = AMDLibrary.GetLibrary();
-            if (amdLibrary.IsInstalled)
+            NVIDIALibrary nvidiaLibrary = NVIDIALibrary.GetLibrary();
+            if (nvidiaLibrary.IsInstalled)
             {
                 // Create the profile data from the current config
-                _displayConfig = amdLibrary.GetActiveConfig();
+                _displayConfig = nvidiaLibrary.GetActiveConfig();
 
                 // Now, since the ActiveProfile has changed, we need to regenerate screen positions
                 _screens = GetScreenPositions();
diff --git a/DisplayMagicianShared/ProfileRepository.cs b/DisplayMagicianShared/ProfileRepository.cs
index dd8b6df..d82ecb7 100644
--- a/DisplayMagicianShared/ProfileRepository.cs
+++ b/DisplayMagicianShared/ProfileRepository.cs
@@ -5,17 +5,11 @@ using System.Drawing.IconLib;
 using System.IO;
 using System.Linq;
 using System.Text;
-using WindowsDisplayAPI.DisplayConfig;
-using NvAPIWrapper.Mosaic;
-using NvAPIWrapper.Native.Mosaic;
-using WindowsDisplayAPI;
 using System.Diagnostics;
 using System.Text.RegularExpressions;
-using NvAPIWrapper.Native.GPU;
 using DisplayMagicianShared.AMD;
 using DisplayMagicianShared.NVIDIA;
 using DisplayMagicianShared.Windows;
-using System.Windows.Forms;
 
 namespace DisplayMagicianShared
 {
@@ -33,6 +27,7 @@ namespace DisplayMagicianShared
         private static List<string> _connectedDisplayIdentifiers = new List<string>();
         private static bool notifiedEDIDErrorToUser = false;
         private static AMDLibrary AMDLibrary;
+        private static NVIDIALibrary NVIDIALibrary;
         //private static bool _isLoading = false;
 
         // Other constants that are useful
@@ -52,12 +47,12 @@ namespace DisplayMagicianShared
             // Initialise the the NVIDIA NvAPIWrapper
             try
             {
-                SharedLogger.logger.Debug($"ProfileRepository/ProfileRepository: Initialising the NvAPIWrapper.NVIDIA library.");
-                NvAPIWrapper.NVIDIA.Initialize();
+                SharedLogger.logger.Debug($"ProfileRepository/ProfileRepository: Initialising the NVIDIA NVAPI library.");
+                NVIDIALibrary = new NVIDIALibrary();
             }
             catch (Exception ex)
             {
-                SharedLogger.logger.Warn(ex, $"ProfileRepository/ProfileRepository: Initialising NVIDIA NvAPIWrapper caused an exception.");
+                SharedLogger.logger.Warn(ex, $"ProfileRepository/ProfileRepository: Initialising NVIDIA NVAPI caused an exception.");
             }
 
             // Initialise the the AMD ADLWrapper