diff options
Diffstat (limited to 'win/CS/HandBrakeWPF')
| -rw-r--r-- | win/CS/HandBrakeWPF/Helpers/AutoNameHelper.cs | 2 | ||||
| -rw-r--r-- | win/CS/HandBrakeWPF/ViewModels/AudioViewModel.cs | 2 | ||||
| -rw-r--r-- | win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs | 8 | ||||
| -rw-r--r-- | win/CS/HandBrakeWPF/ViewModels/SubtitlesViewModel.cs | 2 | ||||
| -rw-r--r-- | win/CS/HandBrakeWPF/ViewModels/VideoViewModel.cs | 2 | ||||
| -rw-r--r-- | win/CS/HandBrakeWPF/Views/MainView.xaml | 11 |
6 files changed, 8 insertions, 19 deletions
diff --git a/win/CS/HandBrakeWPF/Helpers/AutoNameHelper.cs b/win/CS/HandBrakeWPF/Helpers/AutoNameHelper.cs index cfe1714a0..f0144d1ec 100644 --- a/win/CS/HandBrakeWPF/Helpers/AutoNameHelper.cs +++ b/win/CS/HandBrakeWPF/Helpers/AutoNameHelper.cs @@ -107,7 +107,7 @@ namespace HandBrakeWPF.Helpers /*
* File Extension
*/
- if (task.OutputFormat == OutputFormat.Mp4 || task.OutputFormat == OutputFormat.M4V || task.OutputFormat == OutputFormat.av_mp4)
+ if (task.OutputFormat == OutputFormat.Mp4 || task.OutputFormat == OutputFormat.M4V)
{
switch (userSettingService.GetUserSetting<int>(UserSettingConstants.UseM4v))
{
diff --git a/win/CS/HandBrakeWPF/ViewModels/AudioViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/AudioViewModel.cs index 242eca68e..61c2d4a22 100644 --- a/win/CS/HandBrakeWPF/ViewModels/AudioViewModel.cs +++ b/win/CS/HandBrakeWPF/ViewModels/AudioViewModel.cs @@ -166,7 +166,7 @@ namespace HandBrakeWPF.ViewModels {
this.NotifyOfPropertyChange(() => this.Task);
- if (Task.OutputFormat == OutputFormat.Mp4 || this.Task.OutputFormat == OutputFormat.av_mp4)
+ if (Task.OutputFormat == OutputFormat.Mp4)
{
foreach (AudioTrack track in this.Task.AudioTracks.Where(track => track.Encoder == AudioEncoder.ffflac || track.Encoder == AudioEncoder.Vorbis))
{
diff --git a/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs index dce7e524b..b3be2b60e 100644 --- a/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs +++ b/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs @@ -381,7 +381,6 @@ namespace HandBrakeWPF.ViewModels if (this.SelectedPreset != null)
{
// Main Window Settings
- this.CurrentTask.LargeFile = selectedPreset.Task.LargeFile;
this.CurrentTask.OptimizeMP4 = selectedPreset.Task.OptimizeMP4;
this.CurrentTask.IPod5GSupport = selectedPreset.Task.IPod5GSupport;
this.SelectedOutputFormat = selectedPreset.Task.OutputFormat;
@@ -622,7 +621,7 @@ namespace HandBrakeWPF.ViewModels {
return new List<OutputFormat>
{
- OutputFormat.av_mp4, OutputFormat.av_mkv, OutputFormat.Mp4, OutputFormat.Mkv
+ OutputFormat.Mp4, OutputFormat.av_mkv, OutputFormat.Mkv
};
}
}
@@ -1419,10 +1418,10 @@ namespace HandBrakeWPF.ViewModels this.SelectedOutputFormat = OutputFormat.av_mkv;
break;
case ".mp4":
- this.SelectedOutputFormat = OutputFormat.av_mp4;
+ this.SelectedOutputFormat = OutputFormat.Mp4;
break;
case ".m4v":
- this.SelectedOutputFormat = OutputFormat.av_mp4;
+ this.SelectedOutputFormat = OutputFormat.M4V;
break;
}
@@ -1727,7 +1726,6 @@ namespace HandBrakeWPF.ViewModels if (newExtension == ".mkv")
{
this.IsMkv = true;
- this.CurrentTask.LargeFile = false;
this.CurrentTask.OptimizeMP4 = false;
this.CurrentTask.IPod5GSupport = false;
}
diff --git a/win/CS/HandBrakeWPF/ViewModels/SubtitlesViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/SubtitlesViewModel.cs index 8b93173a2..feabc08f3 100644 --- a/win/CS/HandBrakeWPF/ViewModels/SubtitlesViewModel.cs +++ b/win/CS/HandBrakeWPF/ViewModels/SubtitlesViewModel.cs @@ -385,7 +385,7 @@ namespace HandBrakeWPF.ViewModels if ((source.SubtitleType == SubtitleType.PGS || source.SubtitleType == SubtitleType.VobSub) &&
this.Task != null &&
- (this.Task.OutputFormat == OutputFormat.Mp4 || this.Task.OutputFormat == OutputFormat.M4V || this.Task.OutputFormat == OutputFormat.av_mp4))
+ (this.Task.OutputFormat == OutputFormat.Mp4 || this.Task.OutputFormat == OutputFormat.M4V))
{
this.SelectBurnedInTrack(track);
}
diff --git a/win/CS/HandBrakeWPF/ViewModels/VideoViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/VideoViewModel.cs index bc07f57f5..e8702e60f 100644 --- a/win/CS/HandBrakeWPF/ViewModels/VideoViewModel.cs +++ b/win/CS/HandBrakeWPF/ViewModels/VideoViewModel.cs @@ -1057,7 +1057,7 @@ namespace HandBrakeWPF.ViewModels {
this.NotifyOfPropertyChange(() => this.Task);
- if ((Task.OutputFormat == OutputFormat.Mp4 || Task.OutputFormat == OutputFormat.av_mp4) && this.SelectedVideoEncoder == VideoEncoder.Theora)
+ if ((Task.OutputFormat == OutputFormat.Mp4) && this.SelectedVideoEncoder == VideoEncoder.Theora)
{
this.SelectedVideoEncoder = VideoEncoder.X264;
}
diff --git a/win/CS/HandBrakeWPF/Views/MainView.xaml b/win/CS/HandBrakeWPF/Views/MainView.xaml index cb1fa7582..4f7ab8ce0 100644 --- a/win/CS/HandBrakeWPF/Views/MainView.xaml +++ b/win/CS/HandBrakeWPF/Views/MainView.xaml @@ -219,7 +219,7 @@ <Setter Property="Tag" Value="{Binding}" />
<Style.Triggers>
- <DataTrigger Binding="{Binding Path=IsDisc}" Value="true">
+ <DataTrigger Binding="{Binding Path=IsDrive}" Value="true">
<Setter Property="Icon" Value="{StaticResource Disc}"/>
</DataTrigger>
<DataTrigger Binding="{Binding Path=IsOpenFolder}" Value="true">
@@ -514,15 +514,6 @@ ItemsSource="{Binding OutputFormats}"
SelectedItem="{Binding SelectedOutputFormat}"
/>
- <CheckBox Name="LargeFileMp4"
- Margin="8,0,0,0"
- VerticalAlignment="Center"
- Content="Large File Size"
- IsChecked="{Binding Path=CurrentTask.LargeFile}"
- Visibility="{Binding IsMkv,
- Converter={StaticResource boolToVisConverter},
- ConverterParameter=true}"
- />
<CheckBox Name="WebOptimized"
Margin="8,0,0,0"
VerticalAlignment="Center"
|