add device filter

Maassoft · Dec 4, 2020 · bc87260 · bc87260
1 parent 067b6d7
commit bc87260
Show file tree

Hide file tree

Showing 9 changed files with 80 additions and 41 deletions.
diff --git a/ColorControl/ColorControl.csproj b/ColorControl/ColorControl.csproj
@@ -27,7 +27,7 @@
     <ProductName>ColorControl</ProductName>
     <PublisherName>Maassoft</PublisherName>
     <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.3.5.0</ApplicationVersion>
+    <ApplicationVersion>1.3.6.0</ApplicationVersion>
     <UseApplicationTrust>false</UseApplicationTrust>
     <PublishWizardCompleted>true</PublishWizardCompleted>
     <BootstrapperEnabled>true</BootstrapperEnabled>

diff --git a/ColorControl/ColorDataConverter.cs b/ColorControl/ColorDataConverter.cs
@@ -48,7 +48,7 @@ public override object Deserialize(IDictionary<string, object> dictionary, Type
             {
                 selectionPolicy = (ColorDataSelectionPolicy)Enum.ToObject(typeof(ColorDataSelectionPolicy), value);
             }
-            return new ColorData(format, dynamicRange: dynamicRange, colorimetry: colorimetry, colorDepth: colorDepth, colorSelectionPolicy: selectionPolicy);
+            return new ColorData(format, dynamicRange: dynamicRange, colorimetry: colorimetry, colorDepth: colorDepth, colorSelectionPolicy: selectionPolicy, desktopColorDepth: ColorDataDesktopDepth.Default);
         }
     }
 }
diff --git a/ColorControl/LgService.cs b/ColorControl/LgService.cs
@@ -18,8 +18,6 @@ class LgService
     {
         public static string LgListAppsJson = "listApps.json";
 
-        public static string LgDeviceSearchKey = "[LG]";
-
         private static readonly NLog.Logger Logger = NLog.LogManager.GetCurrentClassLogger();
 
         public string FriendlyScreenName { get; private set; }
@@ -88,7 +86,7 @@ public void SaveConfig()
 
         public async Task RefreshDevices(bool connect = true)
         {
-            var devices = await Utils.GetPnpDevices(LgDeviceSearchKey);
+            var devices = await Utils.GetPnpDevices(Config.DeviceSearchKey);
             SetDevices(devices);
             if (connect && SelectedDevice != null)
             {

diff --git a/ColorControl/LgServiceConfig.cs b/ColorControl/LgServiceConfig.cs
@@ -14,9 +14,12 @@ class LgServiceConfig
 
         public string PreferredMacAddress { get; set; }
 
+        public string DeviceSearchKey { get; set; }
+
         public LgServiceConfig()
         {
             PowerOnDelayAfterResume = 5000;
+            DeviceSearchKey = "[LG]";
         }
     }
 }
diff --git a/ColorControl/MainForm.Designer.cs b/ColorControl/MainForm.Designer.cs
diff --git a/ColorControl/MainForm.cs b/ColorControl/MainForm.cs
@@ -172,6 +172,7 @@ public MainForm(StartUpParams startUpParams)
                 clbLgPower.SetItemChecked(2, _lgService.Config.PowerOffOnShutdown);
                 clbLgPower.SetItemChecked(3, _lgService.Config.PowerOffOnStandby);
                 edtLgPowerOnAfterResumeDelay.Value = _lgService.Config.PowerOnDelayAfterResume;
+                edtLgDeviceFilter.Text = _lgService.Config.DeviceSearchKey;
             }
             catch (Exception e)
             {
@@ -1420,7 +1421,7 @@ private void tabControl1_SelectedIndexChanged(object sender, EventArgs e)
                     var devices = _lgService.Devices;
                     if (devices == null || !devices.Any())
                     {
-                        _lgService.RefreshDevices(false).ContinueWith((task) => BeginInvoke(new Action(FillLgDevices)));
+                        RefreshLgDevices();
                     }
                     else
                     {
@@ -1440,6 +1441,7 @@ private void tabControl1_SelectedIndexChanged(object sender, EventArgs e)
 
         private void FillLgDevices()
         {
+            cbxLgDevices.Items.Clear();
             var devices = _lgService.Devices;
             foreach (var device in devices)
             {
@@ -1458,7 +1460,6 @@ private void FillLgDevices()
             if (cbxLgApps.Items.Count == 0 && _lgService.SelectedDevice != null)
             {
                 _lgService.RefreshApps().ContinueWith((task) => BeginInvoke(new Action<Task<List<LgApp>>>(FillLgApps), new[] { task }));
-                edtLgTvName.Text = _lgService.FriendlyScreenName;
             }
         }
 
@@ -1890,5 +1891,23 @@ private void btnClearLog_Click(object sender, EventArgs e)
                 edtLog.Clear();
             }
         }
+
+        private void edtLgDeviceFilter_TextChanged(object sender, EventArgs e)
+        {
+            if (_lgService != null)
+            {
+                _lgService.Config.DeviceSearchKey = edtLgDeviceFilter.Text;
+            }
+        }
+
+        private void btnLgDeviceFilterRefresh_Click(object sender, EventArgs e)
+        {
+            RefreshLgDevices();
+        }
+
+        private void RefreshLgDevices()
+        {
+            _lgService.RefreshDevices(false).ContinueWith((task) => BeginInvoke(new Action(FillLgDevices)));
+        }
     }
 }
diff --git a/ColorControl/NvService.cs b/ColorControl/NvService.cs
@@ -88,8 +88,14 @@ public bool ApplyPreset(NvPreset preset, Config config)
             if (preset.applyColorData)
             {
                 var display = GetCurrentDisplay();
-                //var data = new ColorData(ColorDataFormat.YUV444, ColorDataColorimetry.YCC709, ColorDataDynamicRange.Auto, ColorDataDepth.BPC8, preset.colorData.SelectionPolicy, ColorDataDesktopDepth.Default);
-                display.DisplayDevice.SetColorData(preset.colorData);
+                //var data = new ColorData(ColorDataFormat.YUV444, ColorDataColorimetry.Auto, ColorDataDynamicRange.Auto, ColorDataDepth.BPC10, preset.colorData.SelectionPolicy, ColorDataDesktopDepth.Default);
+                try
+                {
+                    display.DisplayDevice.SetColorData(preset.colorData);
+                }
+                catch (Exception ex)
+                {
+                }
 
                 //var master = display.DisplayDevice.HDRColorData.MasteringDisplayData;
                 //var newMaster = new MasteringDisplayColorData(master.FirstColorCoordinate, master.SecondColorCoordinate, master.ThirdColorCoordinate, new ColorDataColorCoordinate(0.25f, 0.25f), 50, 0, 50, 50);

diff --git a/ColorControl/Properties/AssemblyInfo.cs b/ColorControl/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // 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.5.0")]
-[assembly: AssemblyFileVersion("1.3.5.0")]
+[assembly: AssemblyVersion("1.3.6.0")]
+[assembly: AssemblyFileVersion("1.3.6.0")]
diff --git a/ColorControl/Utils.cs b/ColorControl/Utils.cs
@@ -240,7 +240,7 @@ public static string GetDeviceProperty(PnpObject device, string propertyName)
                 }
                 else
                 {
-                    value = objValue.ToString();
+                    value = objValue?.ToString();
                 }
             }
 
@@ -272,7 +272,7 @@ public static async Task<List<PnpDev>> GetPnpDevices(string deviceName)
                         var ipAddress = GetDeviceProperty(dev2, "System.Devices.IpAddress");
                         var macAddress = GetDeviceProperty(dev2, PKEY_PNPX_PhysicalAddress);
 
-                        if (!devices.Any(x => x.Name.Equals(name) && x.IpAddress.Equals(ipAddress)))
+                        if (!devices.Any(x => x.Name.Equals(name) && x.IpAddress != null && x.IpAddress.Equals(ipAddress)))
                         {
                             var device = new PnpDev(dev, dev2, name, ipAddress, macAddress);
                             devices.Add(device);