WinGui: Remove AV_MKV option. Now default for the build

git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@5885 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 2d1464cf5ce49a6c3bd2ee3e20d072a820572289..9323cc86296d8d318cef7d31425a87530b19db4d 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("av_mkv")]\r
-        av_mkv,\r
     }\r
 }\r

diff --git a/win/CS/HandBrake.ApplicationServices/Utilities/Converters.cs b/win/CS/HandBrake.ApplicationServices/Utilities/Converters.cs
index b3f46f8a190138a9734b3ba64815a8542aebb979..1c6b785bbfbcd6dd3d1b972bce4d0c75fa157c15 100644 (file)
--- a/win/CS/HandBrake.ApplicationServices/Utilities/Converters.cs
+++ b/win/CS/HandBrake.ApplicationServices/Utilities/Converters.cs
@@ -449,7 +449,7 @@ namespace HandBrake.ApplicationServices.Utilities
                 case "m4v":\r
                     return OutputFormat.Mp4;\r
                 case "mkv":\r
-                    return OutputFormat.av_mkv;\r
+                    return OutputFormat.Mkv;\r
             }\r
         }\r
 \r
@@ -470,7 +470,7 @@ namespace HandBrake.ApplicationServices.Utilities
                     return "mp4";\r
                 case OutputFormat.Mp4:\r
                     return "m4v";\r
-                case OutputFormat.av_mkv:\r
+                case OutputFormat.Mkv:\r
                     return "mkv";\r
             }\r
         }\r

diff --git a/win/CS/HandBrakeWPF/Converters/Video/VideoEncoderConverter.cs b/win/CS/HandBrakeWPF/Converters/Video/VideoEncoderConverter.cs
index 594f2c91258df96983b3cfe23d85c646b3147bec..eecb258905db52cd18bc912df7b29cdcf6af9ad7 100644 (file)
--- a/win/CS/HandBrakeWPF/Converters/Video/VideoEncoderConverter.cs
+++ b/win/CS/HandBrakeWPF/Converters/Video/VideoEncoderConverter.cs
@@ -53,7 +53,7 @@ namespace HandBrakeWPF.Converters.Video
                 List<VideoEncoder> encoders = EnumHelper<VideoEncoder>.GetEnumList().ToList();\r
                 EncodeTask task = values[1] as EncodeTask;\r
 \r
-                if (task != null && task.OutputFormat != OutputFormat.Mkv && task.OutputFormat != OutputFormat.av_mkv)\r
+                if (task != null && task.OutputFormat != OutputFormat.Mkv)\r
                 {\r
                     encoders.Remove(VideoEncoder.Theora);\r
                 }\r

diff --git a/win/CS/HandBrakeWPF/Helpers/AutoNameHelper.cs b/win/CS/HandBrakeWPF/Helpers/AutoNameHelper.cs
index f0144d1ec2f5bf2355b07fce183aa7ed7d4fccfe..8c4032466d2994d707bcfa7174c24e00c7d445a7 100644 (file)
--- a/win/CS/HandBrakeWPF/Helpers/AutoNameHelper.cs
+++ b/win/CS/HandBrakeWPF/Helpers/AutoNameHelper.cs
@@ -122,7 +122,7 @@ namespace HandBrakeWPF.Helpers
                             break;\r
                     }\r
                 }\r
-                else if (task.OutputFormat == OutputFormat.Mkv || task.OutputFormat == OutputFormat.av_mkv)\r
+                else if (task.OutputFormat == OutputFormat.Mkv)\r
                     destinationFilename += ".mkv";\r
 \r
                 /*\r

diff --git a/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs
index 0a48377193e089ae961574b667f3e434bbb5d963..e4e938be7d61bf2a2ba0ab14385b1ed2ab572e35 100644 (file)
--- a/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs
@@ -621,7 +621,7 @@ namespace HandBrakeWPF.ViewModels
             {\r
                 return new List<OutputFormat>\r
                     {\r
-                         OutputFormat.Mp4, OutputFormat.av_mkv, OutputFormat.Mkv\r
+                         OutputFormat.Mp4, OutputFormat.Mkv\r
                     };\r
             }\r
         }\r
@@ -1407,7 +1407,7 @@ namespace HandBrakeWPF.ViewModels
                 switch (Path.GetExtension(saveFileDialog.FileName))\r
                 {\r
                     case ".mkv":\r
-                        this.SelectedOutputFormat = OutputFormat.av_mkv;\r
+                        this.SelectedOutputFormat = OutputFormat.Mkv;\r
                         break;\r
                     case ".mp4":\r
                         this.SelectedOutputFormat = OutputFormat.Mp4;\r

diff --git a/win/CS/HandBrakeWPF/Views/MainView.xaml b/win/CS/HandBrakeWPF/Views/MainView.xaml
index fde91bceff6b4781c91bca429a55ab3ca34ef0db..d1add8edf11865508ac7893f14102181e7230a3a 100644 (file)
--- a/win/CS/HandBrakeWPF/Views/MainView.xaml
+++ b/win/CS/HandBrakeWPF/Views/MainView.xaml
@@ -12,7 +12,7 @@
         Micro:Message.Attach="[Event Loaded] = [Action Load]"\r
         SnapsToDevicePixels="True"\r
         UseLayoutRounding="True"\r
-        >\r
+       >\r
 \r
     <i:Interaction.Triggers>\r
         <i:EventTrigger EventName="Drop">\r
@@ -213,7 +213,7 @@
                                 <Setter Property="ItemsSource" Value="{Binding Children}" />\r
                                 <Setter Property="InputGestureText" Value="{Binding InputGestureText}" />\r
                                 <Setter Property="Tag" Value="{Binding}" />\r
-                                \r
+\r
                                 <Style.Triggers>\r
                                     <DataTrigger Binding="{Binding Path=IsDrive}" Value="true">\r
                                         <Setter Property="Icon" Value="{StaticResource Disc}"/>\r