WinGui: (WPF) Numerous fixes / UI tweaks.

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

2 files changed, 30 insertions, 7 deletions

diff --git a/win/CS/HandBrake.ApplicationServices/Model/EncodeTask.cs b/win/CS/HandBrake.ApplicationServices/Model/EncodeTask.cs
index d89c77082..5294668d4 100644
--- a/win/CS/HandBrake.ApplicationServices/Model/EncodeTask.cs
+++ b/win/CS/HandBrake.ApplicationServices/Model/EncodeTask.cs
@@ -29,7 +29,6 @@ namespace HandBrake.ApplicationServices.Model
             this.AudioTracks = new ObservableCollection<AudioTrack>();

             this.SubtitleTracks = new ObservableCollection<SubtitleTrack>();

             this.ChapterNames = new ObservableCollection<ChapterMarker>();

-            this.AllowedPassthruOptions = new AllowedPassthru();

             this.x264Preset = x264Preset.None;

             this.x264Profile = x264Profile.None;

             this.X264Tune = x264Tune.None;

@@ -142,15 +141,39 @@ namespace HandBrake.ApplicationServices.Model
         /// </summary>

         public PointToPointMode PointToPointMode { get; set; }

 

+        private int startPoint;

+

         /// <summary>

         /// Gets or sets StartPoint.

         /// </summary>

-        public int StartPoint { get; set; }

+        public int StartPoint

+        {

+            get

+            {

+                return this.startPoint;

+            }

+            set

+            {

+                this.startPoint = value;

+            }

+        }

+

+        private int endPoint;

 

         /// <summary>

         /// Gets or sets EndPoint.

         /// </summary>

-        public int EndPoint { get; set; }

+        public int EndPoint

+        {

+            get

+            {

+                return this.endPoint;

+            }

+            set

+            {

+                this.endPoint = value;

+            }

+        }

 

         #endregion

 

diff --git a/win/CS/HandBrake.ApplicationServices/Utilities/QueryGeneratorUtility.cs b/win/CS/HandBrake.ApplicationServices/Utilities/QueryGeneratorUtility.cs
index 35cf3a38e..d46296244 100644
--- a/win/CS/HandBrake.ApplicationServices/Utilities/QueryGeneratorUtility.cs
+++ b/win/CS/HandBrake.ApplicationServices/Utilities/QueryGeneratorUtility.cs
@@ -237,10 +237,10 @@ namespace HandBrake.ApplicationServices.Utilities
             if (task.Anamorphic != Anamorphic.Strict)

             {

                 if (task.MaxWidth.HasValue) query += string.Format(" -X {0}", task.MaxWidth);

-                else if (task.Width.HasValue) query += string.Format(" -w {0}", task.Width);

+                else if (task.Width.HasValue && task.Width != 0) query += string.Format(" -w {0}", task.Width);

 

                 if (task.MaxWidth.HasValue) query += string.Format(" -Y {0}", task.MaxHeight);

-                else if (task.Height.HasValue) query += string.Format(" -h {0}", task.Height);

+                else if (task.Height.HasValue && task.Height != 0) query += string.Format(" -h {0}", task.Height);

             }

 

             if (task.HasCropping)

@@ -536,7 +536,7 @@ namespace HandBrake.ApplicationServices.Utilities
                     firstLoop = false;

                 }

                 else

-                    audioItems += "," + item;

+                    audioItems += "," +  Converters.GetCliAudioEncoder(item);

             }

             if (audioItems.Trim() != String.Empty)

                 query += " -E " + audioItems;

@@ -552,7 +552,7 @@ namespace HandBrake.ApplicationServices.Utilities
                     firstLoop = false;

                 }

                 else

-                    audioItems += "," + item;

+                    audioItems += "," + Converters.GetCliMixDown(item);

             }

             if (audioItems.Trim() != String.Empty)

                 query += " -6 " + audioItems;