WinGui: Updates to the latest JSON API. This enables hardware decode / encode options once again.

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

7 files changed, 64 insertions, 30 deletions

diff --git a/win/CS/HandBrake.ApplicationServices/Interop/Json/Encode/Audio.cs b/win/CS/HandBrake.ApplicationServices/Interop/Json/Encode/Audio.cs
index 5a2c97066..ce1c69c9c 100644
--- a/win/CS/HandBrake.ApplicationServices/Interop/Json/Encode/Audio.cs
+++ b/win/CS/HandBrake.ApplicationServices/Interop/Json/Encode/Audio.cs
@@ -24,7 +24,7 @@ namespace HandBrake.ApplicationServices.Interop.Json.Encode
         /// <summary>

         /// Gets or sets the copy mask.

         /// </summary>

-        public int CopyMask { get; set; }

+        public string[] CopyMask { get; set; }

 

         /// <summary>

         /// Gets or sets the fallback encoder.

diff --git a/win/CS/HandBrake.ApplicationServices/Interop/Json/Encode/AudioList.cs b/win/CS/HandBrake.ApplicationServices/Interop/Json/Encode/AudioList.cs
index 9e1af92df..2f79ec7e6 100644
--- a/win/CS/HandBrake.ApplicationServices/Interop/Json/Encode/AudioList.cs
+++ b/win/CS/HandBrake.ApplicationServices/Interop/Json/Encode/AudioList.cs
@@ -68,5 +68,10 @@ namespace HandBrake.ApplicationServices.Interop.Json.Encode
         /// Gets or sets the track.

         /// </summary>

         public int Track { get; set; }

+

+        /// <summary>

+        /// Gets or sets the dither method.

+        /// </summary>

+        public int DitherMethod { get; set; }

     }

 }
\ No newline at end of file
diff --git a/win/CS/HandBrake.ApplicationServices/Interop/Json/Encode/JsonEncodeObject.cs b/win/CS/HandBrake.ApplicationServices/Interop/Json/Encode/JsonEncodeObject.cs
index b6b12a7eb..9de1b8341 100644
--- a/win/CS/HandBrake.ApplicationServices/Interop/Json/Encode/JsonEncodeObject.cs
+++ b/win/CS/HandBrake.ApplicationServices/Interop/Json/Encode/JsonEncodeObject.cs
@@ -29,7 +29,7 @@ namespace HandBrake.ApplicationServices.Interop.Json.Encode
         /// <summary>

         /// Gets or sets the filter.

         /// </summary>

-        public Filters Filter { get; set; }

+        public Filters Filters { get; set; }

 

         /// <summary>

         /// Gets or sets the PAR

@@ -39,7 +39,7 @@ namespace HandBrake.ApplicationServices.Interop.Json.Encode
         /// <summary>

         /// Gets or sets the meta data.

         /// </summary>

-        public MetaData MetaData { get; set; }

+        public MetaData Metadata { get; set; }

 

         /// <summary>

         /// Gets or sets the sequence id.

diff --git a/win/CS/HandBrake.ApplicationServices/Interop/Json/Encode/QSV.cs b/win/CS/HandBrake.ApplicationServices/Interop/Json/Encode/QSV.cs
new file mode 100644
index 000000000..0ca120643
--- /dev/null
+++ b/win/CS/HandBrake.ApplicationServices/Interop/Json/Encode/QSV.cs
@@ -0,0 +1,27 @@
+// --------------------------------------------------------------------------------------------------------------------

+// <copyright file="QSV.cs" company="HandBrake Project (http://handbrake.fr)">

+//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.

+// </copyright>

+// <summary>

+//   The qsv.

+// </summary>

+// --------------------------------------------------------------------------------------------------------------------

+

+namespace HandBrake.ApplicationServices.Interop.Json.Encode

+{

+    /// <summary>

+    /// The qsv.

+    /// </summary>

+    public class QSV

+    {

+        /// <summary>

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

+        /// </summary>

+        public bool Decode { get; set; }

+

+        /// <summary>

+        /// Gets or sets the async depth.

+        /// </summary>

+        public int AsyncDepth { get; set; }

+    }

+}

diff --git a/win/CS/HandBrake.ApplicationServices/Interop/Json/Encode/Range.cs b/win/CS/HandBrake.ApplicationServices/Interop/Json/Encode/Range.cs
index 50b874501..1fb42f1db 100644
--- a/win/CS/HandBrake.ApplicationServices/Interop/Json/Encode/Range.cs
+++ b/win/CS/HandBrake.ApplicationServices/Interop/Json/Encode/Range.cs
@@ -16,38 +16,19 @@ namespace HandBrake.ApplicationServices.Interop.Json.Encode
     {

         /// <summary>

         /// Gets or sets the chapter end.

+        /// Type is "chapter", "time", "frame", or "preview".

         /// </summary>

-        public int? ChapterEnd { get; set; }

+        public string Type { get; set; }

 

         /// <summary>

         /// Gets or sets the chapter start.

         /// </summary>

-        public int? ChapterStart { get; set; }

+        public int? Start { get; set; }

 

         /// <summary>

         /// Gets or sets the frame to start.

         /// </summary>

-        public int? FrameToStart { get; set; }

-

-        /// <summary>

-        /// Gets or sets the frame to stop.

-        /// </summary>

-        public int? FrameToStop { get; set; }

-

-        /// <summary>

-        /// Gets or sets the pts to start.

-        /// </summary>

-        public int? PtsToStart { get; set; }

-

-        /// <summary>

-        /// Gets or sets the pts to stop.

-        /// </summary>

-        public int? PtsToStop { get; set; }

-

-        /// <summary>

-        /// Gets or sets the start at preview.

-        /// </summary>

-        public int? StartAtPreview { get; set; }

+        public int? End { get; set; }

 

         /// <summary>

         /// Gets or sets the seek points.

diff --git a/win/CS/HandBrake.ApplicationServices/Interop/Json/Encode/SubtitleList.cs b/win/CS/HandBrake.ApplicationServices/Interop/Json/Encode/SubtitleList.cs
index 99781bf29..71814c9e1 100644
--- a/win/CS/HandBrake.ApplicationServices/Interop/Json/Encode/SubtitleList.cs
+++ b/win/CS/HandBrake.ApplicationServices/Interop/Json/Encode/SubtitleList.cs
@@ -27,7 +27,7 @@ namespace HandBrake.ApplicationServices.Interop.Json.Encode
         /// <summary>

         /// Gets or sets a value indicating whether force.

         /// </summary>

-        public bool Force { get; set; }

+        public bool Forced { get; set; }

 

         /// <summary>

         /// Gets or sets the id.

diff --git a/win/CS/HandBrake.ApplicationServices/Interop/Json/Encode/Video.cs b/win/CS/HandBrake.ApplicationServices/Interop/Json/Encode/Video.cs
index 957f3dfb8..6844eaf0d 100644
--- a/win/CS/HandBrake.ApplicationServices/Interop/Json/Encode/Video.cs
+++ b/win/CS/HandBrake.ApplicationServices/Interop/Json/Encode/Video.cs
@@ -9,17 +9,23 @@
 

 namespace HandBrake.ApplicationServices.Interop.Json.Encode

 {

-    using System;

-

     /// <summary>

     /// The video.

     /// </summary>

     public class Video

     {

         /// <summary>

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

+        /// </summary>

+        public Video()

+        {

+            this.QSV = new QSV();

+        }

+

+        /// <summary>

         /// Gets or sets the codec.

         /// </summary>

-        public int Codec { get; set; }

+        public int Encoder { get; set; }

 

         /// <summary>

         /// Gets or sets the level.

@@ -70,5 +76,20 @@ namespace HandBrake.ApplicationServices.Interop.Json.Encode
         /// Gets or sets the tune.

         /// </summary>

         public string Tune { get; set; }

+

+        /// <summary>

+        /// Gets or sets a value indicating whether open cl.

+        /// </summary>

+        public bool OpenCL { get; set; }

+

+        /// <summary>

+        /// Gets or sets a value indicating whether hw decode.

+        /// </summary>

+        public bool HWDecode { get; set; }

+

+        /// <summary>

+        /// Gets or sets the qsv.

+        /// </summary>

+        public QSV QSV { get; set; }

     }

 }
\ No newline at end of file