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 @@
4.0.0-alpha5
- 1.6.4
+ 1.7.0
1.2.0
@@ -271,10 +271,10 @@
2.8.0.16
- 1.2.0.1
+ 1.2.5.4
- 1.11.33
+ 1.11.36
0.73.0
@@ -286,10 +286,10 @@
13.8.2
- 3.1.0
+ 4.0.0-beta.74
- 7.0.2
+ 7.1.0-preview1
1.0.4
@@ -304,7 +304,7 @@
2.1.0
- 4.7.10
+ 4.7.11
1.0.0
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 _connectedDisplayIdentifiers = new List();
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