WinGui: Update the libhb preset stubs.

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

diff --git a/win/CS/HandBrake.ApplicationServices/Interop/HandBrakeInstanceManager.cs b/win/CS/HandBrake.ApplicationServices/Interop/HandBrakeInstanceManager.cs
index 7a2e93d1be752a5cad0d5f733a845de70e765865..aee94144734a57f2f6a3096e195036a14c8cc08d 100644 (file)
--- a/win/CS/HandBrake.ApplicationServices/Interop/HandBrakeInstanceManager.cs
+++ b/win/CS/HandBrake.ApplicationServices/Interop/HandBrakeInstanceManager.cs
@@ -21,6 +21,24 @@ namespace HandBrake.ApplicationServices.Interop
     {\r
         private static HandBrakeInstance scanInstance;\r
         private static HandBrakeInstance encodeInstance;\r
+        private static HandBrakeInstance masterInstance;\r
+\r
+        /// <summary>\r
+        /// Initializes static members of the <see cref="HandBrakeInstanceManager"/> class.\r
+        /// </summary>\r
+        static HandBrakeInstanceManager()\r
+        {\r
+            masterInstance = new HandBrakeInstance();\r
+            masterInstance.Initialize(2);\r
+        }\r
+\r
+        /// <summary>\r
+        /// The init.\r
+        /// </summary>\r
+        public static void Init()\r
+        {\r
+            // Nothing to do. Triggers static constructor.\r
+        }\r
 \r
         /// <summary>\r
         /// Gets the scanInstance.\r
@@ -70,6 +88,17 @@ namespace HandBrake.ApplicationServices.Interop
             return encodeInstance;\r
         }\r
 \r
+        /// <summary>\r
+        /// Gets the master instance.\r
+        /// </summary>\r
+        public static IHandBrakeInstance MasterInstance\r
+        {\r
+            get\r
+            {\r
+                return masterInstance;\r
+            }\r
+        }\r
+\r
         /// <summary>\r
         /// Gets the last scan scan instance.\r
         /// </summary>\r

diff --git a/win/CS/HandBrake.ApplicationServices/Interop/HandBrakePresetService.cs b/win/CS/HandBrake.ApplicationServices/Interop/HandBrakePresetService.cs
index d49d789c892adb8ecc00f7f959fea498dee530e5..0fdf952116a5ad16cd23431750ca0e657e098441 100644 (file)
--- a/win/CS/HandBrake.ApplicationServices/Interop/HandBrakePresetService.cs
+++ b/win/CS/HandBrake.ApplicationServices/Interop/HandBrakePresetService.cs
@@ -30,7 +30,7 @@ namespace HandBrake.ApplicationServices.Interop
         /// </summary>\r
         static HandBrakePresetService()\r
         {\r
-            HBFunctions.hb_presets_builtin_init();\r
+            HandBrakeInstanceManager.Init();\r
         }\r
 \r
         /// <summary>\r

diff --git a/win/CS/HandBrake.ApplicationServices/Interop/Json/Encode/Chapter.cs b/win/CS/HandBrake.ApplicationServices/Interop/Json/Encode/Chapter.cs
index 567d0e7a3804214f3ea478bde70809a3d7e8b70f..95eeb005797597f0ac84c9d99d1962fffc605c39 100644 (file)
--- a/win/CS/HandBrake.ApplicationServices/Interop/Json/Encode/Chapter.cs
+++ b/win/CS/HandBrake.ApplicationServices/Interop/Json/Encode/Chapter.cs
@@ -5,18 +5,18 @@
 // <summary>\r
 //   Represents a chapter to encode.\r
 // </summary>\r
-// --------------------------------------------------------------------------------------------------------------------
-
-namespace HandBrake.ApplicationServices.Interop.Json.Encode
-{
-    /// <summary>
-    /// Represents a chapter to encode.
-    /// </summary>
-    public class Chapter
-    {
-        /// <summary>
-        /// Gets or sets the name.
-        /// </summary>
-        public string Name { get; set; }
-    }
+// --------------------------------------------------------------------------------------------------------------------\r
+\r
+namespace HandBrake.ApplicationServices.Interop.Json.Encode\r
+{\r
+    /// <summary>\r
+    /// Represents a chapter to encode.\r
+    /// </summary>\r
+    public class Chapter\r
+    {\r
+        /// <summary>\r
+        /// Gets or sets the name.\r
+        /// </summary>\r
+        public string Name { get; set; }\r
+    }\r
 }
\ No newline at end of file

diff --git a/win/CS/HandBrake.ApplicationServices/Interop/Json/Encode/SubtitleTrack.cs b/win/CS/HandBrake.ApplicationServices/Interop/Json/Encode/SubtitleTrack.cs
index af4ece97e94552d0912d7e52b88c722908c76e3c..929c001d01813bc27fc6223bd0a555082af1e02c 100644 (file)
--- a/win/CS/HandBrake.ApplicationServices/Interop/Json/Encode/SubtitleTrack.cs
+++ b/win/CS/HandBrake.ApplicationServices/Interop/Json/Encode/SubtitleTrack.cs
@@ -5,48 +5,48 @@
 // <summary>\r
 //   Represents a subtitle track to encode.\r
 // </summary>\r
-// --------------------------------------------------------------------------------------------------------------------
-
-namespace HandBrake.ApplicationServices.Interop.Json.Encode
-{
-    /// <summary>
-    /// Represents a subtitle track to encode.
-    /// </summary>
-    public class SubtitleTrack
-    {
-        /// <summary>
-        /// Gets or sets a value indicating whether burn.
-        /// </summary>
-        public bool Burn { get; set; }
-
-        /// <summary>
-        /// Gets or sets a value indicating whether default.
-        /// </summary>
-        public bool Default { get; set; }
-
-        /// <summary>
-        /// Gets or sets a value indicating whether force.
-        /// </summary>
-        public bool Forced { get; set; }
-
-        /// <summary>
-        /// Gets or sets the id.
-        /// </summary>
-        public int ID { get; set; }
-
-        /// <summary>
-        /// Gets or sets the offset.
-        /// </summary>
-        public int Offset { get; set; }
-
-        /// <summary>
-        /// Gets or sets the track.
-        /// </summary>
-        public int Track { get; set; }
-
-        /// <summary>
-        /// Gets or sets the srt.
-        /// </summary>
-        public SRT SRT { get; set; }
-    }
+// --------------------------------------------------------------------------------------------------------------------\r
+\r
+namespace HandBrake.ApplicationServices.Interop.Json.Encode\r
+{\r
+    /// <summary>\r
+    /// Represents a subtitle track to encode.\r
+    /// </summary>\r
+    public class SubtitleTrack\r
+    {\r
+        /// <summary>\r
+        /// Gets or sets a value indicating whether burn.\r
+        /// </summary>\r
+        public bool Burn { get; set; }\r
+\r
+        /// <summary>\r
+        /// Gets or sets a value indicating whether default.\r
+        /// </summary>\r
+        public bool Default { get; set; }\r
+\r
+        /// <summary>\r
+        /// Gets or sets a value indicating whether force.\r
+        /// </summary>\r
+        public bool Forced { get; set; }\r
+\r
+        /// <summary>\r
+        /// Gets or sets the id.\r
+        /// </summary>\r
+        public int ID { get; set; }\r
+\r
+        /// <summary>\r
+        /// Gets or sets the offset.\r
+        /// </summary>\r
+        public int Offset { get; set; }\r
+\r
+        /// <summary>\r
+        /// Gets or sets the track.\r
+        /// </summary>\r
+        public int Track { get; set; }\r
+\r
+        /// <summary>\r
+        /// Gets or sets the srt.\r
+        /// </summary>\r
+        public SRT SRT { get; set; }\r
+    }\r
 }
\ No newline at end of file

diff --git a/win/CS/HandBrake.ApplicationServices/Interop/Json/Encode/Subtitles.cs b/win/CS/HandBrake.ApplicationServices/Interop/Json/Encode/Subtitles.cs
index 13439eaa7a47d5549057fcf77ad9c7d7abda5450..2488017898c53be171d71ebbdc1346fcd4694d2b 100644 (file)
--- a/win/CS/HandBrake.ApplicationServices/Interop/Json/Encode/Subtitles.cs
+++ b/win/CS/HandBrake.ApplicationServices/Interop/Json/Encode/Subtitles.cs
@@ -21,9 +21,9 @@ namespace HandBrake.ApplicationServices.Interop.Json.Encode
         /// </summary>\r
         public SubtitleSearch Search { get; set; }\r
 \r
-        /// <summary>
-        /// Gets or sets the subtitle list.
-        /// </summary>
-        public List<SubtitleTrack> SubtitleList { get; set; }
-    }
+        /// <summary>\r
+        /// Gets or sets the subtitle list.\r
+        /// </summary>\r
+        public List<SubtitleTrack> SubtitleList { get; set; }\r
+    }\r
 }
\ No newline at end of file

diff --git a/win/CS/HandBrake.ApplicationServices/Interop/Json/Presets/AudioList.cs b/win/CS/HandBrake.ApplicationServices/Interop/Json/Presets/AudioList.cs
index 8f4670ba5e8697efec565ad0a8054ab5360422b1..d77825fa6a79b9821af4676a362520b1e9fbe6dc 100644 (file)
--- a/win/CS/HandBrake.ApplicationServices/Interop/Json/Presets/AudioList.cs
+++ b/win/CS/HandBrake.ApplicationServices/Interop/Json/Presets/AudioList.cs
@@ -17,7 +17,17 @@ namespace HandBrake.ApplicationServices.Interop.Json.Presets
         /// <summary>\r
         /// Gets or sets the audio bitrate.\r
         /// </summary>\r
-        public string AudioBitrate { get; set; }\r
+        public int AudioBitrate { get; set; }\r
+\r
+        /// <summary>\r
+        /// Gets or sets the audio compression level.\r
+        /// </summary>\r
+        public double AudioCompressionLevel { get; set; }\r
+\r
+        /// <summary>\r
+        /// Gets or sets the audio dither method.\r
+        /// </summary>\r
+        public string AudioDitherMethod { get; set; }\r
 \r
         /// <summary>\r
         /// Gets or sets the audio encoder.\r
@@ -29,24 +39,34 @@ namespace HandBrake.ApplicationServices.Interop.Json.Presets
         /// </summary>\r
         public string AudioMixdown { get; set; }\r
 \r
+        /// <summary>\r
+        /// Gets or sets a value indicating whether audio normalize mix level.\r
+        /// </summary>\r
+        public bool AudioNormalizeMixLevel { get; set; }\r
+\r
         /// <summary>\r
         /// Gets or sets the audio samplerate.\r
         /// </summary>\r
         public string AudioSamplerate { get; set; }\r
 \r
         /// <summary>\r
-        /// Gets or sets the audio track.\r
+        /// Gets or sets a value indicating whether audio track quality enable.\r
         /// </summary>\r
-        public int AudioTrack { get; set; }\r
+        public bool AudioTrackQualityEnable { get; set; }\r
 \r
         /// <summary>\r
-        /// Gets or sets the audio track drc slider.\r
+        /// Gets or sets the audio track quality.\r
         /// </summary>\r
-        public double AudioTrackDRCSlider { get; set; }\r
+        public double AudioTrackQuality { get; set; }\r
 \r
         /// <summary>\r
         /// Gets or sets the audio track gain slider.\r
         /// </summary>\r
         public double AudioTrackGainSlider { get; set; }\r
+\r
+        /// <summary>\r
+        /// Gets or sets the audio track drc slider.\r
+        /// </summary>\r
+        public double AudioTrackDRCSlider { get; set; }\r
     }\r
-}\r
+}
\ No newline at end of file

diff --git a/win/CS/HandBrake.ApplicationServices/Interop/Json/Presets/Preset.cs b/win/CS/HandBrake.ApplicationServices/Interop/Json/Presets/Preset.cs
index a90410c544c361d5e80ce23aa56a1aa3487870b7..8d19d0ae31e981c17a515e5d18699794f36b14b3 100644 (file)
--- a/win/CS/HandBrake.ApplicationServices/Interop/Json/Presets/Preset.cs
+++ b/win/CS/HandBrake.ApplicationServices/Interop/Json/Presets/Preset.cs
@@ -12,54 +12,54 @@ namespace HandBrake.ApplicationServices.Interop.Json.Presets
     using System.Collections.Generic;\r
 \r
     /// <summary>\r
-    /// The preset.\r
+    ///     The preset.\r
     /// </summary>\r
     public class Preset\r
     {\r
         /// <summary>\r
-        /// Gets or sets the audio allow aac pass.\r
+        /// Gets or sets the audio copy mask.\r
         /// </summary>\r
-        public int AudioAllowAACPass { get; set; }\r
+        public List<object> AudioCopyMask { get; set; }\r
 \r
         /// <summary>\r
-        /// Gets or sets the audio allow a c 3 pass.\r
+        /// Gets or sets the audio encoder fallback.\r
         /// </summary>\r
-        public int AudioAllowAC3Pass { get; set; }\r
+        public string AudioEncoderFallback { get; set; }\r
 \r
         /// <summary>\r
-        /// Gets or sets the audio allow dtshd pass.\r
+        /// Gets or sets the audio language list.\r
         /// </summary>\r
-        public int AudioAllowDTSHDPass { get; set; }\r
+        public List<string> AudioLanguageList { get; set; }\r
 \r
         /// <summary>\r
-        /// Gets or sets the audio allow dts pass.\r
+        /// Gets or sets the audio list.\r
         /// </summary>\r
-        public int AudioAllowDTSPass { get; set; }\r
+        public List<AudioList> AudioList { get; set; }\r
 \r
         /// <summary>\r
-        /// Gets or sets the audio allow m p 3 pass.\r
+        /// Gets or sets a value indicating whether audio secondary encoder mode.\r
         /// </summary>\r
-        public int AudioAllowMP3Pass { get; set; }\r
+        public bool AudioSecondaryEncoderMode { get; set; }\r
 \r
         /// <summary>\r
-        /// Gets or sets the audio encoder fallback.\r
+        /// Gets or sets the audio track selection behavior.\r
         /// </summary>\r
-        public string AudioEncoderFallback { get; set; }\r
+        public string AudioTrackSelectionBehavior { get; set; }\r
 \r
         /// <summary>\r
-        /// Gets or sets the audio list.\r
+        /// Gets or sets a value indicating whether chapter markers.\r
         /// </summary>\r
-        public List<AudioList> AudioList { get; set; }\r
+        public bool ChapterMarkers { get; set; }\r
 \r
         /// <summary>\r
-        /// Gets or sets the chapter markers.\r
+        /// Gets or sets the children array.\r
         /// </summary>\r
-        public int ChapterMarkers { get; set; }\r
+        public List<object> ChildrenArray { get; set; }\r
 \r
         /// <summary>\r
-        /// Gets or sets the default.\r
+        /// Gets or sets a value indicating whether default.\r
         /// </summary>\r
-        public int Default { get; set; }\r
+        public bool Default { get; set; }\r
 \r
         /// <summary>\r
         /// Gets or sets the file format.\r
@@ -72,25 +72,50 @@ namespace HandBrake.ApplicationServices.Interop.Json.Presets
         public bool Folder { get; set; }\r
 \r
         /// <summary>\r
-        /// Gets or sets the mp 4 http optimize.\r
+        /// Gets or sets a value indicating whether folder open.\r
+        /// </summary>\r
+        public bool FolderOpen { get; set; }\r
+\r
+        /// <summary>\r
+        /// Gets or sets a value indicating whether mp 4 http optimize.\r
         /// </summary>\r
-        public int Mp4HttpOptimize { get; set; }\r
+        public bool Mp4HttpOptimize { get; set; }\r
 \r
         /// <summary>\r
-        /// Gets or sets the mp 4 i pod compatible.\r
+        /// Gets or sets a value indicating whether mp 4 i pod compatible.\r
         /// </summary>\r
-        public int Mp4iPodCompatible { get; set; }\r
+        public bool Mp4iPodCompatible { get; set; }\r
 \r
         /// <summary>\r
-        /// Gets or sets the picture auto crop.\r
+        /// Gets or sets a value indicating whether picture auto crop.\r
         /// </summary>\r
-        public int PictureAutoCrop { get; set; }\r
+        public bool PictureAutoCrop { get; set; }\r
 \r
         /// <summary>\r
         /// Gets or sets the picture bottom crop.\r
         /// </summary>\r
         public int PictureBottomCrop { get; set; }\r
 \r
+        /// <summary>\r
+        /// Gets or sets the picture left crop.\r
+        /// </summary>\r
+        public int PictureLeftCrop { get; set; }\r
+\r
+        /// <summary>\r
+        /// Gets or sets the picture right crop.\r
+        /// </summary>\r
+        public int PictureRightCrop { get; set; }\r
+\r
+        /// <summary>\r
+        /// Gets or sets the picture top crop.\r
+        /// </summary>\r
+        public int PictureTopCrop { get; set; }\r
+\r
+        /// <summary>\r
+        /// Gets or sets the picture dar width.\r
+        /// </summary>\r
+        public int PictureDARWidth { get; set; }\r
+\r
         /// <summary>\r
         /// Gets or sets the picture deblock.\r
         /// </summary>\r
@@ -99,7 +124,7 @@ namespace HandBrake.ApplicationServices.Interop.Json.Presets
         /// <summary>\r
         /// Gets or sets the picture decomb.\r
         /// </summary>\r
-        public int PictureDecomb { get; set; }\r
+        public string PictureDecomb { get; set; }\r
 \r
         /// <summary>\r
         /// Gets or sets the picture decomb custom.\r
@@ -107,14 +132,14 @@ namespace HandBrake.ApplicationServices.Interop.Json.Presets
         public string PictureDecombCustom { get; set; }\r
 \r
         /// <summary>\r
-        /// Gets or sets the picture decomb deinterlace.\r
+        /// Gets or sets a value indicating whether picture decomb deinterlace.\r
         /// </summary>\r
-        public int PictureDecombDeinterlace { get; set; }\r
+        public bool PictureDecombDeinterlace { get; set; }\r
 \r
         /// <summary>\r
         /// Gets or sets the picture deinterlace.\r
         /// </summary>\r
-        public int PictureDeinterlace { get; set; }\r
+        public string PictureDeinterlace { get; set; }\r
 \r
         /// <summary>\r
         /// Gets or sets the picture deinterlace custom.\r
@@ -131,10 +156,20 @@ namespace HandBrake.ApplicationServices.Interop.Json.Presets
         /// </summary>\r
         public string PictureDenoiseFilter { get; set; }\r
 \r
+        /// <summary>\r
+        /// Gets or sets the picture denoise preset.\r
+        /// </summary>\r
+        public string PictureDenoisePreset { get; set; }\r
+\r
+        /// <summary>\r
+        /// Gets or sets the picture denoise tune.\r
+        /// </summary>\r
+        public string PictureDenoiseTune { get; set; }\r
+\r
         /// <summary>\r
         /// Gets or sets the picture detelecine.\r
         /// </summary>\r
-        public int PictureDetelecine { get; set; }\r
+        public string PictureDetelecine { get; set; }\r
 \r
         /// <summary>\r
         /// Gets or sets the picture detelecine custom.\r
@@ -142,19 +177,19 @@ namespace HandBrake.ApplicationServices.Interop.Json.Presets
         public string PictureDetelecineCustom { get; set; }\r
 \r
         /// <summary>\r
-        /// Gets or sets the picture height.\r
+        /// Gets or sets a value indicating whether picture itu par.\r
         /// </summary>\r
-        public int PictureHeight { get; set; }\r
+        public bool PictureItuPAR { get; set; }\r
 \r
         /// <summary>\r
-        /// Gets or sets the picture keep ratio.\r
+        /// Gets or sets a value indicating whether picture keep ratio.\r
         /// </summary>\r
-        public int PictureKeepRatio { get; set; }\r
+        public bool PictureKeepRatio { get; set; }\r
 \r
         /// <summary>\r
-        /// Gets or sets the picture left crop.\r
+        /// Gets or sets a value indicating whether picture loose crop.\r
         /// </summary>\r
-        public int PictureLeftCrop { get; set; }\r
+        public bool PictureLooseCrop { get; set; }\r
 \r
         /// <summary>\r
         /// Gets or sets the picture modulus.\r
@@ -167,20 +202,40 @@ namespace HandBrake.ApplicationServices.Interop.Json.Presets
         public string PicturePAR { get; set; }\r
 \r
         /// <summary>\r
-        /// Gets or sets the picture right crop.\r
+        /// Gets or sets the picture par width.\r
         /// </summary>\r
-        public int PictureRightCrop { get; set; }\r
+        public int PicturePARWidth { get; set; }\r
 \r
         /// <summary>\r
-        /// Gets or sets the picture top crop.\r
+        /// Gets or sets the picture par height.\r
         /// </summary>\r
-        public int PictureTopCrop { get; set; }\r
+        public int PicturePARHeight { get; set; }\r
+\r
+        /// <summary>\r
+        /// Gets or sets the picture rotate.\r
+        /// </summary>\r
+        public int PictureRotate { get; set; }\r
 \r
         /// <summary>\r
         /// Gets or sets the picture width.\r
         /// </summary>\r
         public int PictureWidth { get; set; }\r
 \r
+        /// <summary>\r
+        /// Gets or sets the picture height.\r
+        /// </summary>\r
+        public int PictureHeight { get; set; }\r
+\r
+        /// <summary>\r
+        /// Gets or sets the picture force height.\r
+        /// </summary>\r
+        public int PictureForceHeight { get; set; }\r
+\r
+        /// <summary>\r
+        /// Gets or sets the picture force width.\r
+        /// </summary>\r
+        public int PictureForceWidth { get; set; }\r
+\r
         /// <summary>\r
         /// Gets or sets the preset description.\r
         /// </summary>\r
@@ -197,19 +252,64 @@ namespace HandBrake.ApplicationServices.Interop.Json.Presets
         public int Type { get; set; }\r
 \r
         /// <summary>\r
-        /// Gets or sets the uses picture filters.\r
+        /// Gets or sets a value indicating whether uses picture filters.\r
         /// </summary>\r
-        public int UsesPictureFilters { get; set; }\r
+        public bool UsesPictureFilters { get; set; }\r
 \r
         /// <summary>\r
         /// Gets or sets the uses picture settings.\r
         /// </summary>\r
         public int UsesPictureSettings { get; set; }\r
 \r
+        /// <summary>\r
+        /// Gets or sets a value indicating whether subtitle add cc.\r
+        /// </summary>\r
+        public bool SubtitleAddCC { get; set; }\r
+\r
+        /// <summary>\r
+        /// Gets or sets a value indicating whether subtitle add foreign audio search.\r
+        /// </summary>\r
+        public bool SubtitleAddForeignAudioSearch { get; set; }\r
+\r
+        /// <summary>\r
+        /// Gets or sets a value indicating whether subtitle add foreign audio subtitle.\r
+        /// </summary>\r
+        public bool SubtitleAddForeignAudioSubtitle { get; set; }\r
+\r
+        /// <summary>\r
+        /// Gets or sets the subtitle burn behavior.\r
+        /// </summary>\r
+        public string SubtitleBurnBehavior { get; set; }\r
+\r
+        /// <summary>\r
+        /// Gets or sets a value indicating whether subtitle burn bd sub.\r
+        /// </summary>\r
+        public bool SubtitleBurnBDSub { get; set; }\r
+\r
+        /// <summary>\r
+        /// Gets or sets a value indicating whether subtitle burn dvd sub.\r
+        /// </summary>\r
+        public bool SubtitleBurnDVDSub { get; set; }\r
+\r
+        /// <summary>\r
+        /// Gets or sets the subtitle language list.\r
+        /// </summary>\r
+        public List<object> SubtitleLanguageList { get; set; }\r
+\r
+        /// <summary>\r
+        /// Gets or sets the subtitle track selection behavior.\r
+        /// </summary>\r
+        public string SubtitleTrackSelectionBehavior { get; set; }\r
+\r
         /// <summary>\r
         /// Gets or sets the video avg bitrate.\r
         /// </summary>\r
-        public string VideoAvgBitrate { get; set; }\r
+        public int VideoAvgBitrate { get; set; }\r
+\r
+        /// <summary>\r
+        /// Gets or sets the video color matrix code.\r
+        /// </summary>\r
+        public int VideoColorMatrixCode { get; set; }\r
 \r
         /// <summary>\r
         /// Gets or sets the video encoder.\r
@@ -227,34 +327,44 @@ namespace HandBrake.ApplicationServices.Interop.Json.Presets
         public string VideoFramerateMode { get; set; }\r
 \r
         /// <summary>\r
-        /// Gets or sets the video gray scale.\r
+        /// Gets or sets a value indicating whether video gray scale.\r
         /// </summary>\r
-        public int VideoGrayScale { get; set; }\r
+        public bool VideoGrayScale { get; set; }\r
 \r
         /// <summary>\r
-        /// Gets or sets the video level.\r
+        /// Gets or sets a value indicating whether video hw decode.\r
         /// </summary>\r
-        public string VideoLevel { get; set; }\r
+        public bool VideoHWDecode { get; set; }\r
 \r
         /// <summary>\r
-        /// Gets or sets the video option extra.\r
+        /// Gets or sets the video scaler.\r
         /// </summary>\r
-        public string VideoOptionExtra { get; set; }\r
+        public string VideoScaler { get; set; }\r
 \r
         /// <summary>\r
         /// Gets or sets the video preset.\r
         /// </summary>\r
         public string VideoPreset { get; set; }\r
 \r
+        /// <summary>\r
+        /// Gets or sets the video tune.\r
+        /// </summary>\r
+        public string VideoTune { get; set; }\r
+\r
         /// <summary>\r
         /// Gets or sets the video profile.\r
         /// </summary>\r
         public string VideoProfile { get; set; }\r
 \r
         /// <summary>\r
-        /// Gets or sets the video quality slider.\r
+        /// Gets or sets the video level.\r
         /// </summary>\r
-        public double VideoQualitySlider { get; set; }\r
+        public string VideoLevel { get; set; }\r
+\r
+        /// <summary>\r
+        /// Gets or sets the video option extra.\r
+        /// </summary>\r
+        public string VideoOptionExtra { get; set; }\r
 \r
         /// <summary>\r
         /// Gets or sets the video quality type.\r
@@ -262,19 +372,29 @@ namespace HandBrake.ApplicationServices.Interop.Json.Presets
         public int VideoQualityType { get; set; }\r
 \r
         /// <summary>\r
-        /// Gets or sets the video tune.\r
+        /// Gets or sets the video quality slider.\r
         /// </summary>\r
-        public string VideoTune { get; set; }\r
+        public double VideoQualitySlider { get; set; }\r
+\r
+        /// <summary>\r
+        /// Gets or sets a value indicating whether video qsv decode.\r
+        /// </summary>\r
+        public bool VideoQSVDecode { get; set; }\r
+\r
+        /// <summary>\r
+        /// Gets or sets the video qsv async depth.\r
+        /// </summary>\r
+        public int VideoQSVAsyncDepth { get; set; }\r
 \r
         /// <summary>\r
-        /// Gets or sets the video turbo two pass.\r
+        /// Gets or sets a value indicating whether video two pass.\r
         /// </summary>\r
-        public int VideoTurboTwoPass { get; set; }\r
+        public bool VideoTwoPass { get; set; }\r
 \r
         /// <summary>\r
-        /// Gets or sets the video two pass.\r
+        /// Gets or sets a value indicating whether video turbo two pass.\r
         /// </summary>\r
-        public int VideoTwoPass { get; set; }\r
+        public bool VideoTurboTwoPass { get; set; }\r
 \r
         /// <summary>\r
         /// Gets or sets the x 264 option.\r
@@ -282,8 +402,8 @@ namespace HandBrake.ApplicationServices.Interop.Json.Presets
         public string x264Option { get; set; }\r
 \r
         /// <summary>\r
-        /// Gets or sets the x 264 use advanced options.\r
+        /// Gets or sets a value indicating whether x 264 use advanced options.\r
         /// </summary>\r
-        public int x264UseAdvancedOptions { get; set; }\r
+        public bool x264UseAdvancedOptions { get; set; }\r
     }\r
-}\r
+}
\ No newline at end of file

diff --git a/win/CS/HandBrake.ApplicationServices/Interop/Json/Presets/PresetCategory.cs b/win/CS/HandBrake.ApplicationServices/Interop/Json/Presets/PresetCategory.cs
index be31e888e0161c4b9018238c2ee836734d283c17..6700c0a84b4fbd5dcb896555e5c3081d80cf92e8 100644 (file)
--- a/win/CS/HandBrake.ApplicationServices/Interop/Json/Presets/PresetCategory.cs
+++ b/win/CS/HandBrake.ApplicationServices/Interop/Json/Presets/PresetCategory.cs
@@ -21,11 +21,6 @@ namespace HandBrake.ApplicationServices.Interop.Json.Presets
         /// </summary>\r
         public List<Preset> ChildrenArray { get; set; }\r
 \r
-        /// <summary>\r
-        /// Gets or sets the default.\r
-        /// </summary>\r
-        public int Default { get; set; }\r
-\r
         /// <summary>\r
         /// Gets or sets a value indicating whether folder.\r
         /// </summary>\r
@@ -41,4 +36,4 @@ namespace HandBrake.ApplicationServices.Interop.Json.Presets
         /// </summary>\r
         public int Type { get; set; }\r
     }\r
-}\r
+}
\ No newline at end of file

diff --git a/win/CS/HandBrakeWPF/ViewModels/VideoViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/VideoViewModel.cs
index 6252f53f380f1215b3feca93f26d1a17d7c19eb8..47cc4f6a3db8b6c4d3c56381e785bb077166370d 100644 (file)
--- a/win/CS/HandBrakeWPF/ViewModels/VideoViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/VideoViewModel.cs
@@ -40,7 +40,7 @@ namespace HandBrakeWPF.ViewModels
     public class VideoViewModel : ViewModelBase, IVideoViewModel\r
     {\r
         /*\r
-         * Hard Code "None" in the Models for Tune.t\r
+         * Hard Code "None" in the Models for Tune.\r
          * Test Everything         */\r
 \r
         #region Constants and Fields\r