WinGui: Some further work to enable libhb encode support.

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

3 files changed, 12 insertions, 25 deletions

diff --git a/win/CS/HandBrake.ApplicationServices/Model/EncodeTask.cs b/win/CS/HandBrake.ApplicationServices/Model/EncodeTask.cs
index bcc07d55f..ce46132af 100644
--- a/win/CS/HandBrake.ApplicationServices/Model/EncodeTask.cs
+++ b/win/CS/HandBrake.ApplicationServices/Model/EncodeTask.cs
@@ -293,6 +293,16 @@ namespace HandBrake.ApplicationServices.Model
         /// </summary>

         public string AdvancedEncoderOptions { get; set; }

 

+        /// <summary>

+        /// Gets or sets Verbosity.

+        /// </summary>

+        public int Verbosity { get; set; }

+

+        /// <summary>

+        /// Gets or sets a value indicating whether disableLibDvdNav.

+        /// </summary>

+        public bool DisableLibDvdNav { get; set; }

+

         #endregion

 

         #region Preset Information (TODO This should probably be dropped)

diff --git a/win/CS/HandBrake.ApplicationServices/Model/Preset.cs b/win/CS/HandBrake.ApplicationServices/Model/Preset.cs
index e20ad2dee..ede38b26f 100644
--- a/win/CS/HandBrake.ApplicationServices/Model/Preset.cs
+++ b/win/CS/HandBrake.ApplicationServices/Model/Preset.cs
@@ -31,11 +31,6 @@ namespace HandBrake.ApplicationServices.Model
         public bool CropSettings { get; set; }

 

         /// <summary>

-        /// Gets or sets the Settings for this encode/preset. Can be used in place of Query property.

-        /// </summary>

-        public EncodeTask EncodeSettings { get; set; }

-

-        /// <summary>

         /// Gets or sets The version number which associates this preset with a HB build

         /// </summary>

         public string Version { get; set; }

diff --git a/win/CS/HandBrake.ApplicationServices/Model/QueueTask.cs b/win/CS/HandBrake.ApplicationServices/Model/QueueTask.cs
index 245a3171d..8c2425ee7 100644
--- a/win/CS/HandBrake.ApplicationServices/Model/QueueTask.cs
+++ b/win/CS/HandBrake.ApplicationServices/Model/QueueTask.cs
@@ -5,19 +5,12 @@
 

 namespace HandBrake.ApplicationServices.Model

 {

-    using HandBrake.ApplicationServices.Utilities;

-

     /// <summary>

     /// The QueueTask.

     /// </summary>

     public class QueueTask

     {

         /// <summary>

-        /// The Encode task backing field.

-        /// </summary>

-        private EncodeTask task;

-

-        /// <summary>

         /// Initializes a new instance of the <see cref="QueueTask"/> class.

         /// </summary>

         public QueueTask()

@@ -71,20 +64,9 @@ namespace HandBrake.ApplicationServices.Model
         public QueueItemStatus Status { get; set; }

 

         /// <summary>

-        /// Gets the Encode Task.

+        /// Gets or sets the Encode Task.

         /// </summary>

-        public EncodeTask Task

-        {

-            get

-            {

-                if (this.task == null)

-                {

-                    task = QueryParserUtility.Parse(this.Query);

-                }

-

-                return this.task;

-            }

-        }

+        public EncodeTask Task { get; set; }

 

         /// <summary>

         /// Gets a value indicating whether or not this instance is empty.