diff options
| author | sr55 <[email protected]> | 2011-08-07 13:28:43 +0000 |
|---|---|---|
| committer | sr55 <[email protected]> | 2011-08-07 13:28:43 +0000 |
| commit | 439b0a6c8f4cd9f5c15aa8c06e5200f2119fc88a (patch) | |
| tree | e89b5543adfe31c22fff28c766e1cb38c5da6a41 /win/CS/Controls | |
| parent | c24d8ddd65e9549b26e813681cac60365c1c5175 (diff) | |
WinGui: Support for AAC and MP3 Passthru added + change default audio mode setting to 0 to prevent crash.
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@4158 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'win/CS/Controls')
| -rw-r--r-- | win/CS/Controls/AudioPanel.cs | 26 |
1 files changed, 24 insertions, 2 deletions
diff --git a/win/CS/Controls/AudioPanel.cs b/win/CS/Controls/AudioPanel.cs index f97af0605..b3389fd27 100644 --- a/win/CS/Controls/AudioPanel.cs +++ b/win/CS/Controls/AudioPanel.cs @@ -123,10 +123,12 @@ 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.AacPassthru));
drp_audioEncoder.Items.Add(EnumHelper<AudioEncoder>.GetDescription(AudioEncoder.Lame));
+ drp_audioEncoder.Items.Add(EnumHelper<AudioEncoder>.GetDescription(AudioEncoder.Mp3Passthru));
drp_audioEncoder.Items.Add(EnumHelper<AudioEncoder>.GetDescription(AudioEncoder.Ac3Passthrough));
drp_audioEncoder.Items.Add(EnumHelper<AudioEncoder>.GetDescription(AudioEncoder.Ac3));
-
+
if (path.Contains("MKV"))
{
drp_audioEncoder.Items.Add(EnumHelper<AudioEncoder>.GetDescription(AudioEncoder.DtsPassthrough));
@@ -162,7 +164,8 @@ namespace Handbrake.Controls foreach (AudioTrack track in tracks)
{
- if (track.Encoder == AudioEncoder.Ac3Passthrough || track.Encoder == AudioEncoder.DtsPassthrough || track.Encoder == AudioEncoder.DtsHDPassthrough)
+ if (track.Encoder == AudioEncoder.Ac3Passthrough || track.Encoder == AudioEncoder.DtsPassthrough ||
+ track.Encoder == AudioEncoder.DtsHDPassthrough || track.Encoder == AudioEncoder.AacPassthru || track.Encoder == AudioEncoder.Mp3Passthru)
{
track.MixDown = HandBrake.ApplicationServices.Model.Encoding.Mixdown.Passthrough;
track.Bitrate = 0;
@@ -271,6 +274,23 @@ namespace Handbrake.Controls // Switch to AAC
drp_audioEncoder.SelectedIndex = 0;
}
+
+ // If the track isn't AAC, and the encoder is, change it.
+ if (track.Encoder == AudioEncoder.AacPassthru && !track.ScannedTrack.Format.Contains("aac"))
+ {
+ // Switch to AAC
+ drp_audioEncoder.SelectedIndex = 0;
+ }
+
+
+ // If the track isn't MP3, and the encoder is, change it.
+ if (track.Encoder == AudioEncoder.Mp3Passthru && !track.ScannedTrack.Format.Contains("mp3"))
+ {
+ // Switch to AAC
+ drp_audioEncoder.SelectedIndex = 0;
+ }
+
+
}
break;
case "drp_audioEncoder":
@@ -914,6 +934,8 @@ namespace Handbrake.Controls case "AC3 Passthru":
case "DTS Passthru":
case "DTS-HD Passthru":
+ case "AAC Passthru":
+ case "MP3 Passthru":
drp_audioMix.SelectedItem = Passthru;
break;
}
|