WinGui: Make the AVFormat Muxers default.

git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@5646 b64f7644-9d1e-0410-96f1-a4d463321fa5

diff --git a/win/CS/HandBrake.ApplicationServices/Model/EncodeTask.cs b/win/CS/HandBrake.ApplicationServices/Model/EncodeTask.cs
index 0ea8dd8ba53e5f7e05c17857ae81488a26ed223d..9e57ef03a96e9eaaa2f35b2b08bee2e60b8fcd8f 100644 (file)
--- a/win/CS/HandBrake.ApplicationServices/Model/EncodeTask.cs
+++ b/win/CS/HandBrake.ApplicationServices/Model/EncodeTask.cs
@@ -467,7 +467,7 @@ namespace HandBrake.ApplicationServices.Model
         {\r
             get\r
             {\r
-                if (this.OutputFormat == OutputFormat.M4V || this.OutputFormat == OutputFormat.Mp4)\r
+                if (this.OutputFormat == OutputFormat.M4V || this.OutputFormat == OutputFormat.Mp4 || this.OutputFormat == OutputFormat.av_mp4)\r
                 {\r
                     bool audio = this.AudioTracks.Any(item => item.Encoder == AudioEncoder.Ac3Passthrough || \r
                         item.Encoder == AudioEncoder.Ac3 || item.Encoder == AudioEncoder.DtsPassthrough || item.Encoder == AudioEncoder.Passthrough);\r

diff --git a/win/CS/HandBrake.ApplicationServices/Model/Encoding/OutputFormat.cs b/win/CS/HandBrake.ApplicationServices/Model/Encoding/OutputFormat.cs
index 8134182648dafead456bbdfbd79a58c2e2dc2229..2303e786dd44cbf8fdf9c952f73a77ca21c8deb6 100644 (file)
--- a/win/CS/HandBrake.ApplicationServices/Model/Encoding/OutputFormat.cs
+++ b/win/CS/HandBrake.ApplicationServices/Model/Encoding/OutputFormat.cs
@@ -23,6 +23,12 @@ namespace HandBrake.ApplicationServices.Model.Encoding
         M4V,\r
 \r
         [Description("MKV")]\r
-        Mkv\r
+        Mkv,\r
+\r
+        [Description("av_mkv")]\r
+        av_mkv,\r
+\r
+        [Description("av_mp4")]\r
+        av_mp4,\r
     }\r
 }\r

diff --git a/win/CS/HandBrake.ApplicationServices/Utilities/Converters.cs b/win/CS/HandBrake.ApplicationServices/Utilities/Converters.cs
index 641380e9cc194b7f5d5e52e5f0190f1f9a5eccbd..b290530dd8ec26761cf08e217cb6c421fab5d742 100644 (file)
--- a/win/CS/HandBrake.ApplicationServices/Utilities/Converters.cs
+++ b/win/CS/HandBrake.ApplicationServices/Utilities/Converters.cs
@@ -447,11 +447,11 @@ namespace HandBrake.ApplicationServices.Utilities
             switch (format.ToLower())\r
             {\r
                 default:\r
-                    return OutputFormat.Mp4;\r
+                    return OutputFormat.av_mp4;\r
                 case "m4v":\r
-                    return OutputFormat.M4V;\r
+                    return OutputFormat.av_mp4;\r
                 case "mkv":\r
-                    return OutputFormat.Mkv;\r
+                    return OutputFormat.av_mkv;\r
             }\r
         }\r
 \r
@@ -470,9 +470,9 @@ namespace HandBrake.ApplicationServices.Utilities
             {\r
                 default:\r
                     return "mp4";\r
-                case OutputFormat.M4V:\r
+                case OutputFormat.av_mp4:\r
                     return "m4v";\r
-                case OutputFormat.Mkv:\r
+                case OutputFormat.av_mkv:\r
                     return "mkv";\r
             }\r
         }\r

diff --git a/win/CS/HandBrakeWPF/Helpers/AutoNameHelper.cs b/win/CS/HandBrakeWPF/Helpers/AutoNameHelper.cs
index 4077480273a3a38b7feeffc21d68962424eef2df..c96d86c352064235ed1544bb81d460792da6d08e 100644 (file)
--- a/win/CS/HandBrakeWPF/Helpers/AutoNameHelper.cs
+++ b/win/CS/HandBrakeWPF/Helpers/AutoNameHelper.cs
@@ -96,7 +96,7 @@ namespace HandBrakeWPF.Helpers
                 /*\r
                  * File Extension\r
                  */\r
-                if (task.OutputFormat == OutputFormat.Mp4 || task.OutputFormat == OutputFormat.M4V)\r
+                if (task.OutputFormat == OutputFormat.Mp4 || task.OutputFormat == OutputFormat.M4V || task.OutputFormat == OutputFormat.av_mp4)\r
                 {\r
                     switch (userSettingService.GetUserSetting<int>(UserSettingConstants.UseM4v))\r
                     {\r

diff --git a/win/CS/HandBrakeWPF/ViewModels/AudioViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/AudioViewModel.cs
index ee9b09f31dc429506798e89d92584830ea9aaa78..800f7e18047bfe313be91d78120ae8373c3f0cdf 100644 (file)
--- a/win/CS/HandBrakeWPF/ViewModels/AudioViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/AudioViewModel.cs
@@ -166,7 +166,7 @@ namespace HandBrakeWPF.ViewModels
         {\r
             this.NotifyOfPropertyChange(() => this.Task);\r
 \r
-            if (Task.OutputFormat == OutputFormat.Mp4)\r
+            if (Task.OutputFormat == OutputFormat.Mp4 || this.Task.OutputFormat == OutputFormat.av_mp4)\r
             {\r
                 foreach (AudioTrack track in this.Task.AudioTracks.Where(track => track.Encoder == AudioEncoder.ffflac || track.Encoder == AudioEncoder.Vorbis))\r
                 {\r

diff --git a/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs
index bb9dbed9a781444c0472fc38b9c38b2ff3e41329..74f11abf2e27a95d483e1b3a59092e73df0b454a 100644 (file)
--- a/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs
@@ -622,7 +622,7 @@ namespace HandBrakeWPF.ViewModels
             {\r
                 return new List<OutputFormat>\r
                     {\r
-                        OutputFormat.Mp4, OutputFormat.Mkv\r
+                         OutputFormat.av_mp4, OutputFormat.av_mkv, OutputFormat.Mp4, OutputFormat.Mkv\r
                     };\r
             }\r
         }\r
@@ -1435,13 +1435,13 @@ namespace HandBrakeWPF.ViewModels
                 switch (Path.GetExtension(saveFileDialog.FileName))\r
                 {\r
                     case ".mkv":\r
-                        this.SelectedOutputFormat = OutputFormat.Mkv;\r
+                        this.SelectedOutputFormat = OutputFormat.av_mkv;\r
                         break;\r
                     case ".mp4":\r
-                        this.SelectedOutputFormat = OutputFormat.Mp4;\r
+                        this.SelectedOutputFormat = OutputFormat.av_mp4;\r
                         break;\r
                     case ".m4v":\r
-                        this.SelectedOutputFormat = OutputFormat.M4V;\r
+                        this.SelectedOutputFormat = OutputFormat.av_mp4;\r
                         break;\r
                 }\r
 \r

diff --git a/win/CS/HandBrakeWPF/ViewModels/SubtitlesViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/SubtitlesViewModel.cs
index feabc08f3e6cef36c25d0d4caff5b3f45cfb9ef8..8b93173a277f963d4618d1cbba5813de2fb6bed2 100644 (file)
--- a/win/CS/HandBrakeWPF/ViewModels/SubtitlesViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/SubtitlesViewModel.cs
@@ -385,7 +385,7 @@ namespace HandBrakeWPF.ViewModels
 \r
             if ((source.SubtitleType == SubtitleType.PGS || source.SubtitleType == SubtitleType.VobSub) &&\r
                 this.Task != null &&\r
-                (this.Task.OutputFormat == OutputFormat.Mp4 || this.Task.OutputFormat == OutputFormat.M4V))\r
+                (this.Task.OutputFormat == OutputFormat.Mp4 || this.Task.OutputFormat == OutputFormat.M4V || this.Task.OutputFormat == OutputFormat.av_mp4))\r
             {\r
                 this.SelectBurnedInTrack(track);\r
             }\r

diff --git a/win/CS/HandBrakeWPF/ViewModels/VideoViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/VideoViewModel.cs
index a59c9c32f418b4d4307e6dc26a465f53ea369f41..74c7a1f152305fe7de8afdea46d2bfcc9eae03e2 100644 (file)
--- a/win/CS/HandBrakeWPF/ViewModels/VideoViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/VideoViewModel.cs
@@ -852,7 +852,7 @@ namespace HandBrakeWPF.ViewModels
         {\r
             this.NotifyOfPropertyChange(() => this.Task);\r
 \r
-            if (Task.OutputFormat == OutputFormat.Mp4 && this.SelectedVideoEncoder == VideoEncoder.Theora)\r
+            if ((Task.OutputFormat == OutputFormat.Mp4 || Task.OutputFormat == OutputFormat.av_mp4) && this.SelectedVideoEncoder == VideoEncoder.Theora)\r
             {\r
                 this.SelectedVideoEncoder = VideoEncoder.X264;\r
             }\r