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

diff --git a/win/CS/HandBrake.ApplicationServices/Model/Encoding/OutputFormat.cs b/win/CS/HandBrake.ApplicationServices/Model/Encoding/OutputFormat.cs
index 98116773f7053aa2936eb629c274a4a9b5fe1431..d083e853cda580d65a6cb1a137bcfeb71bd14773 100644 (file)
--- 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
 \r
         [Description("MKV")]\r
         Mkv,\r
-\r
-        [Description("X265")]\r
-        X265,\r
     }\r
 }\r

diff --git a/win/CS/HandBrake.ApplicationServices/Utilities/Converters.cs b/win/CS/HandBrake.ApplicationServices/Utilities/Converters.cs
index aa9842124bf24b0bc19e3c60a8fcdd484ff6df8f..ef5812a25158f62ee5357a9ef8ec3e4facc7802f 100644 (file)
--- 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;\r
                 case "mkv":\r
                     return OutputFormat.Mkv;\r
-                case "x265":\r
-                    return OutputFormat.X265;\r
             }\r
         }\r
 \r
@@ -567,8 +565,6 @@ namespace HandBrake.ApplicationServices.Utilities
                     return "m4v";\r
                 case OutputFormat.Mkv:\r
                     return "mkv";\r
-                case OutputFormat.X265:\r
-                    return "x265";\r
             }\r
         }\r
 \r

diff --git a/win/CS/HandBrake.ApplicationServices/Utilities/InteropModelCreator.cs b/win/CS/HandBrake.ApplicationServices/Utilities/InteropModelCreator.cs
index a4aacac7fa76d0c720a1c3ec49c9e1c5bf2d46d5..5ff4924ebff542207a19ba2a3a0971f06ca975cb 100644 (file)
--- 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:\r
                     profile.ContainerName = "av_mkv"; // TODO make part of enum.\r
                     break;\r
-                case OutputFormat.X265:\r
-                    profile.ContainerName = "x265"; // TODO make part of enum.\r
-                    break;\r
             }\r
 \r
             // Picture Settings\r

diff --git a/win/CS/HandBrakeWPF/Converters/Video/VideoEncoderConverter.cs b/win/CS/HandBrakeWPF/Converters/Video/VideoEncoderConverter.cs
index 32b68e9fbae780c95054218a400d4dbb3db30b84..8e2f1d3795a5771cfa44f4ede31b258f9c0249d0 100644 (file)
--- 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);\r
                 }\r
 \r
-                if (task != null && task.OutputFormat != OutputFormat.X265)\r
-                {\r
-                    encoders.Remove(VideoEncoder.X265);\r
-                }\r
-\r
-                if (task != null && task.OutputFormat == OutputFormat.X265)\r
-                {\r
-                    encoders.Clear();\r
-                    encoders.Add(VideoEncoder.X265);\r
-                }\r
-\r
                 return EnumHelper<VideoEncoder>.GetEnumDisplayValuesSubset(encoders);\r
             }\r
 \r

diff --git a/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs
index 4dcf9bc67f6f73d2fac42297216a2637adbef795..08f009bd4896100a3fee73278c1627ee4eee7045 100644 (file)
--- a/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs
@@ -615,7 +615,7 @@ namespace HandBrakeWPF.ViewModels
             {\r
                 return new List<OutputFormat>\r
                     {\r
-                         OutputFormat.Mp4, OutputFormat.Mkv, OutputFormat.X265\r
+                         OutputFormat.Mp4, OutputFormat.Mkv\r
                     };\r
             }\r
         }\r
@@ -654,9 +654,6 @@ namespace HandBrakeWPF.ViewModels
                             case ".m4v":\r
                                 this.SelectedOutputFormat = OutputFormat.Mp4;\r
                                 break;\r
-                            case ".x265":\r
-                                this.SelectedOutputFormat = OutputFormat.X265;\r
-                                break;\r
                         }\r
                     }\r
                 }\r
@@ -1473,9 +1470,6 @@ namespace HandBrakeWPF.ViewModels
                         case ".m4v":\r
                             this.SelectedOutputFormat = OutputFormat.M4V;\r
                             break;\r
-                        case ".x265":\r
-                            this.SelectedOutputFormat = OutputFormat.X265;\r
-                            break;\r
                     }\r
 \r
                     this.NotifyOfPropertyChange(() => this.CurrentTask);\r