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 7a45d6334885d83352da62cd28ff6064557970b5..a707e0eb52e7bda0ff7014cb964b16c594863dd8 100644 (file)
--- 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:\r
                                case NativeConstants.HB_ACODEC_MP3:\r
                                        return AudioCodec.Mp3;\r
-                               case NativeConstants.HB_ACODEC_FAAC:\r
                                case NativeConstants.HB_ACODEC_FFAAC:\r
                                case NativeConstants.HB_ACODEC_CA_AAC:\r
                                case NativeConstants.HB_ACODEC_CA_HAAC:\r

diff --git a/win/CS/HandBrake.Interop/HandBrakeInterop/HbLib/NativeConstants.cs b/win/CS/HandBrake.Interop/HandBrakeInterop/HbLib/NativeConstants.cs
index c3b7c28dc3be07fe053c706073b7385ab3008880..45637e9a4ffc405a4752ace3a08cdf7e8eb79894 100644 (file)
--- 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
        {\r
                // Audio encoders\r
                public const uint HB_ACODEC_MASK = 0x00FFFF00;\r
-               public const uint HB_ACODEC_FAAC = 0x00000100;\r
                public const uint HB_ACODEC_LAME = 0x00000200;\r
                public const uint HB_ACODEC_VORBIS = 0x00000400;\r
                public const uint HB_ACODEC_AC3 = 0x00000800;\r

diff --git a/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/AudioEncoder.cs b/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/AudioEncoder.cs
index bc7b5bf208063c6c0ebc7548df8a625595c9575a..6e6f5a13823d019c5a4efe3650334b9b3c7142bd 100644 (file)
--- 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>\r
     public enum AudioEncoder\r
     {\r
-        [Display(Name = "AAC (faac)")]\r
-        [ShortName("faac")]\r
-        faac = 0,\r
-\r
         [Display(Name = "AAC (avcodec)")]\r
         [ShortName("av_aac")]\r
         ffaac,\r

diff --git a/win/CS/HandBrakeWPF/Converters/Audio/AudioEncoderConverter.cs b/win/CS/HandBrakeWPF/Converters/Audio/AudioEncoderConverter.cs
index 0b1c2258d457fde77c55c4af51dcdabad888988f..3c105bb2694c2aef1f53c4dc3429c5dc0ad2f932 100644 (file)
--- 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();\r
                 EncodeTask task = values[1] as EncodeTask;\r
 \r
-                encoders.Remove(AudioEncoder.faac);\r
-\r
                 if (task != null && task.OutputFormat != OutputFormat.Mkv)\r
                 {\r
                     encoders.Remove(AudioEncoder.Vorbis);\r