diff options
| author | dynaflash <[email protected]> | 2010-10-29 14:35:00 +0000 |
|---|---|---|
| committer | dynaflash <[email protected]> | 2010-10-29 14:35:00 +0000 |
| commit | b6fa57df362e427de28ae05d043fe6795260aca0 (patch) | |
| tree | a159a7a8a0dcbeec48b692f49287a1496019a32d /macosx/HBAudioController.m | |
| parent | 3a1b6a0ce8cad3c6030a5bbcf924d7d01043a03f (diff) | |
MacGui: Audio - Using fallback codec no longer sets the bit rate from the preset. Setting the sample rate no longer sets the bit rate to the default if the currently selected bit rate is still supported.
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@3627 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'macosx/HBAudioController.m')
| -rw-r--r-- | macosx/HBAudioController.m | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/macosx/HBAudioController.m b/macosx/HBAudioController.m index 514f7b32f..55dfc9916 100644 --- 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 { |