From 136108a7f8eaba02dd0ede50142ee3b93e27efbd Mon Sep 17 00:00:00 2001
From: sr55 <sr55.hb@outlook.com>
Date: Sun, 2 Oct 2016 20:35:00 +0100
Subject: WinGui: Always show the framerate controls when using QSV. When full
 QSV path is used (decode and encode), libhb will sanatise the setting for
 now. Fixes #340

---
 win/CS/HandBrakeWPF/Properties/ResourcesUI.Designer.cs | 9 ---------
 win/CS/HandBrakeWPF/Properties/ResourcesUI.resx        | 3 ---
 win/CS/HandBrakeWPF/Views/VideoView.xaml               | 7 ++-----
 3 files changed, 2 insertions(+), 17 deletions(-)

(limited to 'win/CS/HandBrakeWPF')

diff --git a/win/CS/HandBrakeWPF/Properties/ResourcesUI.Designer.cs b/win/CS/HandBrakeWPF/Properties/ResourcesUI.Designer.cs
index b7b5332d0..2c62e229b 100644
--- a/win/CS/HandBrakeWPF/Properties/ResourcesUI.Designer.cs
+++ b/win/CS/HandBrakeWPF/Properties/ResourcesUI.Designer.cs
@@ -2330,15 +2330,6 @@ namespace HandBrakeWPF.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to Same as source.
-        /// </summary>
-        public static string VideoView_SameAsSource {
-            get {
-                return ResourceManager.GetString("VideoView_SameAsSource", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to Turbo first pass.
         /// </summary>
diff --git a/win/CS/HandBrakeWPF/Properties/ResourcesUI.resx b/win/CS/HandBrakeWPF/Properties/ResourcesUI.resx
index d332c0ca4..97dfabdc0 100644
--- a/win/CS/HandBrakeWPF/Properties/ResourcesUI.resx
+++ b/win/CS/HandBrakeWPF/Properties/ResourcesUI.resx
@@ -630,9 +630,6 @@
   <data name="VideoView_Quality" xml:space="preserve">
     <value>Quality</value>
   </data>
-  <data name="VideoView_SameAsSource" xml:space="preserve">
-    <value>Same as source</value>
-  </data>
   <data name="VideoView_TurboFirstPass" xml:space="preserve">
     <value>Turbo first pass</value>
   </data>
diff --git a/win/CS/HandBrakeWPF/Views/VideoView.xaml b/win/CS/HandBrakeWPF/Views/VideoView.xaml
index 2c592005b..e8319b785 100644
--- a/win/CS/HandBrakeWPF/Views/VideoView.xaml
+++ b/win/CS/HandBrakeWPF/Views/VideoView.xaml
@@ -61,12 +61,9 @@
                 <StackPanel Orientation="Horizontal">
                     <TextBlock Text="{x:Static Properties:ResourcesUI.VideoView_Framerate}" VerticalAlignment="Top" Margin="0,5,0,0" Width="100"/>
                     <StackPanel Orientation="Vertical">
-                        <ComboBox Width="120" ItemsSource="{Binding Framerates}" SelectedItem="{Binding SelectedFramerate}" ToolTip="{x:Static Properties:ResourcesTooltips.Video_Framerate}"  
-                                  Visibility="{Binding DisplayNonQSVControls, Converter={StaticResource boolToVisConverter}, ConverterParameter=false}" />
-                        <TextBlock Text="{x:Static Properties:ResourcesUI.VideoView_SameAsSource}"  VerticalAlignment="Center" Margin="0,5,0,0"
-                                   Visibility="{Binding DisplayNonQSVControls, Converter={StaticResource boolToVisConverter}, ConverterParameter=true}"/>
+                        <ComboBox Width="120" ItemsSource="{Binding Framerates}" SelectedItem="{Binding SelectedFramerate}" ToolTip="{x:Static Properties:ResourcesTooltips.Video_Framerate}"  />
 
-                        <StackPanel Orientation="Vertical" Visibility="{Binding DisplayNonQSVControls, Converter={StaticResource boolToVisConverter}}">
+                        <StackPanel Orientation="Vertical" >
                             <RadioButton Content="{x:Static Properties:ResourcesUI.VideoView_ConstantFramerate}" IsChecked="{Binding IsConstantFramerate}" Margin="0,5,0,0"
                                          ToolTip="{x:Static Properties:ResourcesTooltips.Video_ConstantFramerate}" />
                             <RadioButton Content="{x:Static Properties:ResourcesUI.VideoView_VariableFramerate}" IsChecked="{Binding IsVariableFramerate}" Margin="0,5,0,0" 
-- 
cgit v1.2.3