summaryrefslogtreecommitdiffstats
path: root/win
diff options
context:
space:
mode:
Diffstat (limited to 'win')
-rw-r--r--win/CS/HandBrakeWPF/Converters/Video/VideoEncoderConverter.cs8
-rw-r--r--win/CS/HandBrakeWPF/Properties/Resources.Designer.cs10
-rw-r--r--win/CS/HandBrakeWPF/Properties/Resources.resx4
-rw-r--r--win/CS/HandBrakeWPF/UserSettingConstants.cs5
-rw-r--r--win/CS/HandBrakeWPF/ViewModels/OptionsViewModel.cs27
-rw-r--r--win/CS/HandBrakeWPF/Views/OptionsView.xaml25
6 files changed, 6 insertions, 73 deletions
diff --git a/win/CS/HandBrakeWPF/Converters/Video/VideoEncoderConverter.cs b/win/CS/HandBrakeWPF/Converters/Video/VideoEncoderConverter.cs
index 2dd2e82d8..8e2f1d379 100644
--- a/win/CS/HandBrakeWPF/Converters/Video/VideoEncoderConverter.cs
+++ b/win/CS/HandBrakeWPF/Converters/Video/VideoEncoderConverter.cs
@@ -15,16 +15,11 @@ namespace HandBrakeWPF.Converters.Video
using System.Linq;
using System.Windows.Data;
- using Caliburn.Micro;
-
using HandBrake.ApplicationServices.Model;
using HandBrake.ApplicationServices.Model.Encoding;
- using HandBrake.ApplicationServices.Services.Interfaces;
using HandBrake.ApplicationServices.Utilities;
using HandBrake.Interop.Model.Encoding;
- using HandBrakeWPF.Services.Interfaces;
-
/// <summary>
/// Video Encoder Converter
/// </summary>
@@ -60,8 +55,7 @@ namespace HandBrakeWPF.Converters.Video
encoders.Remove(VideoEncoder.Theora);
}
- IUserSettingService userSettingService = IoC.Get<IUserSettingService>();
- if (!SystemInfo.IsQsvAvailable || !userSettingService.GetUserSetting<bool>(UserSettingConstants.EnableQuickSync))
+ if (!SystemInfo.IsQsvAvailable)
{
encoders.Remove(VideoEncoder.QuickSync);
}
diff --git a/win/CS/HandBrakeWPF/Properties/Resources.Designer.cs b/win/CS/HandBrakeWPF/Properties/Resources.Designer.cs
index c81c09579..61a0bfebc 100644
--- a/win/CS/HandBrakeWPF/Properties/Resources.Designer.cs
+++ b/win/CS/HandBrakeWPF/Properties/Resources.Designer.cs
@@ -338,16 +338,6 @@ namespace HandBrakeWPF.Properties {
}
/// <summary>
- /// Looks up a localized resource of type System.Drawing.Bitmap.
- /// </summary>
- public static System.Drawing.Bitmap logo64 {
- get {
- object obj = ResourceManager.GetObject("logo64", resourceCulture);
- return ((System.Drawing.Bitmap)(obj));
- }
- }
-
- /// <summary>
/// Looks up a localized string similar to The Built-in presets have been reset..
/// </summary>
public static string Presets_ResetComplete {
diff --git a/win/CS/HandBrakeWPF/Properties/Resources.resx b/win/CS/HandBrakeWPF/Properties/Resources.resx
index 085633458..9bcd3fac3 100644
--- a/win/CS/HandBrakeWPF/Properties/Resources.resx
+++ b/win/CS/HandBrakeWPF/Properties/Resources.resx
@@ -233,10 +233,6 @@ Baseline profile, as required for iPods and similar devices, requires weighted P
Note that some devices and players, even those that support Main Profile,
may have problems with Weighted P-frame prediction: the Apple TV is completely incompatible with it, for example.</value>
</data>
- <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
- <data name="logo64" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\logo64.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
- </data>
<data name="Video_x264ExtraArgs" xml:space="preserve">
<value>The full x264 list of parameters:
{0}</value>
diff --git a/win/CS/HandBrakeWPF/UserSettingConstants.cs b/win/CS/HandBrakeWPF/UserSettingConstants.cs
index 9f8c69b53..5ef1d70dc 100644
--- a/win/CS/HandBrakeWPF/UserSettingConstants.cs
+++ b/win/CS/HandBrakeWPF/UserSettingConstants.cs
@@ -242,11 +242,6 @@ namespace HandBrakeWPF
public const string ResetWhenDoneAction = "ResetWhenDoneAction";
/// <summary>
- /// The enable quick sync.
- /// </summary>
- public const string EnableQuickSync = "EnableQuickSync";
-
- /// <summary>
/// The add foreign audio scan track.
/// </summary>
public const string AddForeignAudioScanTrack = "AddForeignAudioScanTrack";
diff --git a/win/CS/HandBrakeWPF/ViewModels/OptionsViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/OptionsViewModel.cs
index dde54a5c6..e0fdee4e2 100644
--- a/win/CS/HandBrakeWPF/ViewModels/OptionsViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/OptionsViewModel.cs
@@ -375,11 +375,6 @@ namespace HandBrakeWPF.ViewModels
private bool disableQuickSyncDecoding;
/// <summary>
- /// The enable quick sync.
- /// </summary>
- private bool enableQuickSync;
-
- /// <summary>
/// The add foreign audio scan track.
/// </summary>
private bool addForeignAudioScanTrack;
@@ -1439,26 +1434,6 @@ namespace HandBrakeWPF.ViewModels
#region Video
/// <summary>
- /// Gets or sets a value indicating whether enable quick sync.
- /// </summary>
- public bool EnableQuickSync
- {
- get
- {
- return this.enableQuickSync && this.IsQuickSyncAvailable;
- }
- set
- {
- if (value.Equals(this.enableQuickSync))
- {
- return;
- }
- this.enableQuickSync = value;
- this.NotifyOfPropertyChange(() => this.EnableQuickSync);
- }
- }
-
- /// <summary>
/// Gets or sets a value indicating whether disable quick sync decoding.
/// </summary>
public bool DisableQuickSyncDecoding
@@ -1910,7 +1885,6 @@ namespace HandBrakeWPF.ViewModels
// #############################
// Video
// #############################
- this.EnableQuickSync = this.userSettingService.GetUserSetting<bool>(UserSettingConstants.EnableQuickSync);
this.DisableQuickSyncDecoding = this.userSettingService.GetUserSetting<bool>(UserSettingConstants.DisableQuickSyncDecoding);
this.EnableDxvaDecoding = this.userSettingService.GetUserSetting<bool>(UserSettingConstants.EnableDxva);
this.SelectedScalingMode = this.userSettingService.GetUserSetting<VideoScaler>(UserSettingConstants.ScalingMode);
@@ -2034,7 +2008,6 @@ namespace HandBrakeWPF.ViewModels
this.userSettingService.SetUserSetting(UserSettingConstants.AddForeignAudioScanTrack, this.AddForeignAudioScanTrack);
/* Video */
- this.userSettingService.SetUserSetting(UserSettingConstants.EnableQuickSync, this.EnableQuickSync);
this.userSettingService.SetUserSetting(UserSettingConstants.DisableQuickSyncDecoding, this.DisableQuickSyncDecoding);
this.userSettingService.SetUserSetting(UserSettingConstants.EnableDxva, this.EnableDxvaDecoding);
this.userSettingService.SetUserSetting(UserSettingConstants.ScalingMode, this.SelectedScalingMode);
diff --git a/win/CS/HandBrakeWPF/Views/OptionsView.xaml b/win/CS/HandBrakeWPF/Views/OptionsView.xaml
index 87bdf42c4..961d31582 100644
--- a/win/CS/HandBrakeWPF/Views/OptionsView.xaml
+++ b/win/CS/HandBrakeWPF/Views/OptionsView.xaml
@@ -320,14 +320,16 @@
<StackPanel Orientation="Vertical" Margin="20,0,0,0" >
<CheckBox Content="Enable DXVA Hardware Accelerated Decoding" IsChecked="{Binding EnableDxvaDecoding}" />
+ <TextBlock Text="{x:Static Properties:Resources.Video_DxvaDecode}" Margin="17,2,0,0" />
</StackPanel>
- <StackPanel Orientation="Vertical" Margin="37,2,0,0" >
- <TextBlock Text="{x:Static Properties:Resources.Video_DxvaDecode}" />
+ <StackPanel Orientation="Vertical" Margin="20,10,0,0">
+ <CheckBox Content="Disable QuickSync Decoding" IsEnabled="{Binding IsQuickSyncAvailable}" IsChecked="{Binding DisableQuickSyncDecoding}" />
+ <TextBlock Text="{x:Static Properties:Resources.Video_QuickSyncNotAvailable}" Margin="17,2,0,0"
+ Visibility="{Binding IsQuickSyncAvailable, Converter={StaticResource boolToVisConverter}, ConverterParameter=true}" />
</StackPanel>
-
<TextBlock Text="Scaling" FontSize="14" Margin="0,20,0,10" />
<StackPanel Orientation="Horizontal" Margin="20,0,0,0">
@@ -340,23 +342,6 @@
<StackPanel Orientation="Vertical" Margin="26,2,0,0" >
<TextBlock Text="{x:Static Properties:Resources.Video_ScalingModes}" TextWrapping="Wrap "/>
</StackPanel>
-
-
-
- <TextBlock Text="Intel QuickSync" FontSize="14" Margin="0,20,0,10"/>
-
- <StackPanel Orientation="Vertical" Margin="20,0,0,0">
- <CheckBox Content="Enable the QuickSync Video Encoder" IsEnabled="{Binding IsQuickSyncAvailable}" IsChecked="{Binding EnableQuickSync}" />
- <CheckBox Content="Disable QuickSync Decoding" IsEnabled="{Binding IsQuickSyncAvailable}" IsChecked="{Binding DisableQuickSyncDecoding}" />
- </StackPanel>
-
- <StackPanel Orientation="Vertical" Margin="37,2,0,0">
- <TextBlock Text="{x:Static Properties:Resources.Video_QuickSyncNotAvailable}"
- Visibility="{Binding IsQuickSyncAvailable, Converter={StaticResource boolToVisConverter}, ConverterParameter=true}"/>
- </StackPanel>
-
-
-
</StackPanel>
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-18 07:21:53 +0000