WinGui: Remove the AV_MP4 option so we now only have the AV Format Muxer as "MP4 File". The AV_MKV option will be removed at a later date.

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

15 files changed, 29 insertions, 41 deletions

diff --git a/win/CS/HandBrake.ApplicationServices/Factories/PlistPresetFactory.cs b/win/CS/HandBrake.ApplicationServices/Factories/PlistPresetFactory.cs
index 488f1b9b6..983af2e7a 100644
--- 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":

                     preset.Task.OptimizeMP4 = kvp.Value == 1;

                     break;

-                case "Mp4LargeFile":

-                    preset.Task.LargeFile = kvp.Value == 1;

-                    break;

                 case "Mp4iPodCompatible":

                     preset.Task.IPod5GSupport = kvp.Value == 1;

                     break;

diff --git a/win/CS/HandBrake.ApplicationServices/Model/EncodeTask.cs b/win/CS/HandBrake.ApplicationServices/Model/EncodeTask.cs
index 87ddadd43..a99692873 100644
--- 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;

             this.IPod5GSupport = task.IPod5GSupport;

             this.KeepDisplayAspect = task.KeepDisplayAspect;

-            this.LargeFile = task.LargeFile;

             this.MaxHeight = task.MaxHeight;

             this.MaxWidth = task.MaxWidth;

             this.Modulus = task.Modulus;

@@ -191,11 +190,6 @@ namespace HandBrake.ApplicationServices.Model
         public OutputFormat OutputFormat { get; set; }

 

         /// <summary>

-        /// Gets or sets a value indicating whether LargeFile.

-        /// </summary>

-        public bool LargeFile { get; set; }

-

-        /// <summary>

         /// Gets or sets a value indicating whether Optimize.

         /// </summary>

         public bool OptimizeMP4 { get; set; }

@@ -474,7 +468,7 @@ namespace HandBrake.ApplicationServices.Model
         {

             get

             {

-                if (this.OutputFormat == OutputFormat.M4V || this.OutputFormat == OutputFormat.Mp4 || this.OutputFormat == OutputFormat.av_mp4)

+                if (this.OutputFormat == OutputFormat.M4V || this.OutputFormat == OutputFormat.Mp4)

                 {

                     bool audio = this.AudioTracks.Any(item => item.Encoder == AudioEncoder.Ac3Passthrough || 

                         item.Encoder == AudioEncoder.Ac3 || item.Encoder == AudioEncoder.DtsPassthrough || item.Encoder == AudioEncoder.Passthrough);

diff --git a/win/CS/HandBrake.ApplicationServices/Model/Encoding/AudioTrack.cs b/win/CS/HandBrake.ApplicationServices/Model/Encoding/AudioTrack.cs
index 3cab263de..ae0b66974 100644
--- 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)]

         private Audio scannedTrack;

 

+        private bool isDefault;

+

         #endregion

 

         #region Constructors and Destructors

@@ -182,6 +184,21 @@ namespace HandBrake.ApplicationServices.Model.Encoding
         }

 

         /// <summary>

+        /// Gets or sets a value indicating whether is default.

+        /// </summary>

+        public bool IsDefault

+        {

+            get

+            {

+                return this.isDefault;

+            }

+            set

+            {

+                this.isDefault = value;

+            }

+        }

+

+        /// <summary>

         ///   Gets or sets Audio Encoder

         /// </summary>

         public AudioEncoder Encoder

diff --git a/win/CS/HandBrake.ApplicationServices/Model/Encoding/OutputFormat.cs b/win/CS/HandBrake.ApplicationServices/Model/Encoding/OutputFormat.cs
index 2303e786d..2d1464cf5 100644
--- 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
 

         [Description("av_mkv")]

         av_mkv,

-

-        [Description("av_mp4")]

-        av_mp4,

     }

 }

diff --git a/win/CS/HandBrake.ApplicationServices/Utilities/Converters.cs b/win/CS/HandBrake.ApplicationServices/Utilities/Converters.cs
index 4e48c4f0f..b3f46f8a1 100644
--- 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())

             {

                 default:

-                    return OutputFormat.av_mp4;

+                    return OutputFormat.Mp4;

                 case "m4v":

-                    return OutputFormat.av_mp4;

+                    return OutputFormat.Mp4;

                 case "mkv":

                     return OutputFormat.av_mkv;

             }

@@ -468,7 +468,7 @@ namespace HandBrake.ApplicationServices.Utilities
             {

                 default:

                     return "mp4";

-                case OutputFormat.av_mp4:

+                case OutputFormat.Mp4:

                     return "m4v";

                 case OutputFormat.av_mkv:

                     return "mkv";

diff --git a/win/CS/HandBrake.ApplicationServices/Utilities/InteropModelCreator.cs b/win/CS/HandBrake.ApplicationServices/Utilities/InteropModelCreator.cs
index d5bcb930e..b6a50485f 100644
--- 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;

             profile.IncludeChapterMarkers = work.IncludeChapterMarkers;

             profile.KeepDisplayAspect = work.KeepDisplayAspect;

-            profile.LargeFile = work.LargeFile;

             profile.MaxHeight = work.MaxHeight.HasValue ? work.MaxHeight.Value : 0;

             profile.MaxWidth = work.MaxWidth.HasValue ? work.MaxWidth.Value : 0;

             profile.Modulus = work.Modulus.HasValue ? work.Modulus.Value : 16;

diff --git a/win/CS/HandBrake.ApplicationServices/Utilities/PlistUtility.cs b/win/CS/HandBrake.ApplicationServices/Utilities/PlistUtility.cs
index 420717dfa..f034cb682 100644
--- 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");

             AddBooleanElement(xmlWriter, "Folder", false);

             AddEncodeElement(xmlWriter, "Mp4HttpOptimize", "integer", parsed.OptimizeMP4 ? "1" : "0");

-            AddEncodeElement(xmlWriter, "Mp4LargeFile", "integer", parsed.LargeFile ? "1" : "0");

             AddEncodeElement(xmlWriter, "Mp4iPodCompatible", "integer", parsed.IPod5GSupport ? "1" : "0");

             AddEncodeElement(xmlWriter, "PictureAutoCrop", "integer", "1");

             AddEncodeElement(xmlWriter, "PictureBottomCrop", "integer", parsed.Cropping.Bottom.ToString());

diff --git a/win/CS/HandBrake.ApplicationServices/Utilities/QueryGeneratorUtility.cs b/win/CS/HandBrake.ApplicationServices/Utilities/QueryGeneratorUtility.cs
index af0e086f9..9e38d15d9 100644
--- 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());

 

             // These are output settings features

-            if (task.LargeFile)

-                query += " -4 ";

-

             if (task.IPod5GSupport)

                 query += " -I ";

 

diff --git a/win/CS/HandBrake.ApplicationServices/Utilities/QueryParserUtility.cs b/win/CS/HandBrake.ApplicationServices/Utilities/QueryParserUtility.cs
index eae37e2b5..db92b3504 100644
--- a/win/CS/HandBrake.ApplicationServices/Utilities/QueryParserUtility.cs
+++ b/win/CS/HandBrake.ApplicationServices/Utilities/QueryParserUtility.cs
@@ -152,7 +152,6 @@ namespace HandBrake.ApplicationServices.Utilities
                 {

                     parsed.OutputFormat = Converters.GetFileFormat(format.Groups[1].ToString());

                 }

-                parsed.LargeFile = largerMp4.Success;

                 parsed.IPod5GSupport = ipodAtom.Success;

                 parsed.OptimizeMP4 = optimizeMP4.Success;

 

diff --git a/win/CS/HandBrakeWPF/Helpers/AutoNameHelper.cs b/win/CS/HandBrakeWPF/Helpers/AutoNameHelper.cs
index cfe1714a0..f0144d1ec 100644
--- a/win/CS/HandBrakeWPF/Helpers/AutoNameHelper.cs
+++ b/win/CS/HandBrakeWPF/Helpers/AutoNameHelper.cs
@@ -107,7 +107,7 @@ namespace HandBrakeWPF.Helpers
                 /*

                  * File Extension

                  */

-                if (task.OutputFormat == OutputFormat.Mp4 || task.OutputFormat == OutputFormat.M4V || task.OutputFormat == OutputFormat.av_mp4)

+                if (task.OutputFormat == OutputFormat.Mp4 || task.OutputFormat == OutputFormat.M4V)

                 {

                     switch (userSettingService.GetUserSetting<int>(UserSettingConstants.UseM4v))

                     {

diff --git a/win/CS/HandBrakeWPF/ViewModels/AudioViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/AudioViewModel.cs
index 242eca68e..61c2d4a22 100644
--- a/win/CS/HandBrakeWPF/ViewModels/AudioViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/AudioViewModel.cs
@@ -166,7 +166,7 @@ namespace HandBrakeWPF.ViewModels
         {

             this.NotifyOfPropertyChange(() => this.Task);

 

-            if (Task.OutputFormat == OutputFormat.Mp4 || this.Task.OutputFormat == OutputFormat.av_mp4)

+            if (Task.OutputFormat == OutputFormat.Mp4)

             {

                 foreach (AudioTrack track in this.Task.AudioTracks.Where(track => track.Encoder == AudioEncoder.ffflac || track.Encoder == AudioEncoder.Vorbis))

                 {

diff --git a/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs
index dce7e524b..b3be2b60e 100644
--- 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)

                 {

                     // Main Window Settings

-                    this.CurrentTask.LargeFile = selectedPreset.Task.LargeFile;

                     this.CurrentTask.OptimizeMP4 = selectedPreset.Task.OptimizeMP4;

                     this.CurrentTask.IPod5GSupport = selectedPreset.Task.IPod5GSupport;

                     this.SelectedOutputFormat = selectedPreset.Task.OutputFormat;

@@ -622,7 +621,7 @@ namespace HandBrakeWPF.ViewModels
             {

                 return new List<OutputFormat>

                     {

-                         OutputFormat.av_mp4, OutputFormat.av_mkv, OutputFormat.Mp4, OutputFormat.Mkv

+                         OutputFormat.Mp4, OutputFormat.av_mkv, OutputFormat.Mkv

                     };

             }

         }

@@ -1419,10 +1418,10 @@ namespace HandBrakeWPF.ViewModels
                         this.SelectedOutputFormat = OutputFormat.av_mkv;

                         break;

                     case ".mp4":

-                        this.SelectedOutputFormat = OutputFormat.av_mp4;

+                        this.SelectedOutputFormat = OutputFormat.Mp4;

                         break;

                     case ".m4v":

-                        this.SelectedOutputFormat = OutputFormat.av_mp4;

+                        this.SelectedOutputFormat = OutputFormat.M4V;

                         break;

                 }

 

@@ -1727,7 +1726,6 @@ namespace HandBrakeWPF.ViewModels
             if (newExtension == ".mkv")

             {

                 this.IsMkv = true;

-                this.CurrentTask.LargeFile = false;

                 this.CurrentTask.OptimizeMP4 = false;

                 this.CurrentTask.IPod5GSupport = false;

             }

diff --git a/win/CS/HandBrakeWPF/ViewModels/SubtitlesViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/SubtitlesViewModel.cs
index 8b93173a2..feabc08f3 100644
--- a/win/CS/HandBrakeWPF/ViewModels/SubtitlesViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/SubtitlesViewModel.cs
@@ -385,7 +385,7 @@ namespace HandBrakeWPF.ViewModels
 

             if ((source.SubtitleType == SubtitleType.PGS || source.SubtitleType == SubtitleType.VobSub) &&

                 this.Task != null &&

-                (this.Task.OutputFormat == OutputFormat.Mp4 || this.Task.OutputFormat == OutputFormat.M4V || this.Task.OutputFormat == OutputFormat.av_mp4))

+                (this.Task.OutputFormat == OutputFormat.Mp4 || this.Task.OutputFormat == OutputFormat.M4V))

             {

                 this.SelectBurnedInTrack(track);

             }

diff --git a/win/CS/HandBrakeWPF/ViewModels/VideoViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/VideoViewModel.cs
index bc07f57f5..e8702e60f 100644
--- a/win/CS/HandBrakeWPF/ViewModels/VideoViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/VideoViewModel.cs
@@ -1057,7 +1057,7 @@ namespace HandBrakeWPF.ViewModels
         {

             this.NotifyOfPropertyChange(() => this.Task);

 

-            if ((Task.OutputFormat == OutputFormat.Mp4 || Task.OutputFormat == OutputFormat.av_mp4) && this.SelectedVideoEncoder == VideoEncoder.Theora)

+            if ((Task.OutputFormat == OutputFormat.Mp4) && this.SelectedVideoEncoder == VideoEncoder.Theora)

             {

                 this.SelectedVideoEncoder = VideoEncoder.X264;

             }

diff --git a/win/CS/HandBrakeWPF/Views/MainView.xaml b/win/CS/HandBrakeWPF/Views/MainView.xaml
index cb1fa7582..4f7ab8ce0 100644
--- a/win/CS/HandBrakeWPF/Views/MainView.xaml
+++ b/win/CS/HandBrakeWPF/Views/MainView.xaml
@@ -219,7 +219,7 @@
                                 <Setter Property="Tag" Value="{Binding}" />

                                 

                                 <Style.Triggers>

-                                    <DataTrigger Binding="{Binding Path=IsDisc}" Value="true">

+                                    <DataTrigger Binding="{Binding Path=IsDrive}" Value="true">

                                         <Setter Property="Icon" Value="{StaticResource Disc}"/>

                                     </DataTrigger>

                                     <DataTrigger Binding="{Binding Path=IsOpenFolder}" Value="true">

@@ -514,15 +514,6 @@
                               ItemsSource="{Binding OutputFormats}"

                               SelectedItem="{Binding SelectedOutputFormat}"

                               />

-                    <CheckBox Name="LargeFileMp4"

-                              Margin="8,0,0,0"

-                              VerticalAlignment="Center"

-                              Content="Large File Size"

-                              IsChecked="{Binding Path=CurrentTask.LargeFile}"

-                              Visibility="{Binding IsMkv,

-                                                   Converter={StaticResource boolToVisConverter},

-                                                   ConverterParameter=true}"

-                              />

                     <CheckBox Name="WebOptimized"

                               Margin="8,0,0,0"

                               VerticalAlignment="Center"