From af390e55e762996f367d4391ff72c8312f27e762 Mon Sep 17 00:00:00 2001 From: Rodeo Date: Thu, 13 Mar 2014 01:43:10 +0000 Subject: [PATCH] WinGui: enable MP4 and Matroska muxing for x265. Also, remove the raw muxer. git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@6106 b64f7644-9d1e-0410-96f1-a4d463321fa5 --- .../Model/Encoding/OutputFormat.cs | 3 --- .../Utilities/Converters.cs | 4 ---- .../Utilities/InteropModelCreator.cs | 3 --- .../Converters/Video/VideoEncoderConverter.cs | 11 ----------- win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs | 8 +------- 5 files changed, 1 insertion(+), 28 deletions(-) diff --git a/win/CS/HandBrake.ApplicationServices/Model/Encoding/OutputFormat.cs b/win/CS/HandBrake.ApplicationServices/Model/Encoding/OutputFormat.cs index 98116773f..d083e853c 100644 --- a/win/CS/HandBrake.ApplicationServices/Model/Encoding/OutputFormat.cs +++ b/win/CS/HandBrake.ApplicationServices/Model/Encoding/OutputFormat.cs @@ -24,8 +24,5 @@ namespace HandBrake.ApplicationServices.Model.Encoding [Description("MKV")] Mkv, - - [Description("X265")] - X265, } } diff --git a/win/CS/HandBrake.ApplicationServices/Utilities/Converters.cs b/win/CS/HandBrake.ApplicationServices/Utilities/Converters.cs index aa9842124..ef5812a25 100644 --- a/win/CS/HandBrake.ApplicationServices/Utilities/Converters.cs +++ b/win/CS/HandBrake.ApplicationServices/Utilities/Converters.cs @@ -543,8 +543,6 @@ namespace HandBrake.ApplicationServices.Utilities return OutputFormat.Mp4; case "mkv": return OutputFormat.Mkv; - case "x265": - return OutputFormat.X265; } } @@ -567,8 +565,6 @@ namespace HandBrake.ApplicationServices.Utilities return "m4v"; case OutputFormat.Mkv: return "mkv"; - case OutputFormat.X265: - return "x265"; } } diff --git a/win/CS/HandBrake.ApplicationServices/Utilities/InteropModelCreator.cs b/win/CS/HandBrake.ApplicationServices/Utilities/InteropModelCreator.cs index a4aacac7f..5ff4924eb 100644 --- a/win/CS/HandBrake.ApplicationServices/Utilities/InteropModelCreator.cs +++ b/win/CS/HandBrake.ApplicationServices/Utilities/InteropModelCreator.cs @@ -135,9 +135,6 @@ namespace HandBrake.ApplicationServices.Utilities case OutputFormat.Mkv: profile.ContainerName = "av_mkv"; // TODO make part of enum. break; - case OutputFormat.X265: - profile.ContainerName = "x265"; // TODO make part of enum. - break; } // Picture Settings diff --git a/win/CS/HandBrakeWPF/Converters/Video/VideoEncoderConverter.cs b/win/CS/HandBrakeWPF/Converters/Video/VideoEncoderConverter.cs index 32b68e9fb..8e2f1d379 100644 --- a/win/CS/HandBrakeWPF/Converters/Video/VideoEncoderConverter.cs +++ b/win/CS/HandBrakeWPF/Converters/Video/VideoEncoderConverter.cs @@ -60,17 +60,6 @@ namespace HandBrakeWPF.Converters.Video encoders.Remove(VideoEncoder.QuickSync); } - if (task != null && task.OutputFormat != OutputFormat.X265) - { - encoders.Remove(VideoEncoder.X265); - } - - if (task != null && task.OutputFormat == OutputFormat.X265) - { - encoders.Clear(); - encoders.Add(VideoEncoder.X265); - } - return EnumHelper.GetEnumDisplayValuesSubset(encoders); } diff --git a/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs index 4dcf9bc67..08f009bd4 100644 --- a/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs +++ b/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs @@ -615,7 +615,7 @@ namespace HandBrakeWPF.ViewModels { return new List { - OutputFormat.Mp4, OutputFormat.Mkv, OutputFormat.X265 + OutputFormat.Mp4, OutputFormat.Mkv }; } } @@ -654,9 +654,6 @@ namespace HandBrakeWPF.ViewModels case ".m4v": this.SelectedOutputFormat = OutputFormat.Mp4; break; - case ".x265": - this.SelectedOutputFormat = OutputFormat.X265; - break; } } } @@ -1473,9 +1470,6 @@ namespace HandBrakeWPF.ViewModels case ".m4v": this.SelectedOutputFormat = OutputFormat.M4V; break; - case ".x265": - this.SelectedOutputFormat = OutputFormat.X265; - break; } this.NotifyOfPropertyChange(() => this.CurrentTask); -- 2.40.0