WinGui: Remove the EncodeJob model. This removes another abstraction layer that is no longer necessary now that the GUI uses libhb directly.

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

1 files changed, 2 insertions, 3 deletions

diff --git a/win/CS/HandBrakeWPF/ViewModels/PictureSettingsViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/PictureSettingsViewModel.cs
index 4d133606c..24bff58e6 100644
--- a/win/CS/HandBrakeWPF/ViewModels/PictureSettingsViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/PictureSettingsViewModel.cs
@@ -13,7 +13,6 @@ namespace HandBrakeWPF.ViewModels
     using System.Collections.Generic;

     using System.Globalization;

 

-    using HandBrake.ApplicationServices.Model;

     using HandBrake.ApplicationServices.Services.Encode.Model;

     using HandBrake.ApplicationServices.Services.Scan.Model;

     using HandBrake.ApplicationServices.Interop.Model;

@@ -25,7 +24,6 @@ namespace HandBrakeWPF.ViewModels
     using HandBrakeWPF.ViewModels.Interfaces;

 

     using PresetPictureSettingsMode = HandBrakeWPF.Model.Picture.PresetPictureSettingsMode;

-    using Size = System.Drawing.Size;

 

     /// <summary>

     /// The Picture Settings View Model

@@ -126,6 +124,7 @@ namespace HandBrakeWPF.ViewModels
         /// </summary>

         public PictureSettingsViewModel()

         {

+            this.sourceResolution = new Size(0, 0);

             this.Task = new EncodeTask();

             this.Init();

         }

@@ -947,7 +946,7 @@ namespace HandBrakeWPF.ViewModels
 

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

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

-            this.DisplaySize = this.sourceResolution.IsEmpty

+            this.DisplaySize = this.sourceResolution == null || this.sourceResolution.IsEmpty

                            ? string.Empty

                            : string.Format("Storage: {0}x{1}, Display: {2}x{3}", result.OutputWidth, result.OutputHeight, dispWidth, result.OutputHeight);