From: sr55 <sr55.hb@outlook.com>
Date: Sun, 2 Mar 2014 13:18:36 +0000 (+0000)
Subject: WinGui: Remove some last references to the faac encoder.
X-Git-Tag: 0.10.0~439
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e35800c8403286965e561638e76611c798cfef18;p=handbrake

WinGui: Remove some last references to the faac encoder.

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

diff --git a/win/CS/HandBrake.Interop/HandBrakeInterop/Converters/Converters.cs b/win/CS/HandBrake.Interop/HandBrakeInterop/Converters/Converters.cs
index 7a45d6334..a707e0eb5 100644
--- a/win/CS/HandBrake.Interop/HandBrakeInterop/Converters/Converters.cs
+++ b/win/CS/HandBrake.Interop/HandBrakeInterop/Converters/Converters.cs
@@ -87,7 +87,6 @@ namespace HandBrake.Interop.Converters
 				case NativeConstants.HB_ACODEC_LAME:
 				case NativeConstants.HB_ACODEC_MP3:
 					return AudioCodec.Mp3;
-				case NativeConstants.HB_ACODEC_FAAC:
 				case NativeConstants.HB_ACODEC_FFAAC:
 				case NativeConstants.HB_ACODEC_CA_AAC:
 				case NativeConstants.HB_ACODEC_CA_HAAC:
diff --git a/win/CS/HandBrake.Interop/HandBrakeInterop/HbLib/NativeConstants.cs b/win/CS/HandBrake.Interop/HandBrakeInterop/HbLib/NativeConstants.cs
index c3b7c28dc..45637e9a4 100644
--- a/win/CS/HandBrake.Interop/HandBrakeInterop/HbLib/NativeConstants.cs
+++ b/win/CS/HandBrake.Interop/HandBrakeInterop/HbLib/NativeConstants.cs
@@ -14,7 +14,6 @@ namespace HandBrake.Interop.HbLib
 	{
 		// Audio encoders
 		public const uint HB_ACODEC_MASK = 0x00FFFF00;
-		public const uint HB_ACODEC_FAAC = 0x00000100;
 		public const uint HB_ACODEC_LAME = 0x00000200;
 		public const uint HB_ACODEC_VORBIS = 0x00000400;
 		public const uint HB_ACODEC_AC3 = 0x00000800;
diff --git a/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/AudioEncoder.cs b/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/AudioEncoder.cs
index bc7b5bf20..6e6f5a138 100644
--- a/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/AudioEncoder.cs
+++ b/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/AudioEncoder.cs
@@ -18,10 +18,6 @@ namespace HandBrake.Interop.Model.Encoding
     /// </summary>
     public enum AudioEncoder
     {
-        [Display(Name = "AAC (faac)")]
-        [ShortName("faac")]
-        faac = 0,
-
         [Display(Name = "AAC (avcodec)")]
         [ShortName("av_aac")]
         ffaac,
diff --git a/win/CS/HandBrakeWPF/Converters/Audio/AudioEncoderConverter.cs b/win/CS/HandBrakeWPF/Converters/Audio/AudioEncoderConverter.cs
index 0b1c2258d..3c105bb26 100644
--- a/win/CS/HandBrakeWPF/Converters/Audio/AudioEncoderConverter.cs
+++ b/win/CS/HandBrakeWPF/Converters/Audio/AudioEncoderConverter.cs
@@ -51,8 +51,6 @@ namespace HandBrakeWPF.Converters.Audio
                 List<AudioEncoder> encoders = EnumHelper<AudioEncoder>.GetEnumList().ToList();
                 EncodeTask task = values[1] as EncodeTask;
 
-                encoders.Remove(AudioEncoder.faac);
-
                 if (task != null && task.OutputFormat != OutputFormat.Mkv)
                 {
                     encoders.Remove(AudioEncoder.Vorbis);