summaryrefslogtreecommitdiffstats
path: root/win
diff options
context:
space:
mode:
authorsr55 <[email protected]>2017-06-14 22:09:19 +0100
committersr55 <[email protected]>2017-06-14 22:09:19 +0100
commit0dc659ba728b5570564ef09cf1d73c8110529def (patch)
treeaf368449640c3f9a6773b8be10f80d013fcca92e /win
parente2aaa9f501ab10d6ca3b01dbd3306b73334c917e (diff)
WinGui: Remove OpenCL code that was breaking things.
Diffstat (limited to 'win')
-rw-r--r--win/CS/HandBrake.ApplicationServices/Interop/HandBrakeInstance.cs7
-rw-r--r--win/CS/HandBrake.ApplicationServices/Interop/HbLib/HbFunctions.cs4
-rw-r--r--win/CS/HandBrake.ApplicationServices/Interop/Interfaces/IHandBrakeInstance.cs5
-rw-r--r--win/CS/HandBrake.ApplicationServices/Interop/Json/Encode/Video.cs5
4 files changed, 2 insertions, 19 deletions
diff --git a/win/CS/HandBrake.ApplicationServices/Interop/HandBrakeInstance.cs b/win/CS/HandBrake.ApplicationServices/Interop/HandBrakeInstance.cs
index 854dc4cbe..7919086cc 100644
--- 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">
/// The title index to scan (1-based, 0 for all titles).
/// </param>
- /// <param name="clEnabled">
- /// OpenCL enabled.
- /// </param>
- public void StartScan(string path, int previewCount, TimeSpan minDuration, int titleIndex, bool clEnabled = false)
+ public void StartScan(string path, int previewCount, TimeSpan minDuration, int titleIndex)
{
this.previewCount = previewCount;
IntPtr pathPtr = InteropUtilities.ToUtf8PtrFromString(path);
- HBFunctions.hb_opencl_set_enable(this.hbHandle, clEnabled ? 1 : 0);
HBFunctions.hb_scan(this.hbHandle, pathPtr, titleIndex, previewCount, 1, (ulong)(minDuration.TotalSeconds * 90000));
Marshal.FreeHGlobal(pathPtr);
@@ -372,7 +368,6 @@ namespace HandBrake.ApplicationServices.Interop
NullValueHandling = NullValueHandling.Ignore,
};
- HBFunctions.hb_opencl_set_enable(this.hbHandle, encodeObject.Video.OpenCL ? 1 : 0);
string encode = JsonConvert.SerializeObject(encodeObject, Formatting.Indented, settings);
HBFunctions.hb_add_json(this.hbHandle, InteropUtilities.ToUtf8PtrFromString(encode));
HBFunctions.hb_start(this.hbHandle);
diff --git a/win/CS/HandBrake.ApplicationServices/Interop/HbLib/HbFunctions.cs b/win/CS/HandBrake.ApplicationServices/Interop/HbLib/HbFunctions.cs
index beb572f0d..beaf2e689 100644
--- 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)]
public static extern void hb_dvd_set_dvdnav(int enable);
- // void hb_opencl_set_enable(hb_handle_t* h, int enable_opencl);
- [DllImport("hb", EntryPoint = "hb_opencl_set_enable", CallingConvention = CallingConvention.Cdecl)]
- public static extern void hb_opencl_set_enable(IntPtr hbHandle, int enable);
-
/// Return Type: void
///param0: hb_handle_t*
///path: char*
diff --git a/win/CS/HandBrake.ApplicationServices/Interop/Interfaces/IHandBrakeInstance.cs b/win/CS/HandBrake.ApplicationServices/Interop/Interfaces/IHandBrakeInstance.cs
index 910621d81..d0338aea5 100644
--- 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">
/// The min Duration.
/// </param>
- /// <param name="titleIndex">
- /// The title index to scan (1-based, 0 for all titles).
- /// </param>
- void StartScan(string path, int previewCount, TimeSpan minDuration, int titleIndex, bool clEnabled = false);
+ void StartScan(string path, int previewCount, TimeSpan minDuration, int titleIndex);
/// <summary>
/// Stops the current encode.
diff --git a/win/CS/HandBrake.ApplicationServices/Interop/Json/Encode/Video.cs b/win/CS/HandBrake.ApplicationServices/Interop/Json/Encode/Video.cs
index 6844eaf0d..b22910768 100644
--- a/win/CS/HandBrake.ApplicationServices/Interop/Json/Encode/Video.cs
+++ b/win/CS/HandBrake.ApplicationServices/Interop/Json/Encode/Video.cs
@@ -78,11 +78,6 @@ namespace HandBrake.ApplicationServices.Interop.Json.Encode
public string Tune { get; set; }
/// <summary>
- /// Gets or sets a value indicating whether open cl.
- /// </summary>
- public bool OpenCL { get; set; }
-
- /// <summary>
/// Gets or sets a value indicating whether hw decode.
/// </summary>
public bool HWDecode { get; set; }