diff options
Diffstat (limited to 'win')
| -rw-r--r-- | win/CS/HandBrakeWPF/Properties/Resources.Designer.cs | 16 | ||||
| -rw-r--r-- | win/CS/HandBrakeWPF/Properties/Resources.resx | 16 | ||||
| -rw-r--r-- | win/CS/HandBrakeWPF/ViewModels/SubtitlesViewModel.cs | 38 | ||||
| -rw-r--r-- | win/CS/HandBrakeWPF/Views/OptionsView.xaml | 4 |
4 files changed, 40 insertions, 34 deletions
diff --git a/win/CS/HandBrakeWPF/Properties/Resources.Designer.cs b/win/CS/HandBrakeWPF/Properties/Resources.Designer.cs index 3e55ad7e5..c8cfeed8d 100644 --- a/win/CS/HandBrakeWPF/Properties/Resources.Designer.cs +++ b/win/CS/HandBrakeWPF/Properties/Resources.Designer.cs @@ -384,8 +384,8 @@ namespace HandBrakeWPF.Properties { }
/// <summary>
- /// Looks up a localized string similar to Please note, this option is suitable only for slower systems.
- ///Hardware decoders are currently designed for playback, not for re-encoding video so will likely bottleneck on faster systems..
+ /// Looks up a localized string similar to Please note, this option is suitable only for slower systems. It will cause a bottleneck on faster systems.
+ ///Accelerates Accelerates H.264, MPEG-4, VC1 and WMV3 only. .
/// </summary>
public static string Video_DxvaDecode {
get {
@@ -466,8 +466,8 @@ namespace HandBrakeWPF.Properties { ///
///In order to use the QuickSync encoder, you must:
///
- ///- Have a Intel Core series CPU with HD Graphics. Haswell or newer parts are recommended.
- ///- Have a monitor connected to the HD Graphics
+ ///- Have a Intel Core series CPU with HD Graphics. 4th Generation Haswell or newer parts are recommended for best quality.
+ ///- Have a monitor connected to the HD Graphics or GPU Virtualisation software installed.
///- Note that in multi-GPU enviroments, you may need to use 3rd party tools and workarounds to active the hardware..
/// </summary>
public static string Video_QuickSyncNotAvailable {
@@ -477,10 +477,10 @@ namespace HandBrakeWPF.Properties { }
/// <summary>
- /// Looks up a localized string similar to Lanczos - This is HandBrakes default scaler. It provides the best quality downscaling.
- ///Bicubic OpenCL - A hardware accelerated version of the CPU based Bicubic scaler.
- /// This can be around 5~7% faster than software bicubic on a fast modern graphics card.
- /// If OpenCL is unavailable, it will fallback to a software scaler. .
+ /// Looks up a localized string similar to Lanczos - This is HandBrakes default scaler. It provides the best quality downscaling.
+ ///Bicubic OpenCL - A hardware accelerated version of the CPU based Bicubic scaler.
+ /// This can be around 5~7% faster than software bicubic on a fast modern graphics card.
+ /// If OpenCL is unavailable, it will fallback to a software scaler. .
/// </summary>
public static string Video_ScalingModes {
get {
diff --git a/win/CS/HandBrakeWPF/Properties/Resources.resx b/win/CS/HandBrakeWPF/Properties/Resources.resx index 95de8bf8f..3439096ac 100644 --- a/win/CS/HandBrakeWPF/Properties/Resources.resx +++ b/win/CS/HandBrakeWPF/Properties/Resources.resx @@ -351,22 +351,22 @@ If you do not use this tab, it can be hidden from: Tools Menu > Options > <value>Placebo Quality |</value>
</data>
<data name="Video_DxvaDecode" xml:space="preserve">
- <value>Please note, this option is suitable only for slower systems.
-Hardware decoders are currently designed for playback, not for re-encoding video so will likely bottleneck on faster systems.</value>
+ <value>Please note, this option is suitable only for slower systems. It will cause a bottleneck on faster systems.
+Accelerates Accelerates H.264, MPEG-4, VC1 and WMV3 only. </value>
</data>
<data name="Video_QuickSyncNotAvailable" xml:space="preserve">
<value>QuickSync hardware not detected!
In order to use the QuickSync encoder, you must:
-- Have a Intel Core series CPU with HD Graphics. Haswell or newer parts are recommended.
-- Have a monitor connected to the HD Graphics
+- Have a Intel Core series CPU with HD Graphics. 4th Generation Haswell or newer parts are recommended for best quality.
+- Have a monitor connected to the HD Graphics or GPU Virtualisation software installed.
- Note that in multi-GPU enviroments, you may need to use 3rd party tools and workarounds to active the hardware.</value>
</data>
<data name="Video_ScalingModes" xml:space="preserve">
- <value>Lanczos - This is HandBrakes default scaler. It provides the best quality downscaling.
-Bicubic OpenCL - A hardware accelerated version of the CPU based Bicubic scaler.
- This can be around 5~7% faster than software bicubic on a fast modern graphics card.
- If OpenCL is unavailable, it will fallback to a software scaler. </value>
+ <value>Lanczos - This is HandBrakes default scaler. It provides the best quality downscaling.
+Bicubic OpenCL - A hardware accelerated version of the CPU based Bicubic scaler.
+ This can be around 5~7% faster than software bicubic on a fast modern graphics card.
+ If OpenCL is unavailable, it will fallback to a software scaler. </value>
</data>
</root>
\ No newline at end of file diff --git a/win/CS/HandBrakeWPF/ViewModels/SubtitlesViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/SubtitlesViewModel.cs index 1e8e964e5..4a28438b7 100644 --- a/win/CS/HandBrakeWPF/ViewModels/SubtitlesViewModel.cs +++ b/win/CS/HandBrakeWPF/ViewModels/SubtitlesViewModel.cs @@ -13,6 +13,7 @@ namespace HandBrakeWPF.ViewModels using System.Collections.Specialized;
using System.IO;
using System.Linq;
+ using System.Windows.Controls.Primitives;
using HandBrake.ApplicationServices.Model;
using HandBrake.ApplicationServices.Model.Encoding;
@@ -225,7 +226,7 @@ namespace HandBrakeWPF.ViewModels /// <param name="subtitle">
/// The subtitle.
/// </param>
- public void SelectBurnedInTrack(SubtitleTrack subtitle)
+ public void SetBurnedToFalseForAllExcept(SubtitleTrack subtitle)
{
foreach (SubtitleTrack track in this.Task.SubtitleTracks)
{
@@ -372,11 +373,12 @@ namespace HandBrakeWPF.ViewModels string preferred =
this.UserSettingService.GetUserSetting<string>(UserSettingConstants.NativeLanguageForSubtitles);
- Subtitle source = subtitle ??
- ((this.SourceTracks != null)
- ? (this.SourceTracks.FirstOrDefault(l => l.Language == preferred) ??
- this.SourceTracks.FirstOrDefault(s => s.SubtitleType != SubtitleType.ForeignAudioSearch))
- : null);
+ Subtitle source = subtitle
+ ?? ((this.SourceTracks != null)
+ ? (this.SourceTracks.FirstOrDefault(l => l.Language == preferred)
+ ?? this.SourceTracks.FirstOrDefault(
+ s => s.SubtitleType != SubtitleType.ForeignAudioSearch))
+ : null);
if (source == null)
{
@@ -384,18 +386,22 @@ namespace HandBrakeWPF.ViewModels }
SubtitleTrack track = new SubtitleTrack
- {
- SubtitleType = SubtitleType.VobSub,
- SourceTrack = source,
- };
-
- if ((source.SubtitleType == SubtitleType.PGS || source.SubtitleType == SubtitleType.VobSub) &&
- this.Task != null &&
- (this.Task.OutputFormat == OutputFormat.Mp4 || this.Task.OutputFormat == OutputFormat.M4V))
+ {
+ SubtitleType = SubtitleType.VobSub,
+ SourceTrack = source,
+ };
+
+ if ((source.SubtitleType == SubtitleType.PGS || source.SubtitleType == SubtitleType.VobSub || source.SubtitleType == SubtitleType.ForeignAudioSearch)
+ && this.Task != null
+ && (this.Task.OutputFormat == OutputFormat.Mp4 || this.Task.OutputFormat == OutputFormat.M4V))
{
- this.SelectBurnedInTrack(track);
+ if (track.CanBeBurned)
+ {
+ track.Burned = true;
+ this.SetBurnedToFalseForAllExcept(track);
+ }
}
-
+
this.Task.SubtitleTracks.Add(track);
}
diff --git a/win/CS/HandBrakeWPF/Views/OptionsView.xaml b/win/CS/HandBrakeWPF/Views/OptionsView.xaml index 955fbf108..420615b46 100644 --- a/win/CS/HandBrakeWPF/Views/OptionsView.xaml +++ b/win/CS/HandBrakeWPF/Views/OptionsView.xaml @@ -224,7 +224,7 @@ </StackPanel>
</Grid>
- <TextBlock Text="Automatic language selection behaviour" Grid.Column="0" Margin="10,20,0,0" FontSize="14"/>
+ <TextBlock Text="Automatic language selection behaviour" Margin="10,20,0,0" FontSize="14"/>
<Grid Margin="20,10,0,0" >
<Grid.RowDefinitions>
@@ -258,7 +258,7 @@ HorizontalAlignment="Left" IsChecked="{Binding AddForeignAudioScanTrack}"/>
</Grid>
- <TextBlock Text="Additional languages for possible selection" Grid.Column="0" Margin="10,20,0,0" FontSize="14"/>
+ <TextBlock Text="Additional languages for possible selection" Margin="10,20,0,0" FontSize="14"/>
<Grid Margin="20,20,0,0">
<Grid.ColumnDefinitions>
|