WinGui: - Some updates to the libhb preset wrapper code. - Remove Preset update notification and option.

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

4 files changed, 8 insertions, 5 deletions

diff --git a/win/CS/HandBrake.ApplicationServices/HandBrake.ApplicationServices.csproj b/win/CS/HandBrake.ApplicationServices/HandBrake.ApplicationServices.csproj
index 683f133f4..e3a9b0db2 100644
--- a/win/CS/HandBrake.ApplicationServices/HandBrake.ApplicationServices.csproj
+++ b/win/CS/HandBrake.ApplicationServices/HandBrake.ApplicationServices.csproj
@@ -112,7 +112,7 @@
     <Compile Include="Interop\Json\Anamorphic\DestSettings.cs" />

     <Compile Include="Interop\Json\Encode\QSV.cs" />

     <Compile Include="Interop\Json\Presets\AudioList.cs" />

-    <Compile Include="Interop\Json\Presets\Preset.cs" />

+    <Compile Include="Interop\Json\Presets\HBPreset.cs" />

     <Compile Include="Interop\Json\Presets\PresetCategory.cs" />

     <Compile Include="Interop\Json\Shared\PAR.cs" />

     <Compile Include="Interop\Json\Encode\Audio.cs" />

diff --git a/win/CS/HandBrake.ApplicationServices/Interop/HbLib/HbFunctions.cs b/win/CS/HandBrake.ApplicationServices/Interop/HbLib/HbFunctions.cs
index 6eb77cac3..a1e93f28b 100644
--- a/win/CS/HandBrake.ApplicationServices/Interop/HbLib/HbFunctions.cs
+++ b/win/CS/HandBrake.ApplicationServices/Interop/HbLib/HbFunctions.cs
@@ -441,5 +441,8 @@ namespace HandBrake.ApplicationServices.Interop.HbLib
         [DllImport("hb.dll", EntryPoint = "hb_presets_builtin_get_json", CallingConvention = CallingConvention.Cdecl)]

         public static extern IntPtr hb_presets_builtin_get_json();

 

+        // hb_value_t * hb_plist_parse_file(const char *filename);

+        [DllImport("hb.dll", EntryPoint = "hb_plist_parse_file", CallingConvention = CallingConvention.Cdecl)]

+        public static extern IntPtr hb_plist_parse_file(IntPtr filename);

     }

 }

diff --git a/win/CS/HandBrake.ApplicationServices/Interop/Json/Presets/Preset.cs b/win/CS/HandBrake.ApplicationServices/Interop/Json/Presets/HBPreset.cs
index 8d19d0ae3..0c40a858d 100644
--- a/win/CS/HandBrake.ApplicationServices/Interop/Json/Presets/Preset.cs
+++ b/win/CS/HandBrake.ApplicationServices/Interop/Json/Presets/HBPreset.cs
@@ -1,5 +1,5 @@
 // --------------------------------------------------------------------------------------------------------------------

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

+// <copyright file="HBPreset.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>

@@ -14,7 +14,7 @@ namespace HandBrake.ApplicationServices.Interop.Json.Presets
     /// <summary>

     ///     The preset.

     /// </summary>

-    public class Preset

+    public class HBPreset

     {

         /// <summary>

         /// Gets or sets the audio copy mask.

@@ -294,7 +294,7 @@ namespace HandBrake.ApplicationServices.Interop.Json.Presets
         /// <summary>

         /// Gets or sets the subtitle language list.

         /// </summary>

-        public List<object> SubtitleLanguageList { get; set; }

+        public List<string> SubtitleLanguageList { get; set; }

 

         /// <summary>

         /// Gets or sets the subtitle track selection behavior.

diff --git a/win/CS/HandBrake.ApplicationServices/Interop/Json/Presets/PresetCategory.cs b/win/CS/HandBrake.ApplicationServices/Interop/Json/Presets/PresetCategory.cs
index 6700c0a84..799ea0876 100644
--- a/win/CS/HandBrake.ApplicationServices/Interop/Json/Presets/PresetCategory.cs
+++ b/win/CS/HandBrake.ApplicationServices/Interop/Json/Presets/PresetCategory.cs
@@ -19,7 +19,7 @@ namespace HandBrake.ApplicationServices.Interop.Json.Presets
         /// <summary>

         /// Gets or sets the children array.

         /// </summary>

-        public List<Preset> ChildrenArray { get; set; }

+        public List<HBPreset> ChildrenArray { get; set; }

 

         /// <summary>

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