From 9634627cc3d83435c27961ccc563f61bae7bb8ac Mon Sep 17 00:00:00 2001 From: Mario Di Vece Date: Sun, 30 Jun 2019 19:44:38 -0500 Subject: [PATCH] Preparing fro release 3.10 --- .../Unosquare.FFME.Windows.Sample.csproj | 2 +- .../ViewModels/ControllerViewModel.cs | 17 ++++++++++++----- .../Unosquare.FFME.Windows.csproj | 2 +- 3 files changed, 14 insertions(+), 7 deletions(-) diff --git a/Unosquare.FFME.Windows.Sample/Unosquare.FFME.Windows.Sample.csproj b/Unosquare.FFME.Windows.Sample/Unosquare.FFME.Windows.Sample.csproj index 0229c0637..bdd3e875e 100644 --- a/Unosquare.FFME.Windows.Sample/Unosquare.FFME.Windows.Sample.csproj +++ b/Unosquare.FFME.Windows.Sample/Unosquare.FFME.Windows.Sample.csproj @@ -2,7 +2,7 @@ - netcoreapp3.0 + net472;net461;netcoreapp3.0 WinExe true FFME Reference Player diff --git a/Unosquare.FFME.Windows.Sample/ViewModels/ControllerViewModel.cs b/Unosquare.FFME.Windows.Sample/ViewModels/ControllerViewModel.cs index 5ff8cc3a6..0394e7601 100644 --- 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 index aec940f52..790afdd6e 100644 --- a/Unosquare.FFME.Windows/Unosquare.FFME.Windows.csproj +++ b/Unosquare.FFME.Windows/Unosquare.FFME.Windows.csproj @@ -3,7 +3,7 @@ - netcoreapp3.0 + net472;net461;netcoreapp3.0 Unosquare.FFME latest true