diff options
Diffstat (limited to 'win')
11 files changed, 23 insertions, 23 deletions
diff --git a/win/CS/HandBrake.ApplicationServices/Model/EncodeTask.cs b/win/CS/HandBrake.ApplicationServices/Model/EncodeTask.cs index 5c9f166e0..f9053a8bb 100644 --- a/win/CS/HandBrake.ApplicationServices/Model/EncodeTask.cs +++ b/win/CS/HandBrake.ApplicationServices/Model/EncodeTask.cs @@ -88,7 +88,7 @@ namespace HandBrake.ApplicationServices.Model this.IncludeChapterMarkers = task.IncludeChapterMarkers;
this.IPod5GSupport = task.IPod5GSupport;
this.OpenCLSupport = task.OpenCLSupport;
- this.UVDSupport = task.UVDSupport;
+ this.HWDSupport = task.HWDSupport;
this.KeepDisplayAspect = task.KeepDisplayAspect;
this.LargeFile = task.LargeFile;
this.MaxHeight = task.MaxHeight;
@@ -197,9 +197,9 @@ namespace HandBrake.ApplicationServices.Model public bool OpenCLSupport { get; set; }
/// <summary>
- /// Gets or sets a value indicating whether UVDSupport.
+ /// Gets or sets a value indicating whether HWDSupport.
/// </summary>
- public bool UVDSupport { get; set; }
+ public bool HWDSupport { get; set; }
#endregion
#region Picture
diff --git a/win/CS/HandBrake.ApplicationServices/Parsing/Title.cs b/win/CS/HandBrake.ApplicationServices/Parsing/Title.cs index 466a33aa1..00488eac8 100644 --- a/win/CS/HandBrake.ApplicationServices/Parsing/Title.cs +++ b/win/CS/HandBrake.ApplicationServices/Parsing/Title.cs @@ -121,9 +121,9 @@ namespace HandBrake.ApplicationServices.Parsing public int OpenCLSupport { get; set; }
/// <summary>
- /// Gets or sets the UVD
+ /// Gets or sets the HWD
/// </summary>
- public int UVDSupport { get; set; }
+ public int HWDSupport { get; set; }
#endregion
/// <summary>
@@ -236,14 +236,14 @@ namespace HandBrake.ApplicationServices.Parsing }
nextLine = output.ReadLine();
- m = Regex.Match(nextLine, @"^ \+ support uvd:");
+ m = Regex.Match(nextLine, @"^ \+ support hwd:");
if (m.Success)
{
- temp = nextLine.Replace("+ support uvd:", string.Empty).Trim();
+ temp = nextLine.Replace("+ support hwd:", string.Empty).Trim();
if (string.Compare(temp, "yes") == 0)
- thisTitle.UVDSupport = 1;
+ thisTitle.HWDSupport = 1;
else
- thisTitle.UVDSupport = 0;
+ thisTitle.HWDSupport = 0;
}
thisTitle.Chapters.AddRange(Chapter.ParseList(output));
diff --git a/win/CS/HandBrake.ApplicationServices/Utilities/InteropModelCreator.cs b/win/CS/HandBrake.ApplicationServices/Utilities/InteropModelCreator.cs index 5cb0d4768..618dd43cc 100644 --- a/win/CS/HandBrake.ApplicationServices/Utilities/InteropModelCreator.cs +++ b/win/CS/HandBrake.ApplicationServices/Utilities/InteropModelCreator.cs @@ -102,7 +102,7 @@ namespace HandBrake.ApplicationServices.Utilities profile.Height = work.Height.HasValue ? work.Height.Value : 0;
profile.IPod5GSupport = work.IPod5GSupport;
profile.OpenCLGSupport = work.OpenCLSupport;
- profile.UVDSupport = work.UVDSupport;
+ profile.HWDSupport = work.HWDSupport;
profile.IncludeChapterMarkers = work.IncludeChapterMarkers;
profile.KeepDisplayAspect = work.KeepDisplayAspect;
profile.LargeFile = work.LargeFile;
diff --git a/win/CS/HandBrake.ApplicationServices/Utilities/PlistUtility.cs b/win/CS/HandBrake.ApplicationServices/Utilities/PlistUtility.cs index 260abfe54..e22345134 100644 --- a/win/CS/HandBrake.ApplicationServices/Utilities/PlistUtility.cs +++ b/win/CS/HandBrake.ApplicationServices/Utilities/PlistUtility.cs @@ -142,7 +142,7 @@ namespace HandBrake.ApplicationServices.Utilities AddEncodeElement(xmlWriter, "Mp4LargeFile", "integer", parsed.LargeFile ? "1" : "0");
AddEncodeElement(xmlWriter, "Mp4iPodCompatible", "integer", parsed.IPod5GSupport ? "1" : "0");
AddEncodeElement(xmlWriter, "OpenCLSupport", "integer", parsed.OpenCLSupport ? "1" : "0");
- AddEncodeElement(xmlWriter, "UVDSupport", "integer", parsed.UVDSupport ? "1" : "0");
+ AddEncodeElement(xmlWriter, "HWDSupport", "integer", parsed.HWDSupport ? "1" : "0");
AddEncodeElement(xmlWriter, "PictureAutoCrop", "integer", "1");
AddEncodeElement(xmlWriter, "PictureBottomCrop", "integer", parsed.Cropping.Bottom.ToString());
diff --git a/win/CS/HandBrake.ApplicationServices/Utilities/QueryGeneratorUtility.cs b/win/CS/HandBrake.ApplicationServices/Utilities/QueryGeneratorUtility.cs index 69cbfc258..6cdf1d900 100644 --- a/win/CS/HandBrake.ApplicationServices/Utilities/QueryGeneratorUtility.cs +++ b/win/CS/HandBrake.ApplicationServices/Utilities/QueryGeneratorUtility.cs @@ -246,7 +246,7 @@ namespace HandBrake.ApplicationServices.Utilities if (task.OpenCLSupport)
query += " -P ";
- if (task.UVDSupport)
+ if (task.HWDSupport)
query += " -U ";
return query;
diff --git a/win/CS/HandBrake.ApplicationServices/Utilities/QueryParserUtility.cs b/win/CS/HandBrake.ApplicationServices/Utilities/QueryParserUtility.cs index a167801df..9655d6629 100644 --- a/win/CS/HandBrake.ApplicationServices/Utilities/QueryParserUtility.cs +++ b/win/CS/HandBrake.ApplicationServices/Utilities/QueryParserUtility.cs @@ -57,7 +57,7 @@ namespace HandBrake.ApplicationServices.Utilities Match largerMp4 = Regex.Match(input, @" -4");
Match ipodAtom = Regex.Match(input, @" -I");
Match openclSupport = Regex.Match(input, @" -P");
- Match uvdSupport = Regex.Match(input, @" -U");
+ Match hwdSupport = Regex.Match(input, @" -U");
// Picture Settings Tab
Match width = Regex.Match(input, @"-w ([0-9]+)");
@@ -158,7 +158,7 @@ namespace HandBrake.ApplicationServices.Utilities parsed.IPod5GSupport = ipodAtom.Success;
parsed.OptimizeMP4 = optimizeMP4.Success;
parsed.OpenCLSupport = openclSupport.Success;
- parsed.UVDSupport = uvdSupport.Success;
+ parsed.HWDSupport = hwdSupport.Success;
#endregion
diff --git a/win/CS/HandBrake.Interop/HandBrakeInterop/HandBrakeInstance.cs b/win/CS/HandBrake.Interop/HandBrakeInterop/HandBrakeInstance.cs index 74f1683a9..06bf022f3 100644 --- a/win/CS/HandBrake.Interop/HandBrakeInterop/HandBrakeInstance.cs +++ b/win/CS/HandBrake.Interop/HandBrakeInterop/HandBrakeInstance.cs @@ -1448,7 +1448,7 @@ namespace HandBrake.Interop nativeJob.mp4_optimize = profile.Optimize ? 1 : 0;
nativeJob.ipod_atom = profile.IPod5GSupport ? 1 : 0;
nativeJob.opencl_support = profile.OpenCLGSupport ? 1 : 0;
- nativeJob.uvd_support = profile.UVDSupport ? 1 : 0;
+ nativeJob.hwd_support = profile.HWDSupport ? 1 : 0;
if (title.AngleCount > 1)
{
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 a761780fa..562531083 100644 --- a/win/CS/HandBrake.Interop/HandBrakeInterop/HbLib/hb_job_s.cs +++ b/win/CS/HandBrake.Interop/HandBrakeInterop/HbLib/hb_job_s.cs @@ -149,7 +149,7 @@ namespace HandBrake.Interop.HbLib public int opencl_support;
/// int
- public int uvd_support;
+ public int hwd_support;
/// int
public int indepth_scan;
diff --git a/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/EncodingProfile.cs b/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/EncodingProfile.cs index 9667d5e6e..937c776a7 100644 --- a/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/EncodingProfile.cs +++ b/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/EncodingProfile.cs @@ -28,7 +28,7 @@ namespace HandBrake.Interop.Model.Encoding public bool Optimize { get; set; }
public bool IPod5GSupport { get; set; }
public bool OpenCLGSupport { get; set; }
- public bool UVDSupport { get; set; }
+ public bool HWDSupport { get; set; }
public int Width { get; set; }
public int Height { get; set; }
@@ -85,7 +85,7 @@ namespace HandBrake.Interop.Model.Encoding Optimize = this.Optimize,
IPod5GSupport = this.IPod5GSupport,
OpenCLGSupport = this.OpenCLGSupport,
- UVDSupport = this.UVDSupport,
+ HWDSupport = this.HWDSupport,
Width = this.Width,
Height = this.Height,
diff --git a/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs index e814e897c..ad09f3043 100644 --- a/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs +++ b/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs @@ -377,7 +377,7 @@ namespace HandBrakeWPF.ViewModels this.CurrentTask.OptimizeMP4 = selectedPreset.Task.OptimizeMP4;
this.CurrentTask.IPod5GSupport = selectedPreset.Task.IPod5GSupport;
this.CurrentTask.OpenCLSupport = selectedPreset.Task.OpenCLSupport;
- this.CurrentTask.UVDSupport = selectedPreset.Task.UVDSupport;
+ this.CurrentTask.HWDSupport = selectedPreset.Task.HWDSupport;
this.SelectedOutputFormat = selectedPreset.Task.OutputFormat;
// Tab Settings
@@ -1697,7 +1697,7 @@ namespace HandBrakeWPF.ViewModels {
this.SupportOpenCL = false;
}
- if (this.selectedTitle.UVDSupport == 0)
+ if (this.selectedTitle.HWDSupport == 0)
{
this.SupportHardwareDecoding = true;
}
diff --git a/win/CS/HandBrakeWPF/Views/MainView.xaml b/win/CS/HandBrakeWPF/Views/MainView.xaml index 295ebb4c1..0f85a2b73 100644 --- a/win/CS/HandBrakeWPF/Views/MainView.xaml +++ b/win/CS/HandBrakeWPF/Views/MainView.xaml @@ -482,11 +482,11 @@ Converter={StaticResource boolToVisConverter},
ConverterParameter=true}"
/>
- <CheckBox Name="UVD"
+ <CheckBox Name="HWD"
Margin="8,0,0,0"
VerticalAlignment="Center"
- Content="UVD Support"
- IsChecked="{Binding Path=CurrentTask.UVDSupport}" IsEnabled="True"
+ Content="HWD Support"
+ IsChecked="{Binding Path=CurrentTask.HWDSupport}" IsEnabled="True"
Visibility="{Binding SupportHardwareDecoding,
Converter={StaticResource boolToVisConverter},
ConverterParameter=true}"
|