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

3 files changed, 18 insertions, 10 deletions

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,

     }

 }