MacGui: Audio - Using fallback codec no longer sets the bit rate from the preset...

[handbrake-jp/handbrake-jp-git.git] / macosx / HBAudioController.m

diff --git a/macosx/HBAudioController.m b/macosx/HBAudioController.m
index 514f7b3..55dfc99 100644 (file)
--- a/macosx/HBAudioController.m
+++ b/macosx/HBAudioController.m
@@ -241,6 +241,7 @@ NSString *HBMixdownChangedNotification = @"HBMixdownChangedNotification";
        
        while (nil != (dict = [enumerator nextObject])) {
                if ([self countOfAudioArray] < maximumNumberOfAllowedAudioTracks) {
+                       BOOL fallenBack = NO;
                        HBAudio *newAudio = [[HBAudio alloc] init];
                        [newAudio setController: self];
                        [self insertObject: newAudio inAudioArrayAtIndex: [self countOfAudioArray]];
@@ -257,6 +258,7 @@ NSString *HBMixdownChangedNotification = @"HBMixdownChangedNotification";
                                YES == [key isEqualToString: @"AC3 Passthru"]) {
                                if (NO == [newAudio setCodecFromName: key]) {
                                        key = @"AC3";
+                                       fallenBack = YES;
                                }
                        }
                        //      If our preset wants us to support a codec that the track does not support, instead
@@ -264,7 +266,9 @@ NSString *HBMixdownChangedNotification = @"HBMixdownChangedNotification";
                        if (YES == [newAudio setCodecFromName: key]) {
                                [newAudio setMixdownFromName: [dict objectForKey: @"AudioMixdown"]];
                                [newAudio setSampleRateFromName: [dict objectForKey: @"AudioSamplerate"]];
-                               [newAudio setBitRateFromName: [dict objectForKey: @"AudioBitrate"]];
+                               if (NO == fallenBack) {
+                                       [newAudio setBitRateFromName: [dict objectForKey: @"AudioBitrate"]];
+                                       }
                                [newAudio setDrc: [dict objectForKey: @"AudioTrackDRCSlider"]];
                        }
                        else {