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

Remove unneeded NVIDIA check

Browse Source 
Removed the NVIDIA check for the DisplayTarget
device path containing 'UID5120' as this isn't supported
by the Quadro cards. Fixes #30.
This commit is contained in:
Terry MacDonald 2021-07-26 19:43:12 +12:00
parent a90c555972
commit 5d48a537e2
1 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
DisplayMagicianShared/NVIDIA/SurroundTopology.cs
View File

@ -61,10 +61,10 @@ namespace DisplayMagicianShared.NVIDIA
string EDIDManufactureCode = ""; string EDIDManufactureCode = "";
string friendlyName = ""; string friendlyName = "";
bool devicePathContainsUID5120 = false; //bool devicePathContainsUID5120 = false;
bool isNvidiaEDID = false; bool isNvidiaEDID = false;
bool isNvidiaDeviceName = false; bool isNvidiaDeviceName = false;
bool isNvidiaDevicePath = false; //bool isNvidiaDevicePath = false;
try try
{ {
@ -75,6 +75,10 @@ namespace DisplayMagicianShared.NVIDIA
SharedLogger.logger.Trace($"SurroundTopology/FromPathTargetInfo: The EDIDManufactureCode of {EDIDManufactureCode} matches 'NVS', so this is an NVIDIA surround topology."); SharedLogger.logger.Trace($"SurroundTopology/FromPathTargetInfo: The EDIDManufactureCode of {EDIDManufactureCode} matches 'NVS', so this is an NVIDIA surround topology.");
isNvidiaEDID = true; isNvidiaEDID = true;
} }
else
{
SharedLogger.logger.Trace($"SurroundTopology/FromPathTargetInfo: The EDIDManufactureCode of {EDIDManufactureCode} does NOT match 'NVS', so this is NOT a NVIDIA surround topology.");
}
} }
catch (Exception ex) catch (Exception ex)
{ {
@ -90,13 +94,18 @@ namespace DisplayMagicianShared.NVIDIA
SharedLogger.logger.Trace($"SurroundTopology/FromPathTargetInfo: The Display FriendlyName of {friendlyName} matches 'NV Surround', so this is an NVIDIA surround topology."); SharedLogger.logger.Trace($"SurroundTopology/FromPathTargetInfo: The Display FriendlyName of {friendlyName} matches 'NV Surround', so this is an NVIDIA surround topology.");
isNvidiaDeviceName = true; isNvidiaDeviceName = true;
} }
else
{
SharedLogger.logger.Trace($"SurroundTopology/FromPathTargetInfo: The Display FriendlyName of {friendlyName} does NOT match 'NV Surround', so this is NOT a NVIDIA surround topology.");
}
} }
catch (Exception ex) catch (Exception ex)
{ {
SharedLogger.logger.Warn(ex, $"SurroundTopology/FromPathTargetInfo: Exception trying to access friendlyName."); SharedLogger.logger.Warn(ex, $"SurroundTopology/FromPathTargetInfo: Exception trying to access friendlyName.");
} }
try
/*try
{ {
devicePathContainsUID5120 = pathTargetInfo.DisplayTarget.DevicePath.ToLower().Contains("&UID5120".ToLower()); devicePathContainsUID5120 = pathTargetInfo.DisplayTarget.DevicePath.ToLower().Contains("&UID5120".ToLower());
SharedLogger.logger.Trace($"SurroundTopology/FromPathTargetInfo: Testing if the Display DevicePath contains UID5120 = {devicePathContainsUID5120}."); SharedLogger.logger.Trace($"SurroundTopology/FromPathTargetInfo: Testing if the Display DevicePath contains UID5120 = {devicePathContainsUID5120}.");
@ -105,14 +114,19 @@ namespace DisplayMagicianShared.NVIDIA
SharedLogger.logger.Trace($"SurroundTopology/FromPathTargetInfo: The Device Path contains UID5120, so this is an NVIDIA surround topology."); SharedLogger.logger.Trace($"SurroundTopology/FromPathTargetInfo: The Device Path contains UID5120, so this is an NVIDIA surround topology.");
isNvidiaDevicePath = true; isNvidiaDevicePath = true;
} }
else
{
SharedLogger.logger.Trace($"SurroundTopology/FromPathTargetInfo: The Device Path does not contains UID5120, so this is an NVIDIA surround topology.");
}
} }
catch (Exception ex) catch (Exception ex)
{ {
SharedLogger.logger.Warn(ex, $"SurroundTopology/FromPathTargetInfo: Exception trying to access friendlyName."); SharedLogger.logger.Warn(ex, $"SurroundTopology/FromPathTargetInfo: Exception trying to access friendlyName.");
} }*/
// If the checks haven't passed, then we return null // If the checks haven't passed, then we return null
if (!isNvidiaEDID && !isNvidiaDeviceName && !isNvidiaDevicePath) //if (!isNvidiaEDID && !isNvidiaDeviceName && !isNvidiaDevicePath)
if (!isNvidiaEDID && !isNvidiaDeviceName)
{ {
SharedLogger.logger.Warn($"SurroundTopology/FromPathTargetInfo: As far as we can tell, this isn't an NVIDIA Surround window, so we're returning null."); SharedLogger.logger.Warn($"SurroundTopology/FromPathTargetInfo: As far as we can tell, this isn't an NVIDIA Surround window, so we're returning null.");
return null; return null;