From 6bd1bab325550ccc8a9c9d3ee372a0aaa2e75c2e Mon Sep 17 00:00:00 2001
From: sr55 <sr55.hb@outlook.com>
Date: Mon, 17 Feb 2014 20:51:17 +0000
Subject: WinGui: Update HandBrakeInterop Library for the latest encoder option
 changes.

git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@6038 b64f7644-9d1e-0410-96f1-a4d463321fa5
---
 .../HandBrakeInterop/HandBrakeInstance.cs          | 26 +++++++++++-----------
 .../HandBrakeInterop/HbLib/HbFunctions.cs          |  4 ++--
 .../HandBrakeInterop/HbLib/hb_job_s.cs             | 10 ++++-----
 3 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/win/CS/HandBrake.Interop/HandBrakeInterop/HandBrakeInstance.cs b/win/CS/HandBrake.Interop/HandBrakeInterop/HandBrakeInstance.cs
index 72a75c112..a9c610bb4 100644
--- a/win/CS/HandBrake.Interop/HandBrakeInterop/HandBrakeInstance.cs
+++ b/win/CS/HandBrake.Interop/HandBrakeInterop/HandBrakeInstance.cs
@@ -476,26 +476,26 @@ namespace HandBrake.Interop
 
             if (!string.IsNullOrEmpty(profile.X264Profile))
             {
-                nativeJob.h264_profile = Marshal.StringToHGlobalAnsi(profile.X264Profile);
-                this.encodeAllocatedMemory.Add(nativeJob.h264_profile);
+                nativeJob.encoder_profile = Marshal.StringToHGlobalAnsi(profile.X264Profile);
+                this.encodeAllocatedMemory.Add(nativeJob.encoder_profile);
             }
 
             if (!string.IsNullOrEmpty(profile.X264Preset))
             {
-                nativeJob.x264_preset = Marshal.StringToHGlobalAnsi(profile.X264Preset);
-                this.encodeAllocatedMemory.Add(nativeJob.x264_preset);
+                nativeJob.encoder_preset = Marshal.StringToHGlobalAnsi(profile.X264Preset);
+                this.encodeAllocatedMemory.Add(nativeJob.encoder_preset);
             }
 
             if (profile.X264Tunes != null && profile.X264Tunes.Count > 0)
             {
-                nativeJob.x264_tune = Marshal.StringToHGlobalAnsi(string.Join(",", profile.X264Tunes));
-                this.encodeAllocatedMemory.Add(nativeJob.x264_tune);
+                nativeJob.encoder_tune = Marshal.StringToHGlobalAnsi(string.Join(",", profile.X264Tunes));
+                this.encodeAllocatedMemory.Add(nativeJob.encoder_tune);
             }
 
             if (!string.IsNullOrEmpty(job.EncodingProfile.H264Level))
             {
-                nativeJob.h264_level = Marshal.StringToHGlobalAnsi(job.EncodingProfile.H264Level);
-                this.encodeAllocatedMemory.Add(nativeJob.h264_level);
+                nativeJob.encoder_level = Marshal.StringToHGlobalAnsi(job.EncodingProfile.H264Level);
+                this.encodeAllocatedMemory.Add(nativeJob.encoder_level);
             }
 
             if (this.subtitleScan)
@@ -504,7 +504,7 @@ namespace HandBrake.Interop
                 nativeJob.pass = -1;
                 nativeJob.indepth_scan = 1;
 
-                nativeJob.advanced_opts = IntPtr.Zero;
+                nativeJob.encoder_options = IntPtr.Zero;
 
                 HBFunctions.hb_add(this.hbHandle, ref nativeJob);
             }
@@ -528,14 +528,14 @@ namespace HandBrake.Interop
                     }
                 }
 
-                nativeJob.advanced_opts = Marshal.StringToHGlobalAnsi(firstPassAdvancedOptions);
-                this.encodeAllocatedMemory.Add(nativeJob.advanced_opts);
+                nativeJob.encoder_options = Marshal.StringToHGlobalAnsi(firstPassAdvancedOptions);
+                this.encodeAllocatedMemory.Add(nativeJob.encoder_options);
 
                 HBFunctions.hb_add(this.hbHandle, ref nativeJob);
 
                 // Second pass. Apply normal options.
                 nativeJob.pass = 2;
-                nativeJob.advanced_opts = originalX264Options;
+                nativeJob.encoder_options = originalX264Options;
 
                 HBFunctions.hb_add(this.hbHandle, ref nativeJob);
             }
@@ -543,7 +543,7 @@ namespace HandBrake.Interop
             {
                 // One pass job.
                 nativeJob.pass = 0;
-                nativeJob.advanced_opts = originalX264Options;
+                nativeJob.encoder_options = originalX264Options;
 
                 HBFunctions.hb_add(this.hbHandle, ref nativeJob);
             }
diff --git a/win/CS/HandBrake.Interop/HandBrakeInterop/HbLib/HbFunctions.cs b/win/CS/HandBrake.Interop/HandBrakeInterop/HbLib/HbFunctions.cs
index b59c0e2cc..0f8d59c86 100644
--- a/win/CS/HandBrake.Interop/HandBrakeInterop/HbLib/HbFunctions.cs
+++ b/win/CS/HandBrake.Interop/HandBrakeInterop/HbLib/HbFunctions.cs
@@ -408,8 +408,8 @@ namespace HandBrake.Interop.HbLib
 		public static extern void hb_job_close(IntPtr job);
 
 		///void hb_job_set_advanced_opts( hb_job_t *job, const char *advanced_opts );
-		[DllImport("hb.dll", EntryPoint = "hb_job_set_advanced_opts", CallingConvention = CallingConvention.Cdecl)]
-		public static extern void hb_job_set_advanced_opts(ref hb_job_s job, IntPtr advanced_opts);
+        [DllImport("hb.dll", EntryPoint = "hb_job_set_encoder_options", CallingConvention = CallingConvention.Cdecl)]
+        public static extern void hb_job_set_encoder_options(ref hb_job_s job, IntPtr advanced_opts);
 
 		///void hb_job_set_file( hb_job_t *job, const char *file );
 		[DllImport("hb.dll", EntryPoint = "hb_job_set_file", CallingConvention = CallingConvention.Cdecl)]
diff --git a/win/CS/HandBrake.Interop/HandBrakeInterop/HbLib/hb_job_s.cs b/win/CS/HandBrake.Interop/HandBrakeInterop/HbLib/hb_job_s.cs
index 78433c06f..a591a4247 100644
--- a/win/CS/HandBrake.Interop/HandBrakeInterop/HbLib/hb_job_s.cs
+++ b/win/CS/HandBrake.Interop/HandBrakeInterop/HbLib/hb_job_s.cs
@@ -88,15 +88,15 @@ namespace HandBrake.Interop.HbLib
 
 		public int fastfirstpass;
 
-		public IntPtr x264_preset;
+        public IntPtr encoder_preset;
 
-		public IntPtr x264_tune;
+        public IntPtr encoder_tune;
 
-		public IntPtr advanced_opts;
+        public IntPtr encoder_options;
 
-		public IntPtr h264_profile;
+        public IntPtr encoder_profile;
 
-		public IntPtr h264_level;
+        public IntPtr encoder_level;
 
 		/// int
 		public int areBframes;
-- 
cgit v1.2.3