diff options
| author | sr55 <[email protected]> | 2011-06-11 17:24:43 +0000 |
|---|---|---|
| committer | sr55 <[email protected]> | 2011-06-11 17:24:43 +0000 |
| commit | 708c792ed6f40ce4a46af0e95dec32798e460570 (patch) | |
| tree | 8ccd96aa3fcaa1bef7e8fe49651cd1b0f78208bf /win/CS/Controls | |
| parent | c2d584cfe459995bcbe73952581a89caa0be6e07 (diff) | |
WinGui: Added support for the new ffmpeg aac encoder.
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@4041 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'win/CS/Controls')
| -rw-r--r-- | win/CS/Controls/AudioPanel.Designer.cs | 1 | ||||
| -rw-r--r-- | win/CS/Controls/AudioPanel.cs | 5 | ||||
| -rw-r--r-- | win/CS/Controls/AudioPanel.resx | 3 |
3 files changed, 5 insertions, 4 deletions
diff --git a/win/CS/Controls/AudioPanel.Designer.cs b/win/CS/Controls/AudioPanel.Designer.cs index 368cbe679..9c7e37c5e 100644 --- a/win/CS/Controls/AudioPanel.Designer.cs +++ b/win/CS/Controls/AudioPanel.Designer.cs @@ -151,6 +151,7 @@ namespace Handbrake.Controls this.drp_audioEncoder.FormattingEnabled = true;
this.drp_audioEncoder.Items.AddRange(new object[] {
"AAC (faac)",
+ "AAC (ffmpeg)",
"MP3 (lame)",
"Vorbis (vorbis)",
"AC3 Passthru",
diff --git a/win/CS/Controls/AudioPanel.cs b/win/CS/Controls/AudioPanel.cs index 66b25c5b0..d68650ad7 100644 --- a/win/CS/Controls/AudioPanel.cs +++ b/win/CS/Controls/AudioPanel.cs @@ -122,6 +122,7 @@ namespace Handbrake.Controls drp_audioEncoder.Items.Clear();
drp_audioEncoder.Items.Add(EnumHelper<AudioEncoder>.GetDescription(AudioEncoder.Faac));
+ drp_audioEncoder.Items.Add(EnumHelper<AudioEncoder>.GetDescription(AudioEncoder.ffaac));
drp_audioEncoder.Items.Add(EnumHelper<AudioEncoder>.GetDescription(AudioEncoder.Lame));
drp_audioEncoder.Items.Add(EnumHelper<AudioEncoder>.GetDescription(AudioEncoder.Ac3Passthrough));
drp_audioEncoder.Items.Add(EnumHelper<AudioEncoder>.GetDescription(AudioEncoder.Ac3));
@@ -737,9 +738,10 @@ namespace Handbrake.Controls switch (drp_audioEncoder.Text)
{
case "AAC (faac)":
+ case "AAC (ffmpeg)":
max = drp_audioMix.Text.Contains("6 Channel") ? 768 : 320;
defaultRate = "160";
- break;
+ break;
case "MP3 (lame)":
max = 320;
defaultRate = "160";
@@ -821,6 +823,7 @@ namespace Handbrake.Controls switch (drp_audioEncoder.Text)
{
case "AAC (faac)":
+ case "AAC (ffmpeg)":
drp_audioMix.Items.Remove(AC3Passthru);
drp_audioMix.Items.Remove(DTSPassthru);
drp_audioMix.SelectedItem = currentMixdown ?? "Dolby Pro Logic II";
diff --git a/win/CS/Controls/AudioPanel.resx b/win/CS/Controls/AudioPanel.resx index 322973989..f6e59c9fa 100644 --- a/win/CS/Controls/AudioPanel.resx +++ b/win/CS/Controls/AudioPanel.resx @@ -147,9 +147,6 @@ <metadata name="Gain.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
- <metadata name="ToolTips.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
- <value>330, 16</value>
- </metadata>
<metadata name="AddTrackMenu.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>427, 16</value>
</metadata>
|