diff options
| author | sr55 <[email protected]> | 2012-05-15 23:37:56 +0000 |
|---|---|---|
| committer | sr55 <[email protected]> | 2012-05-15 23:37:56 +0000 |
| commit | 4a77bc4a9816b28f69dc110ffd624ba9f3173958 (patch) | |
| tree | 940add805424add241c60a26f87da4e1d0a4e232 | |
| parent | c3e391f2fe94084c2a5ffb221cd1ced0b4c861bf (diff) | |
WinGui: Fixes Picture Height CLI Query. Fix Framerate mode controls (PFR/VFR were not working right)
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@4681 b64f7644-9d1e-0410-96f1-a4d463321fa5
| -rw-r--r-- | win/CS/HandBrake.ApplicationServices/Utilities/QueryGeneratorUtility.cs | 2 | ||||
| -rw-r--r-- | win/CS/HandBrakeWPF/ViewModels/VideoViewModel.cs | 7 | ||||
| -rw-r--r-- | win/CS/HandBrakeWPF/Views/VideoView.xaml | 4 |
3 files changed, 9 insertions, 4 deletions
diff --git a/win/CS/HandBrake.ApplicationServices/Utilities/QueryGeneratorUtility.cs b/win/CS/HandBrake.ApplicationServices/Utilities/QueryGeneratorUtility.cs index acba0ce3c..e22b4ec1b 100644 --- a/win/CS/HandBrake.ApplicationServices/Utilities/QueryGeneratorUtility.cs +++ b/win/CS/HandBrake.ApplicationServices/Utilities/QueryGeneratorUtility.cs @@ -240,7 +240,7 @@ namespace HandBrake.ApplicationServices.Utilities else if (task.Width.HasValue && task.Width != 0) query += string.Format(" -w {0}", task.Width);
if (task.MaxWidth.HasValue) query += string.Format(" -Y {0}", task.MaxHeight);
- else if (task.Height.HasValue && task.Height != 0) query += string.Format(" -h {0}", task.Height);
+ else if (task.Height.HasValue && task.Height != 0) query += string.Format(" -l {0}", task.Height);
}
if (task.HasCropping)
diff --git a/win/CS/HandBrakeWPF/ViewModels/VideoViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/VideoViewModel.cs index 295eb3b3b..6ca5618ed 100644 --- a/win/CS/HandBrakeWPF/ViewModels/VideoViewModel.cs +++ b/win/CS/HandBrakeWPF/ViewModels/VideoViewModel.cs @@ -305,13 +305,18 @@ namespace HandBrakeWPF.ViewModels {
this.Task.Framerate = null;
this.ShowPeakFramerate = false;
+
+ if (this.Task.FramerateMode == FramerateMode.PFR)
+ {
+ this.IsVariableFramerate = true;
+ }
}
else if (!string.IsNullOrEmpty(value))
{
this.ShowPeakFramerate = true;
if (this.Task.FramerateMode == FramerateMode.VFR)
{
- this.Task.FramerateMode = FramerateMode.PFR;
+ this.IsPeakFramerate = true;
}
this.Task.Framerate = double.Parse(value);
}
diff --git a/win/CS/HandBrakeWPF/Views/VideoView.xaml b/win/CS/HandBrakeWPF/Views/VideoView.xaml index ea19b654a..5f35886f0 100644 --- a/win/CS/HandBrakeWPF/Views/VideoView.xaml +++ b/win/CS/HandBrakeWPF/Views/VideoView.xaml @@ -39,8 +39,8 @@ <StackPanel Orientation="Vertical">
<ComboBox Width="120" ItemsSource="{Binding Framerates}" SelectedItem="{Binding SelectedFramerate}" />
<RadioButton Content="Constant Framerate" IsChecked="{Binding IsConstantFramerate}" />
- <RadioButton Content="Variable Framerate" IsChecked="{Binding IsVariableFramerate}" Visibility="{Binding ShowPeakFramerate, Converter={StaticResource boolToVisConverter}, ConverterParameter=false}" />
- <RadioButton Content="Peak Framerate" IsChecked="{Binding IsPeakFramerate}" Visibility="{Binding ShowPeakFramerate, Converter={StaticResource boolToVisConverter}, ConverterParameter=true}" />
+ <RadioButton Content="Variable Framerate" IsChecked="{Binding IsVariableFramerate}" Visibility="{Binding ShowPeakFramerate, Converter={StaticResource boolToVisConverter}, ConverterParameter=true}" />
+ <RadioButton Content="Peak Framerate" IsChecked="{Binding IsPeakFramerate}" Visibility="{Binding ShowPeakFramerate, Converter={StaticResource boolToVisConverter}, ConverterParameter=false}" />
</StackPanel>
</StackPanel>
</StackPanel>
|