diff options
| author | sr55 <[email protected]> | 2010-04-14 19:56:36 +0000 |
|---|---|---|
| committer | sr55 <[email protected]> | 2010-04-14 19:56:36 +0000 |
| commit | 75dabf6f175daeddcb517b57fb23ec54396d4e00 (patch) | |
| tree | 34e78b7f3fb7c0d5485ad0227c5dc5499d3b9d1b /win/C#/Controls | |
| parent | 11da8e43bff624ee1dea51c99969ca5f97e44723 (diff) | |
WinGui:
- Enabled higher bitrate audio for aac.
- Catch exceptions at application startup.
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@3224 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'win/C#/Controls')
| -rw-r--r-- | win/C#/Controls/AudioPanel.cs | 54 |
1 files changed, 42 insertions, 12 deletions
diff --git a/win/C#/Controls/AudioPanel.cs b/win/C#/Controls/AudioPanel.cs index 6b96940eb..7023d5642 100644 --- a/win/C#/Controls/AudioPanel.cs +++ b/win/C#/Controls/AudioPanel.cs @@ -419,6 +419,34 @@ namespace Handbrake.Controls }
}
+
+ private void SetBitrate2()
+ {
+ int max = 0;
+ switch (drp_audioEncoder.Text)
+ {
+ case "AAC (faac)":
+ max = drp_audioMix.Text.Contains("6 Channel") ? 384 : 160;
+ break;
+ case "MP3 (lame)":
+ max = 320;
+ break;
+ case "Vorbis (vorbis)":
+ max = 384;
+ break;
+ case "AC3 Passthru":
+ drp_audioBitrate.Items.Add("Auto");
+ drp_audioBitrate.SelectedItem = "Auto";
+ drp_audioSample.SelectedItem = "Auto";
+ break;
+ case "DTS Passthru":
+ drp_audioBitrate.Items.Add("Auto");
+ drp_audioBitrate.SelectedItem = "Auto";
+ drp_audioSample.SelectedItem = "Auto";
+ break;
+ }
+ }
+
private void SetBitrate()
{
int max = 0;
@@ -427,11 +455,14 @@ namespace Handbrake.Controls drp_audioBitrate.Items.Remove("224");
drp_audioBitrate.Items.Remove("256");
drp_audioBitrate.Items.Remove("320");
+ drp_audioBitrate.Items.Remove("384");
+ drp_audioBitrate.Items.Remove("448");
+ drp_audioBitrate.Items.Remove("768");
switch (drp_audioEncoder.Text)
{
case "AAC (faac)":
- max = drp_audioMix.Text.Contains("6 Channel") ? 384 : 160;
+ max = drp_audioMix.Text.Contains("6 Channel") ? 768 : 320;
break;
case "MP3 (lame)":
max = 320;
@@ -457,21 +488,20 @@ namespace Handbrake.Controls drp_audioBitrate.Items.Add("224");
drp_audioBitrate.Items.Add("256");
drp_audioBitrate.Items.Add("320");
- if (max == 384)
- drp_audioBitrate.Items.Add("384");
- else
- drp_audioBitrate.Items.Remove("384");
}
- else
+
+ if (max > 320)
+ {
+ drp_audioBitrate.Items.Add("384");
+ }
+
+ if (max == 768)
{
- drp_audioBitrate.Items.Remove("192");
- drp_audioBitrate.Items.Remove("224");
- drp_audioBitrate.Items.Remove("256");
- drp_audioBitrate.Items.Remove("320");
- drp_audioBitrate.Items.Remove("384");
+ drp_audioBitrate.Items.Add("448");
+ drp_audioBitrate.Items.Add("768");
}
- if (drp_audioBitrate.SelectedItem == null)
+ if (drp_audioBitrate.SelectedItem == null)
drp_audioBitrate.SelectedIndex = drp_audioBitrate.Items.Count - 1;
}
|