WinGui: Remove OpenCL code that was breaking things.

diff --git a/win/CS/HandBrake.ApplicationServices/Interop/HandBrakeInstance.cs b/win/CS/HandBrake.ApplicationServices/Interop/HandBrakeInstance.cs
index 854dc4cbea374fe50391e6a94ed12d1fe2a03a21..7919086ccb0972c3f943e2253ec37e41e8042858 100644 (file)
--- a/win/CS/HandBrake.ApplicationServices/Interop/HandBrakeInstance.cs
+++ b/win/CS/HandBrake.ApplicationServices/Interop/HandBrakeInstance.cs
@@ -216,15 +216,11 @@ namespace HandBrake.ApplicationServices.Interop
         /// <param name="titleIndex">\r
         /// The title index to scan (1-based, 0 for all titles).\r
         /// </param>\r
-        /// <param name="clEnabled">\r
-        /// OpenCL enabled. \r
-        /// </param>\r
-        public void StartScan(string path, int previewCount, TimeSpan minDuration, int titleIndex, bool clEnabled = false)\r
+        public void StartScan(string path, int previewCount, TimeSpan minDuration, int titleIndex)\r
         {\r
             this.previewCount = previewCount;\r
 \r
             IntPtr pathPtr = InteropUtilities.ToUtf8PtrFromString(path);\r
-            HBFunctions.hb_opencl_set_enable(this.hbHandle, clEnabled ? 1 : 0);\r
             HBFunctions.hb_scan(this.hbHandle, pathPtr, titleIndex, previewCount, 1, (ulong)(minDuration.TotalSeconds * 90000));\r
             Marshal.FreeHGlobal(pathPtr);\r
 \r
@@ -372,7 +368,6 @@ namespace HandBrake.ApplicationServices.Interop
                 NullValueHandling = NullValueHandling.Ignore,\r
             };\r
 \r
-            HBFunctions.hb_opencl_set_enable(this.hbHandle, encodeObject.Video.OpenCL ? 1 : 0);\r
             string encode = JsonConvert.SerializeObject(encodeObject, Formatting.Indented, settings);\r
             HBFunctions.hb_add_json(this.hbHandle, InteropUtilities.ToUtf8PtrFromString(encode));\r
             HBFunctions.hb_start(this.hbHandle);\r

diff --git a/win/CS/HandBrake.ApplicationServices/Interop/HbLib/HbFunctions.cs b/win/CS/HandBrake.ApplicationServices/Interop/HbLib/HbFunctions.cs
index beb572f0de9828d5b614857233677cd056c2254e..beaf2e689672c3afcc6a567333d4d84fe2377081 100644 (file)
--- a/win/CS/HandBrake.ApplicationServices/Interop/HbLib/HbFunctions.cs
+++ b/win/CS/HandBrake.ApplicationServices/Interop/HbLib/HbFunctions.cs
@@ -71,10 +71,6 @@ namespace HandBrake.ApplicationServices.Interop.HbLib
         [DllImport("hb", EntryPoint = "hb_dvd_set_dvdnav", CallingConvention = CallingConvention.Cdecl)]\r
         public static extern void hb_dvd_set_dvdnav(int enable);\r
 \r
-        // void hb_opencl_set_enable(hb_handle_t* h, int enable_opencl);\r
-        [DllImport("hb", EntryPoint = "hb_opencl_set_enable", CallingConvention = CallingConvention.Cdecl)]\r
-        public static extern void hb_opencl_set_enable(IntPtr hbHandle, int enable);\r
-\r
         /// Return Type: void\r
         ///param0: hb_handle_t*\r
         ///path: char*\r

diff --git a/win/CS/HandBrake.ApplicationServices/Interop/Interfaces/IHandBrakeInstance.cs b/win/CS/HandBrake.ApplicationServices/Interop/Interfaces/IHandBrakeInstance.cs
index 910621d81615d23fa42410762fb8d037d5d8ce72..d0338aea5bd5d6716a786d5e4109fd44ad63cc14 100644 (file)
--- a/win/CS/HandBrake.ApplicationServices/Interop/Interfaces/IHandBrakeInstance.cs
+++ b/win/CS/HandBrake.ApplicationServices/Interop/Interfaces/IHandBrakeInstance.cs
@@ -132,10 +132,7 @@ namespace HandBrake.ApplicationServices.Interop.Interfaces
         /// <param name="minDuration">\r
         /// The min Duration.\r
         /// </param>\r
-        /// <param name="titleIndex">\r
-        /// The title index to scan (1-based, 0 for all titles).\r
-        /// </param>\r
-        void StartScan(string path, int previewCount, TimeSpan minDuration, int titleIndex, bool clEnabled = false);\r
+        void StartScan(string path, int previewCount, TimeSpan minDuration, int titleIndex);\r
 \r
         /// <summary>\r
         /// Stops the current encode.\r

diff --git a/win/CS/HandBrake.ApplicationServices/Interop/Json/Encode/Video.cs b/win/CS/HandBrake.ApplicationServices/Interop/Json/Encode/Video.cs
index 6844eaf0df62b1032a7d906277e0d680698c7743..b229107683622fbe613d5e4e8f6ae0eb8f689447 100644 (file)
--- a/win/CS/HandBrake.ApplicationServices/Interop/Json/Encode/Video.cs
+++ b/win/CS/HandBrake.ApplicationServices/Interop/Json/Encode/Video.cs
@@ -77,11 +77,6 @@ namespace HandBrake.ApplicationServices.Interop.Json.Encode
         /// </summary>\r
         public string Tune { get; set; }\r
 \r
-        /// <summary>\r
-        /// Gets or sets a value indicating whether open cl.\r
-        /// </summary>\r
-        public bool OpenCL { get; set; }\r
-\r
         /// <summary>\r
         /// Gets or sets a value indicating whether hw decode.\r
         /// </summary>\r