Preparing fro release 3.10

unosquare · Jul 1, 2019 · 9634627 · 9634627
1 parent 13788a2
commit 9634627
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 7 deletions.
diff --git a/Unosquare.FFME.Windows.Sample/Unosquare.FFME.Windows.Sample.csproj b/Unosquare.FFME.Windows.Sample/Unosquare.FFME.Windows.Sample.csproj
@@ -2,7 +2,7 @@
 <Project Sdk="Microsoft.NET.Sdk.WindowsDesktop" ToolsVersion="Current">
 
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp3.0</TargetFrameworks>
+    <TargetFrameworks>net472;net461;netcoreapp3.0</TargetFrameworks>
     <OutputType>WinExe</OutputType>
     <UseWpf>true</UseWpf>
     <Title>FFME Reference Player</Title>

diff --git a/Unosquare.FFME.Windows.Sample/ViewModels/ControllerViewModel.cs b/Unosquare.FFME.Windows.Sample/ViewModels/ControllerViewModel.cs
@@ -310,9 +310,9 @@ internal override void OnApplicationLoaded()
             m.WhenChanged(() => IsSpeedRatioEnabled = m.IsOpening == false, nameof(m.IsOpen), nameof(m.IsSeekable));
         }
 
-        private (double Contrast, double Brightness, double Saturation) ParseVideoEqualizerFilter()
+        private EqualizerFilterValues ParseVideoEqualizerFilter()
         {
-            var result = (contrast: 1d, brightness: 0d, saturation: 1d);
+            var result = new EqualizerFilterValues() { Contrast = 1d, Brightness = 0d, Saturation = 1d };
 
             if (Root.MediaElement == null || Root.MediaElement.HasVideo == false) return result;
 
@@ -329,9 +329,9 @@ internal override void OnApplicationLoaded()
             var bLiteral = currentFilter.Substring(bIx + VideoEqBrightness.Length, 6);
             var sLiteral = currentFilter.Substring(sIx + VideoEqSaturation.Length, 6);
 
-            result.contrast = double.Parse(cLiteral, CultureInfo.InvariantCulture);
-            result.brightness = double.Parse(bLiteral, CultureInfo.InvariantCulture);
-            result.saturation = double.Parse(sLiteral, CultureInfo.InvariantCulture);
+            result.Contrast = double.Parse(cLiteral, CultureInfo.InvariantCulture);
+            result.Brightness = double.Parse(bLiteral, CultureInfo.InvariantCulture);
+            result.Saturation = double.Parse(sLiteral, CultureInfo.InvariantCulture);
 
             return result;
         }
@@ -373,5 +373,12 @@ private void ApplyVideoEqualizerFilter(double? contrast, double? brightness, dou
                 Root.NotificationMessage = $"Contrast:   {contrast:+0.000;-0.000}\r\nBrightness: {brightness:+0.000;-0.000}\r\nSaturation: {saturation:+0.000;-0.000}";
             }
         }
+
+        private struct EqualizerFilterValues
+        {
+            public double Contrast;
+            public double Brightness;
+            public double Saturation;
+        }
     }
 }
diff --git a/Unosquare.FFME.Windows/Unosquare.FFME.Windows.csproj b/Unosquare.FFME.Windows/Unosquare.FFME.Windows.csproj
@@ -3,7 +3,7 @@
 
   <PropertyGroup>
     <!-- Assembly Properties -->
-    <TargetFrameworks>netcoreapp3.0</TargetFrameworks>
+    <TargetFrameworks>net472;net461;netcoreapp3.0</TargetFrameworks>
     <RootNamespace>Unosquare.FFME</RootNamespace>
     <LangVersion>latest</LangVersion>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>