WinGui: Remove the AV_MP4 option so we now only have the AV Format Muxer as "MP4...

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

diff --git a/win/CS/HandBrake.ApplicationServices/Factories/PlistPresetFactory.cs b/win/CS/HandBrake.ApplicationServices/Factories/PlistPresetFactory.cs
index 488f1b9b6e936c952e7261632aa850281d011cd5..983af2e7ad8c22815d793591dce31cebd4d79722 100644 (file)
--- a/win/CS/HandBrake.ApplicationServices/Factories/PlistPresetFactory.cs
+++ b/win/CS/HandBrake.ApplicationServices/Factories/PlistPresetFactory.cs
@@ -103,9 +103,6 @@ namespace HandBrake.ApplicationServices.Factories
                 case "Mp4HttpOptimize":\r
                     preset.Task.OptimizeMP4 = kvp.Value == 1;\r
                     break;\r
-                case "Mp4LargeFile":\r
-                    preset.Task.LargeFile = kvp.Value == 1;\r
-                    break;\r
                 case "Mp4iPodCompatible":\r
                     preset.Task.IPod5GSupport = kvp.Value == 1;\r
                     break;\r

diff --git a/win/CS/HandBrake.ApplicationServices/Model/EncodeTask.cs b/win/CS/HandBrake.ApplicationServices/Model/EncodeTask.cs
index 87ddadd430af2d1154ff762883ab3cf2bb8377ff..a9969287327b2d8168def7c3968fc794b70bbb7b 100644 (file)
--- a/win/CS/HandBrake.ApplicationServices/Model/EncodeTask.cs
+++ b/win/CS/HandBrake.ApplicationServices/Model/EncodeTask.cs
@@ -100,7 +100,6 @@ namespace HandBrake.ApplicationServices.Model
             this.IncludeChapterMarkers = task.IncludeChapterMarkers;\r
             this.IPod5GSupport = task.IPod5GSupport;\r
             this.KeepDisplayAspect = task.KeepDisplayAspect;\r
-            this.LargeFile = task.LargeFile;\r
             this.MaxHeight = task.MaxHeight;\r
             this.MaxWidth = task.MaxWidth;\r
             this.Modulus = task.Modulus;\r
@@ -190,11 +189,6 @@ namespace HandBrake.ApplicationServices.Model
         /// </summary>\r
         public OutputFormat OutputFormat { get; set; }\r
 \r
-        /// <summary>\r
-        /// Gets or sets a value indicating whether LargeFile.\r
-        /// </summary>\r
-        public bool LargeFile { get; set; }\r
-\r
         /// <summary>\r
         /// Gets or sets a value indicating whether Optimize.\r
         /// </summary>\r
@@ -474,7 +468,7 @@ namespace HandBrake.ApplicationServices.Model
         {\r
             get\r
             {\r
-                if (this.OutputFormat == OutputFormat.M4V || this.OutputFormat == OutputFormat.Mp4 || this.OutputFormat == OutputFormat.av_mp4)\r
+                if (this.OutputFormat == OutputFormat.M4V || this.OutputFormat == OutputFormat.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/AudioTrack.cs b/win/CS/HandBrake.ApplicationServices/Model/Encoding/AudioTrack.cs
index 3cab263dee7ed44400a6cb022c0ff5ab9ff56d35..ae0b66974c16f7449463fc53711a7b7b955f3a57 100644 (file)
--- a/win/CS/HandBrake.ApplicationServices/Model/Encoding/AudioTrack.cs
+++ b/win/CS/HandBrake.ApplicationServices/Model/Encoding/AudioTrack.cs
@@ -63,6 +63,8 @@ namespace HandBrake.ApplicationServices.Model.Encoding
         [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]\r
         private Audio scannedTrack;\r
 \r
+        private bool isDefault;\r
+\r
         #endregion\r
 \r
         #region Constructors and Destructors\r
@@ -181,6 +183,21 @@ namespace HandBrake.ApplicationServices.Model.Encoding
             }\r
         }\r
 \r
+        /// <summary>\r
+        /// Gets or sets a value indicating whether is default.\r
+        /// </summary>\r
+        public bool IsDefault\r
+        {\r
+            get\r
+            {\r
+                return this.isDefault;\r
+            }\r
+            set\r
+            {\r
+                this.isDefault = value;\r
+            }\r
+        }\r
+\r
         /// <summary>\r
         ///   Gets or sets Audio Encoder\r
         /// </summary>\r

diff --git a/win/CS/HandBrake.ApplicationServices/Model/Encoding/OutputFormat.cs b/win/CS/HandBrake.ApplicationServices/Model/Encoding/OutputFormat.cs
index 2303e786dd44cbf8fdf9c952f73a77ca21c8deb6..2d1464cf5ce49a6c3bd2ee3e20d072a820572289 100644 (file)
--- a/win/CS/HandBrake.ApplicationServices/Model/Encoding/OutputFormat.cs
+++ b/win/CS/HandBrake.ApplicationServices/Model/Encoding/OutputFormat.cs
@@ -27,8 +27,5 @@ namespace HandBrake.ApplicationServices.Model.Encoding
 \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 4e48c4f0f4d45a0a212daeb1a11c01497266eb9c..b3f46f8a190138a9734b3ba64815a8542aebb979 100644 (file)
--- a/win/CS/HandBrake.ApplicationServices/Utilities/Converters.cs
+++ b/win/CS/HandBrake.ApplicationServices/Utilities/Converters.cs
@@ -445,9 +445,9 @@ namespace HandBrake.ApplicationServices.Utilities
             switch (format.ToLower())\r
             {\r
                 default:\r
-                    return OutputFormat.av_mp4;\r
+                    return OutputFormat.Mp4;\r
                 case "m4v":\r
-                    return OutputFormat.av_mp4;\r
+                    return OutputFormat.Mp4;\r
                 case "mkv":\r
                     return OutputFormat.av_mkv;\r
             }\r
@@ -468,7 +468,7 @@ namespace HandBrake.ApplicationServices.Utilities
             {\r
                 default:\r
                     return "mp4";\r
-                case OutputFormat.av_mp4:\r
+                case OutputFormat.Mp4:\r
                     return "m4v";\r
                 case OutputFormat.av_mkv:\r
                     return "mkv";\r

diff --git a/win/CS/HandBrake.ApplicationServices/Utilities/InteropModelCreator.cs b/win/CS/HandBrake.ApplicationServices/Utilities/InteropModelCreator.cs
index d5bcb930e69790e42b0be3bcf9a5d3d576203528..b6a50485f35ecda2148e2de0711fcb7b8c0a5bd4 100644 (file)
--- a/win/CS/HandBrake.ApplicationServices/Utilities/InteropModelCreator.cs
+++ b/win/CS/HandBrake.ApplicationServices/Utilities/InteropModelCreator.cs
@@ -99,7 +99,6 @@ namespace HandBrake.ApplicationServices.Utilities
             profile.IPod5GSupport = work.IPod5GSupport;\r
             profile.IncludeChapterMarkers = work.IncludeChapterMarkers;\r
             profile.KeepDisplayAspect = work.KeepDisplayAspect;\r
-            profile.LargeFile = work.LargeFile;\r
             profile.MaxHeight = work.MaxHeight.HasValue ? work.MaxHeight.Value : 0;\r
             profile.MaxWidth = work.MaxWidth.HasValue ? work.MaxWidth.Value : 0;\r
             profile.Modulus = work.Modulus.HasValue ? work.Modulus.Value : 16;\r

diff --git a/win/CS/HandBrake.ApplicationServices/Utilities/PlistUtility.cs b/win/CS/HandBrake.ApplicationServices/Utilities/PlistUtility.cs
index 420717dfa0e736520116d75655c38bcd5a5770a3..f034cb68243985e51d69f51a9a2be78c3fce3de8 100644 (file)
--- a/win/CS/HandBrake.ApplicationServices/Utilities/PlistUtility.cs
+++ b/win/CS/HandBrake.ApplicationServices/Utilities/PlistUtility.cs
@@ -139,7 +139,6 @@ namespace HandBrake.ApplicationServices.Utilities
             AddEncodeElement(xmlWriter, "FileFormat", "string", (parsed.OutputFormat == OutputFormat.Mp4 || parsed.OutputFormat == OutputFormat.M4V) ? "MP4 file" : "MKV file");\r
             AddBooleanElement(xmlWriter, "Folder", false);\r
             AddEncodeElement(xmlWriter, "Mp4HttpOptimize", "integer", parsed.OptimizeMP4 ? "1" : "0");\r
-            AddEncodeElement(xmlWriter, "Mp4LargeFile", "integer", parsed.LargeFile ? "1" : "0");\r
             AddEncodeElement(xmlWriter, "Mp4iPodCompatible", "integer", parsed.IPod5GSupport ? "1" : "0");\r
             AddEncodeElement(xmlWriter, "PictureAutoCrop", "integer", "1");\r
             AddEncodeElement(xmlWriter, "PictureBottomCrop", "integer", parsed.Cropping.Bottom.ToString());\r

diff --git a/win/CS/HandBrake.ApplicationServices/Utilities/QueryGeneratorUtility.cs b/win/CS/HandBrake.ApplicationServices/Utilities/QueryGeneratorUtility.cs
index af0e086f96696ca36b416460bb551f6ed439b5f0..9e38d15d9256e5e98bf4b884fbc70873757c3db6 100644 (file)
--- a/win/CS/HandBrake.ApplicationServices/Utilities/QueryGeneratorUtility.cs
+++ b/win/CS/HandBrake.ApplicationServices/Utilities/QueryGeneratorUtility.cs
@@ -234,9 +234,6 @@ namespace HandBrake.ApplicationServices.Utilities
             query += string.Format(" -f {0} ", EnumHelper<Enum>.GetDescription(task.OutputFormat).ToLower());\r
 \r
             // These are output settings features\r
-            if (task.LargeFile)\r
-                query += " -4 ";\r
-\r
             if (task.IPod5GSupport)\r
                 query += " -I ";\r
 \r

diff --git a/win/CS/HandBrake.ApplicationServices/Utilities/QueryParserUtility.cs b/win/CS/HandBrake.ApplicationServices/Utilities/QueryParserUtility.cs
index eae37e2b5ba14598dd2666e0a860f55044df9e1e..db92b3504761534b2a4bc788b1bf768d2c96d111 100644 (file)
--- a/win/CS/HandBrake.ApplicationServices/Utilities/QueryParserUtility.cs
+++ b/win/CS/HandBrake.ApplicationServices/Utilities/QueryParserUtility.cs
@@ -152,7 +152,6 @@ namespace HandBrake.ApplicationServices.Utilities
                 {\r
                     parsed.OutputFormat = Converters.GetFileFormat(format.Groups[1].ToString());\r
                 }\r
-                parsed.LargeFile = largerMp4.Success;\r
                 parsed.IPod5GSupport = ipodAtom.Success;\r
                 parsed.OptimizeMP4 = optimizeMP4.Success;\r
 \r

diff --git a/win/CS/HandBrakeWPF/Helpers/AutoNameHelper.cs b/win/CS/HandBrakeWPF/Helpers/AutoNameHelper.cs
index cfe1714a01f739d9fbb2bd11b0476df586502fa8..f0144d1ec2f5bf2355b07fce183aa7ed7d4fccfe 100644 (file)
--- a/win/CS/HandBrakeWPF/Helpers/AutoNameHelper.cs
+++ b/win/CS/HandBrakeWPF/Helpers/AutoNameHelper.cs
@@ -107,7 +107,7 @@ namespace HandBrakeWPF.Helpers
                 /*\r
                  * File Extension\r
                  */\r
-                if (task.OutputFormat == OutputFormat.Mp4 || task.OutputFormat == OutputFormat.M4V || task.OutputFormat == OutputFormat.av_mp4)\r
+                if (task.OutputFormat == OutputFormat.Mp4 || task.OutputFormat == OutputFormat.M4V)\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 242eca68ecd775edb6464c6a461818f1d38e2212..61c2d4a2279822d03b29d7c4d0c1577a75e9b7f3 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 || this.Task.OutputFormat == OutputFormat.av_mp4)\r
+            if (Task.OutputFormat == OutputFormat.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 dce7e524bc378ade5ce8f2067b671d498f8dede1..b3be2b60eea01666b2e495ccfb7d17986fe07756 100644 (file)
--- 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)\r
                 {\r
                     // Main Window Settings\r
-                    this.CurrentTask.LargeFile = selectedPreset.Task.LargeFile;\r
                     this.CurrentTask.OptimizeMP4 = selectedPreset.Task.OptimizeMP4;\r
                     this.CurrentTask.IPod5GSupport = selectedPreset.Task.IPod5GSupport;\r
                     this.SelectedOutputFormat = selectedPreset.Task.OutputFormat;\r
@@ -622,7 +621,7 @@ namespace HandBrakeWPF.ViewModels
             {\r
                 return new List<OutputFormat>\r
                     {\r
-                         OutputFormat.av_mp4, OutputFormat.av_mkv, OutputFormat.Mp4, OutputFormat.Mkv\r
+                         OutputFormat.Mp4, OutputFormat.av_mkv, OutputFormat.Mkv\r
                     };\r
             }\r
         }\r
@@ -1419,10 +1418,10 @@ namespace HandBrakeWPF.ViewModels
                         this.SelectedOutputFormat = OutputFormat.av_mkv;\r
                         break;\r
                     case ".mp4":\r
-                        this.SelectedOutputFormat = OutputFormat.av_mp4;\r
+                        this.SelectedOutputFormat = OutputFormat.Mp4;\r
                         break;\r
                     case ".m4v":\r
-                        this.SelectedOutputFormat = OutputFormat.av_mp4;\r
+                        this.SelectedOutputFormat = OutputFormat.M4V;\r
                         break;\r
                 }\r
 \r
@@ -1727,7 +1726,6 @@ namespace HandBrakeWPF.ViewModels
             if (newExtension == ".mkv")\r
             {\r
                 this.IsMkv = true;\r
-                this.CurrentTask.LargeFile = false;\r
                 this.CurrentTask.OptimizeMP4 = false;\r
                 this.CurrentTask.IPod5GSupport = false;\r
             }\r

diff --git a/win/CS/HandBrakeWPF/ViewModels/SubtitlesViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/SubtitlesViewModel.cs
index 8b93173a277f963d4618d1cbba5813de2fb6bed2..feabc08f3e6cef36c25d0d4caff5b3f45cfb9ef8 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 || this.Task.OutputFormat == OutputFormat.av_mp4))\r
+                (this.Task.OutputFormat == OutputFormat.Mp4 || this.Task.OutputFormat == OutputFormat.M4V))\r
             {\r
                 this.SelectBurnedInTrack(track);\r
             }\r

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

diff --git a/win/CS/HandBrakeWPF/Views/MainView.xaml b/win/CS/HandBrakeWPF/Views/MainView.xaml
index cb1fa7582372c7c8a0d9edec0f42e1ec5818b0db..4f7ab8ce0d0609ac4081b74d403e6729b4179fea 100644 (file)
--- a/win/CS/HandBrakeWPF/Views/MainView.xaml
+++ b/win/CS/HandBrakeWPF/Views/MainView.xaml
@@ -219,7 +219,7 @@
                                 <Setter Property="Tag" Value="{Binding}" />\r
                                 \r
                                 <Style.Triggers>\r
-                                    <DataTrigger Binding="{Binding Path=IsDisc}" Value="true">\r
+                                    <DataTrigger Binding="{Binding Path=IsDrive}" Value="true">\r
                                         <Setter Property="Icon" Value="{StaticResource Disc}"/>\r
                                     </DataTrigger>\r
                                     <DataTrigger Binding="{Binding Path=IsOpenFolder}" Value="true">\r
@@ -514,15 +514,6 @@
                               ItemsSource="{Binding OutputFormats}"\r
                               SelectedItem="{Binding SelectedOutputFormat}"\r
                               />\r
-                    <CheckBox Name="LargeFileMp4"\r
-                              Margin="8,0,0,0"\r
-                              VerticalAlignment="Center"\r
-                              Content="Large File Size"\r
-                              IsChecked="{Binding Path=CurrentTask.LargeFile}"\r
-                              Visibility="{Binding IsMkv,\r
-                                                   Converter={StaticResource boolToVisConverter},\r
-                                                   ConverterParameter=true}"\r
-                              />\r
                     <CheckBox Name="WebOptimized"\r
                               Margin="8,0,0,0"\r
                               VerticalAlignment="Center"\r