starred/ColorControl
1
0 Fork 0
mirror of https://github.com/Maassoft/ColorControl.git synced 2026-10-22 00:22:18 -05:00
Code Issues Packages Projects Releases 10 Wiki Activity

temporarily disabled AMD code because of static imports

Browse Source
This commit is contained in:
Vincent Maas committed 2020-11-22 21:34:22 +01:00
1 parent aa371d739e
commit 0c5d3b4eb8
5 files changed
+25 -29
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

ColorControl/ADLWrapper.cs
-2
View File
@@ -3,8 +3,6 @@ using System;
using System.Collections.Generic;
using System.Linq;
using System.Runtime.InteropServices;
using System.Text;
using System.Threading.Tasks;
namespace ColorControl
{
ColorControl/AmdService.cs
+12 -13
View File
@@ -1,9 +1,6 @@
using ATI.ADL;
using NvAPIWrapper.Display;
//using ATI.ADL;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Runtime.InteropServices;
namespace ColorControl
{
@@ -81,7 +78,7 @@ namespace ColorControl
var vertical = 2160;
var display = GetCurrentDisplay();
ADLWrapper.GetDisplayResolution(display, ref horizontal, ref vertical);
//ADLWrapper.GetDisplayResolution(display, ref horizontal, ref vertical);
return SetRefreshRateInternal(display, refreshRate, portrait, horizontal, vertical);
}
@@ -98,7 +95,7 @@ namespace ColorControl
var vertical = 2160;
var display = GetCurrentDisplay();
ADLWrapper.GetDisplayResolution(display, ref horizontal, ref vertical);
//ADLWrapper.GetDisplayResolution(display, ref horizontal, ref vertical);
return GetAvailableRefreshRatesInternal(display, portrait, horizontal, vertical);
}
@@ -112,22 +109,24 @@ namespace ColorControl
return false;
}
public List<ADLDisplayInfo> GetDisplays()
public List<string> GetDisplays()
{
return ADLWrapper.GetAllDisplays();
//return ADLWrapper.GetAllDisplays();
return null;
}
protected override void Initialize()
{
if (!ADLWrapper.Initialize())
{
throw new InvalidOperationException("Cannot load AMD API");
}
//if (!ADLWrapper.Initialize())
//{
// throw new InvalidOperationException("Cannot load AMD API");
//}
throw new InvalidOperationException("Cannot load AMD API");
}
protected override void Uninitialize()
{
ADLWrapper.Uninitialze();
//ADLWrapper.Uninitialze();
}
}
}
ColorControl/ColorControl.csproj
+1 -3
View File
@@ -27,7 +27,7 @@
<ProductName>ColorControl</ProductName>
<PublisherName>Maassoft</PublisherName>
<ApplicationRevision>0</ApplicationRevision>
<ApplicationVersion>1.3.2.0</ApplicationVersion>
<ApplicationVersion>1.3.3.0</ApplicationVersion>
<UseApplicationTrust>false</UseApplicationTrust>
<PublishWizardCompleted>true</PublishWizardCompleted>
<BootstrapperEnabled>true</BootstrapperEnabled>
@@ -172,8 +172,6 @@
<Reference Include="WindowsBase" />
</ItemGroup>
<ItemGroup>
<Compile Include="ADL.cs" />
<Compile Include="ADLWrapper.cs" />
<Compile Include="GraphicsService.cs" />
<Compile Include="AmdService.cs" />
<Compile Include="AmdPreset.cs" />
ColorControl/MainForm.cs
+10 -9
View File
@@ -134,15 +134,16 @@ namespace ColorControl
_nvPresetsFilename = Path.Combine(_dataDir, "NvPresets.json");
FillNvPresets();
try
{
_amdService = new AmdService();
lblErrorAMD.Text = "If you see this message, it means you have AMD graphics drivers installed. Unfortunately, this feature is not completed yet. If I get an AMD card I might finish it.";
}
catch (Exception)
{
tcMain.TabPages.Remove(tabAMD);
}
//try
//{
// _amdService = new AmdService();
// lblErrorAMD.Text = "If you see this message, it means you have AMD graphics drivers installed. Unfortunately, this feature is not completed yet. If I get an AMD card I might finish it.";
//}
//catch (Exception)
//{
// tcMain.TabPages.Remove(tabAMD);
//}
tcMain.TabPages.Remove(tabAMD);
_lgPresetsFilename = Path.Combine(_dataDir, "LgPresets.json");
var toCopy = Path.Combine(Directory.GetCurrentDirectory(), "LgPresets.json");
ColorControl/Properties/AssemblyInfo.cs
+2 -2
View File
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.3.2.0")]
[assembly: AssemblyFileVersion("1.3.2.0")]
[assembly: AssemblyVersion("1.3.3.0")]
[assembly: AssemblyFileVersion("1.3.3.0")]