diff options
| author | sr55 <[email protected]> | 2013-09-14 17:21:24 +0000 |
|---|---|---|
| committer | sr55 <[email protected]> | 2013-09-14 17:21:24 +0000 |
| commit | 1e73f743a8463ef70126d7b6b094f6ccc74c971e (patch) | |
| tree | 222e622918ba64c2971a002502a5e15bdc2e3852 /win/CS/HandBrakeWPF/ViewModels | |
| parent | 9280ff47e6e179f9e3f4568f85bae362402a82f4 (diff) | |
WinGui: Remove the AV_MP4 option so we now only have the AV Format Muxer as "MP4 File". The AV_MKV option will be removed at a later date.
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@5781 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'win/CS/HandBrakeWPF/ViewModels')
4 files changed, 6 insertions, 8 deletions
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;
}
|