Interop: Updated to return PassId as well as Pass on encode progress.

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

diff --git a/win/CS/HandBrake.ApplicationServices/Interop/EventArgs/EncodeProgressEventArgs.cs b/win/CS/HandBrake.ApplicationServices/Interop/EventArgs/EncodeProgressEventArgs.cs
index bbb9a6d071dc6d65114d6fe67a01f93f8bcb8196..82003719f1b3ccde8ccc4a3caa4ccc447ed229d9 100644 (file)
--- a/win/CS/HandBrake.ApplicationServices/Interop/EventArgs/EncodeProgressEventArgs.cs
+++ b/win/CS/HandBrake.ApplicationServices/Interop/EventArgs/EncodeProgressEventArgs.cs
@@ -36,8 +36,19 @@ namespace HandBrake.ApplicationServices.Interop.EventArgs
         /// </summary>\r
         public TimeSpan EstimatedTimeLeft { get; set; }\r
 \r
+               /// <summary>\r
+               /// Gets or sets the pass ID.\r
+               /// </summary>\r
+               /// <remarks>\r
+               /// -1: Subtitle scan\r
+               ///  0: Encode\r
+               ///  1: Encode first pass\r
+               ///  2: Encode second pass\r
+               /// </remarks>\r
+               public int PassId { get; set; }\r
+\r
         /// <summary>\r
-        /// Gets or sets the current encoding pass. (-1: subtitle scan, 1: first pass, 2: second pass)\r
+        /// Gets or sets the current encoding pass. (1-based)\r
         /// </summary>\r
         public int Pass { get; set; }\r
 \r

diff --git a/win/CS/HandBrake.ApplicationServices/Interop/HandBrakeInstance.cs b/win/CS/HandBrake.ApplicationServices/Interop/HandBrakeInstance.cs
index b441360952abb9609b9a490113fed9c2f6c340af..62e4e1b5cdff0b1615745f017d9dcc21f7afe8cc 100644 (file)
--- a/win/CS/HandBrake.ApplicationServices/Interop/HandBrakeInstance.cs
+++ b/win/CS/HandBrake.ApplicationServices/Interop/HandBrakeInstance.cs
@@ -562,7 +562,8 @@ namespace HandBrake.ApplicationServices.Interop
                         FractionComplete = state.Working.Progress, \r
                         CurrentFrameRate = state.Working.Rate, \r
                         AverageFrameRate = state.Working.RateAvg, \r
-                        EstimatedTimeLeft = new TimeSpan(state.Working.Hours, state.Working.Minutes, state.Working.Seconds), \r
+                        EstimatedTimeLeft = new TimeSpan(state.Working.Hours, state.Working.Minutes, state.Working.Seconds),\r
+                        PassId = state.Working.PassID,\r
                         Pass = state.Working.Pass,\r
                         PassCount = state.Working.PassCount\r
                     };\r

diff --git a/win/CS/HandBrake.ApplicationServices/Interop/HbLib/NativeConstants.cs b/win/CS/HandBrake.ApplicationServices/Interop/HbLib/NativeConstants.cs
index 355a023d88cb5d3de83658fc047921c53aa05e2c..80f9e33be74d44e34223b52f75c7756b2454a79b 100644 (file)
--- a/win/CS/HandBrake.ApplicationServices/Interop/HbLib/NativeConstants.cs
+++ b/win/CS/HandBrake.ApplicationServices/Interop/HbLib/NativeConstants.cs
@@ -31,7 +31,7 @@ namespace HandBrake.ApplicationServices.Interop.HbLib
         public const uint HB_ACODEC_FDK_HAAC = 0x00800000;\r
         public const uint HB_ACODEC_FFEAC3 = 0x01000000;\r
         public const uint HB_ACODEC_FFTRUEHD = 0x02000000;\r
-        public const uint HB_ACODEC_FF_MASK = 0x00FF2800;\r
+        public const uint HB_ACODEC_FF_MASK = 0x03FF2800;\r
         public const uint HB_ACODEC_PASS_FLAG = 0x40000000;\r
         public const uint HB_ACODEC_PASS_MASK = (HB_ACODEC_AC3 | HB_ACODEC_DCA | HB_ACODEC_DCA_HD | HB_ACODEC_FFAAC | HB_ACODEC_FFEAC3 | HB_ACODEC_FFFLAC | HB_ACODEC_MP3 | HB_ACODEC_FFTRUEHD);\r
         public const uint HB_ACODEC_AUTO_PASS = (HB_ACODEC_PASS_MASK | HB_ACODEC_PASS_FLAG);\r

diff --git a/win/CS/HandBrake.ApplicationServices/Interop/Json/State/Working.cs b/win/CS/HandBrake.ApplicationServices/Interop/Json/State/Working.cs
index dfc301b10a22bd110dc9ee39c3b57a28e0ad748c..2347eb4c2b75699cc3d67f2ad43dde06dae3498c 100644 (file)
--- a/win/CS/HandBrake.ApplicationServices/Interop/Json/State/Working.cs
+++ b/win/CS/HandBrake.ApplicationServices/Interop/Json/State/Working.cs
@@ -20,12 +20,23 @@ namespace HandBrake.ApplicationServices.Interop.Json.State
         public int Hours { get; set; }\r
 \r
         /// <summary>\r
-        /// Gets or sets the job.\r
+        /// Gets or sets the Pass ID.\r
+        /// </summary>\r
+        /// <remarks>\r
+        /// -1: Subtitle scan\r
+        ///  0: Encode\r
+        ///  1: Encode first pass\r
+        ///  2: Encode second pass\r
+        /// </remarks>\r
+        public int PassID { get; set; }\r
+\r
+        /// <summary>\r
+        /// Gets or sets the pass number (1-based).\r
         /// </summary>\r
         public int Pass { get; set; }\r
 \r
         /// <summary>\r
-        /// Gets or sets the job count.\r
+        /// Gets or sets the pass count.\r
         /// </summary>\r
         public int PassCount { get; set; }\r
 \r