From 53aa770c937bac8e4c2c738bc3042c7c1684158f Mon Sep 17 00:00:00 2001 From: dynaflash Date: Fri, 5 Feb 2010 16:06:49 +0000 Subject: MacGui: Fix issue with six channel discreet presets where no bitrate was chosen thereby borking the encode among other things. git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@3095 b64f7644-9d1e-0410-96f1-a4d463321fa5 --- macosx/Controller.m | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'macosx/Controller.m') diff --git a/macosx/Controller.m b/macosx/Controller.m index ce610fe7e..f23a83d00 100644 --- a/macosx/Controller.m +++ b/macosx/Controller.m @@ -6837,17 +6837,25 @@ return YES; [self audioTrackPopUpChanged: audiocodecPopUp]; [mixdownPopUp selectItemWithTitle:[tempObject objectForKey:@"AudioMixdown"]]; - /* check to see if the selections was available, if not, rerun audioTrackPopUpChanged using the codec to just set the default + [self audioTrackMixdownChanged: mixdownPopUp]; + /* check to see if the selection was available, if not, rerun audioTrackPopUpChanged using the codec to just set the default * mixdown*/ if ([mixdownPopUp selectedItem] == nil) { [self audioTrackPopUpChanged: audiocodecPopUp]; + [self writeToActivityLog: "presetSelected mixdown not selected, rerun audioTrackPopUpChanged"]; } [sampleratePopUp selectItemWithTitle:[tempObject objectForKey:@"AudioSamplerate"]]; /* We set the presets bitrate if it is *not* an AC3 track since that uses the input bitrate */ if (![[tempObject objectForKey:@"AudioEncoder"] isEqualToString:@"AC3 Passthru"]) { [bitratePopUp selectItemWithTitle:[tempObject objectForKey:@"AudioBitrate"]]; + /* check to see if the bitrate selection was available, if not, rerun audioTrackMixdownChanged using the mixdown to just set the + *default mixdown bitrate*/ + if ([bitratePopUp selectedItem] == nil) + { + [self audioTrackMixdownChanged: mixdownPopUp]; + } } [drcSlider setFloatValue:[[tempObject objectForKey:@"AudioTrackDRCSlider"] floatValue]]; [self audioDRCSliderChanged: drcSlider]; -- cgit v1.2.3