WinGui: Updating the app to handle the latest JSON API change regarding the Automatic title scan on encode. This Simplifies the API in the services library.

git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@6977 b64f7644-9d1e-0410-96f1-a4d463321fa5

2 files changed, 7 insertions, 27 deletions

diff --git a/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs
index 9c46008f8..88aa0c9e9 100644
--- a/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs
@@ -605,7 +605,7 @@ namespace HandBrakeWPF.ViewModels
             set

             {

                 this.isEncoding = value;

-                this.CanPause = value && this.encodeService.CanPause;

+                this.CanPause = value;

                 this.NotifyOfPropertyChange(() => this.IsEncoding);

             }

         }

@@ -1435,12 +1435,8 @@ namespace HandBrakeWPF.ViewModels
         public void PauseEncode()

         {

             this.queueProcessor.Pause();

-

-            if (this.encodeService.CanPause)

-            {

-                this.encodeService.Pause();

-                this.IsEncoding = false;

-            }

+            this.encodeService.Pause();

+            this.IsEncoding = false;

         }

 

         /// <summary>

diff --git a/win/CS/HandBrakeWPF/ViewModels/PictureSettingsViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/PictureSettingsViewModel.cs
index 24bff58e6..1dd0ad93c 100644
--- a/win/CS/HandBrakeWPF/ViewModels/PictureSettingsViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/PictureSettingsViewModel.cs
@@ -923,26 +923,10 @@ namespace HandBrakeWPF.ViewModels
 

             // Step 2, For the changed field, call hb_set_anamorphic_size and process the results.

             PictureSize.AnamorphicResult result = PictureSize.hb_set_anamorphic_size2(this.GetPictureSettings(), this.GetPictureTitleInfo(), setting);

-

-            switch (this.SelectedAnamorphicMode)

-            {

-                case Anamorphic.None:

-                    this.Task.Width = result.OutputWidth;

-                    this.Task.Height = result.OutputHeight;

-                    break;

-                case Anamorphic.Strict:

-                    this.Task.Width = 0;

-                    this.Task.Height = 0;

-                    break;

-                case Anamorphic.Loose:

-                    this.Task.Width = result.OutputWidth;

-                    this.Task.Height = 0;

-                    break;

-                case Anamorphic.Custom:

-                    this.Task.Width = result.OutputWidth;

-                    this.Task.Height = result.OutputHeight;

-                    break;

-            }

+            this.Task.Width = result.OutputWidth;

+            this.Task.Height = result.OutputHeight;

+            this.Task.PixelAspectX = (int)Math.Round(result.OutputParWidth, 0);

+            this.Task.PixelAspectY = (int)Math.Round(result.OutputParHeight, 0);

 

             // Step 3, Set the display width label to indicate the output.

             double dispWidth = Math.Round((result.OutputWidth * result.OutputParWidth / result.OutputParHeight), 0);