From: dynaflash Date: Tue, 23 Feb 2010 18:07:07 +0000 (+0000) Subject: MacGui: Audio fixes regarding CoreAudio as default. X-Git-Url: http://git.osdn.jp/view?a=commitdiff_plain;h=c70b958d7ab6ba105a4f3075f66948ce1346423d;p=handbrake-jp%2Fhandbrake-jp-git.git MacGui: Audio fixes regarding CoreAudio as default. - Base Patch by Rodeo, thanks Rodeo! -- Puts CoreAudo at index 0 in the encoder popup to assure it is selected by default if no preset is applied. -- Fixes issue where going to AC3 or DTS Passthru then back to aac chose faac even if the old "Use CoreAudo instead of FAAC" pref was in effect. -- Removes some legacy AVI/OGM Code. - Additional features added after Base Patch: -- "Use CoreAudio instead of FAAC" preference is now only applied to the built in presets --- This change means that a custom preset specifying faac is now respected instead of it being overridden by the previously global preference. --- Xib description changed accordingly --- Note this means that previous custom presets that used faac will now use it instead of coreaudio. git-svn-id: svn://localhost/HandBrake/trunk@3138 b64f7644-9d1e-0410-96f1-a4d463321fa5 --- diff --git a/macosx/Controller.m b/macosx/Controller.m index 8c0df139..c9219aad 100644 --- a/macosx/Controller.m +++ b/macosx/Controller.m @@ -5586,14 +5586,12 @@ the user is using "Custom" settings by determining the sender*/ { case 0: /* MP4 */ - // FAAC - menuItem = [[audiocodecPopUp menu] addItemWithTitle:@"AAC (faac)" action: NULL keyEquivalent: @""]; - [menuItem setTag: HB_ACODEC_FAAC]; - // CA_AAC menuItem = [[audiocodecPopUp menu] addItemWithTitle:@"AAC (CoreAudio)" action: NULL keyEquivalent: @""]; [menuItem setTag: HB_ACODEC_CA_AAC]; - + // FAAC + menuItem = [[audiocodecPopUp menu] addItemWithTitle:@"AAC (faac)" action: NULL keyEquivalent: @""]; + [menuItem setTag: HB_ACODEC_FAAC]; // AC3 Passthru menuItem = [[audiocodecPopUp menu] addItemWithTitle:@"AC3 Passthru" action: NULL keyEquivalent: @""]; [menuItem setTag: HB_ACODEC_AC3]; @@ -5601,12 +5599,12 @@ the user is using "Custom" settings by determining the sender*/ case 1: /* MKV */ - // FAAC - menuItem = [[audiocodecPopUp menu] addItemWithTitle:@"AAC (faac)" action: NULL keyEquivalent: @""]; - [menuItem setTag: HB_ACODEC_FAAC]; // CA_AAC menuItem = [[audiocodecPopUp menu] addItemWithTitle:@"AAC (CoreAudio)" action: NULL keyEquivalent: @""]; [menuItem setTag: HB_ACODEC_CA_AAC]; + // FAAC + menuItem = [[audiocodecPopUp menu] addItemWithTitle:@"AAC (faac)" action: NULL keyEquivalent: @""]; + [menuItem setTag: HB_ACODEC_FAAC]; // AC3 Passthru menuItem = [[audiocodecPopUp menu] addItemWithTitle:@"AC3 Passthru" action: NULL keyEquivalent: @""]; [menuItem setTag: HB_ACODEC_AC3]; @@ -5620,26 +5618,6 @@ the user is using "Custom" settings by determining the sender*/ menuItem = [[audiocodecPopUp menu] addItemWithTitle:@"Vorbis (vorbis)" action: NULL keyEquivalent: @""]; [menuItem setTag: HB_ACODEC_VORBIS]; break; - - case 2: - /* AVI */ - // MP3 - menuItem = [[audiocodecPopUp menu] addItemWithTitle:@"MP3 (lame)" action: NULL keyEquivalent: @""]; - [menuItem setTag: HB_ACODEC_LAME]; - // AC3 Passthru - menuItem = [[audiocodecPopUp menu] addItemWithTitle:@"AC3 Passthru" action: NULL keyEquivalent: @""]; - [menuItem setTag: HB_ACODEC_AC3]; - break; - - case 3: - /* OGM */ - // Vorbis - menuItem = [[audiocodecPopUp menu] addItemWithTitle:@"Vorbis (vorbis)" action: NULL keyEquivalent: @""]; - [menuItem setTag: HB_ACODEC_VORBIS]; - // MP3 - menuItem = [[audiocodecPopUp menu] addItemWithTitle:@"MP3 (lame)" action: NULL keyEquivalent: @""]; - [menuItem setTag: HB_ACODEC_LAME]; - break; } [audiocodecPopUp selectItemAtIndex:0]; } @@ -5911,37 +5889,19 @@ the user is using "Custom" settings by determining the sender*/ } /* In the case of a source track that is not AC3 and the user tries to use AC3 Passthru (which does not work) - * we force the Audio Codec choice back to a workable codec. We use MP3 for avi and aac for all - * other containers. + * we force the Audio Codec choice back to a workable codec. We use CoreAudio aac for all containers. */ if (audio->in.codec != HB_ACODEC_AC3 && [[audiocodecPopUp selectedItem] tag] == HB_ACODEC_AC3) { - /* If we are using the avi container, we select MP3 as there is no aac available*/ - if ([[fDstFormatPopUp selectedItem] tag] == HB_MUX_AVI) - { - [audiocodecPopUp selectItemWithTag: HB_ACODEC_LAME]; - } - else - { - [audiocodecPopUp selectItemWithTag: HB_ACODEC_FAAC]; - } + [audiocodecPopUp selectItemWithTag: HB_ACODEC_CA_AAC]; } /* In the case of a source track that is not DTS and the user tries to use DTS Passthru (which does not work) - * we force the Audio Codec choice back to a workable codec. We use MP3 for avi and aac for all - * other containers. + * we force the Audio Codec choice back to a workable codec. We use CoreAudio aac for all containers. */ if (audio->in.codec != HB_ACODEC_DCA && [[audiocodecPopUp selectedItem] tag] == HB_ACODEC_DCA) { - /* If we are using the avi container, we select MP3 as there is no aac available*/ - if ([[fDstFormatPopUp selectedItem] tag] == HB_MUX_AVI) - { - [audiocodecPopUp selectItemWithTag: HB_ACODEC_LAME]; - } - else - { - [audiocodecPopUp selectItemWithTag: HB_ACODEC_FAAC]; - } + [audiocodecPopUp selectItemWithTag: HB_ACODEC_CA_AAC]; } /* Setup our samplerate and bitrate popups we will need based on mixdown */ @@ -6831,8 +6791,9 @@ return YES; } [self audioTrackPopUpChanged: trackLangPopUp]; [audiocodecPopUp selectItemWithTitle:[tempObject objectForKey:@"AudioEncoder"]]; - /* check our pref for core audio and use it in place of faac if applicable */ - if ([[NSUserDefaults standardUserDefaults] boolForKey: @"UseCoreAudio"] == YES && + /* check our pref for core audio and use it in place of faac if preset is a built in */ + if ([[chosenPreset objectForKey:@"Type"] intValue] == 0 && + [[NSUserDefaults standardUserDefaults] boolForKey: @"UseCoreAudio"] == YES && [[tempObject objectForKey:@"AudioEncoder"] isEqualToString: @"AAC (faac)"]) { [audiocodecPopUp selectItemWithTitle:@"AAC (CoreAudio)"]; @@ -6926,12 +6887,14 @@ return YES; } [self audioTrackPopUpChanged: fAudLang1PopUp]; [fAudTrack1CodecPopUp selectItemWithTitle:[chosenPreset objectForKey:@"Audio1Encoder"]]; - /* check our pref for core audio and use it in place of faac if applicable */ - if ([[NSUserDefaults standardUserDefaults] boolForKey: @"UseCoreAudio"] == YES && + /* check our pref for core audio and use it in place of faac if preset is built in */ + if ([[chosenPreset objectForKey:@"Type"] intValue] == 0 && + [[NSUserDefaults standardUserDefaults] boolForKey: @"UseCoreAudio"] == YES && [[chosenPreset objectForKey:@"Audio1Encoder"] isEqualToString: @"AAC (faac)"]) { [fAudTrack1CodecPopUp selectItemWithTitle:@"AAC (CoreAudio)"]; } + [self audioTrackPopUpChanged: fAudTrack1CodecPopUp]; [fAudTrack1MixPopUp selectItemWithTitle:[chosenPreset objectForKey:@"Audio1Mixdown"]]; /* check to see if the selections was available, if not, rerun audioTrackPopUpChanged using the codec to just set the default @@ -6958,8 +6921,9 @@ return YES; } [self audioTrackPopUpChanged: fAudLang2PopUp]; [fAudTrack2CodecPopUp selectItemWithTitle:[chosenPreset objectForKey:@"Audio2Encoder"]]; - /* check our pref for core audio and use it in place of faac if applicable */ - if ([[NSUserDefaults standardUserDefaults] boolForKey: @"UseCoreAudio"] == YES && + /* check our pref for core audio and use it in place of faac if preset is built in */ + if ([[chosenPreset objectForKey:@"Type"] intValue] == 0 && + [[NSUserDefaults standardUserDefaults] boolForKey: @"UseCoreAudio"] == YES && [[chosenPreset objectForKey:@"Audio2Encoder"] isEqualToString: @"AAC (faac)"]) { [fAudTrack2CodecPopUp selectItemWithTitle:@"AAC (CoreAudio)"]; @@ -6989,8 +6953,9 @@ return YES; } [self audioTrackPopUpChanged: fAudLang3PopUp]; [fAudTrack3CodecPopUp selectItemWithTitle:[chosenPreset objectForKey:@"Audio3Encoder"]]; - /* check our pref for core audio and use it in place of faac if applicable */ - if ([[NSUserDefaults standardUserDefaults] boolForKey: @"UseCoreAudio"] == YES && + /* check our pref for core audio and use it in place of faac if preset is built in */ + if ([[chosenPreset objectForKey:@"Type"] intValue] == 0 && + [[NSUserDefaults standardUserDefaults] boolForKey: @"UseCoreAudio"] == YES && [[chosenPreset objectForKey:@"Audio3Encoder"] isEqualToString: @"AAC (faac)"]) { [fAudTrack3CodecPopUp selectItemWithTitle:@"AAC (CoreAudio)"]; @@ -7020,8 +6985,9 @@ return YES; } [self audioTrackPopUpChanged: fAudLang4PopUp]; [fAudTrack4CodecPopUp selectItemWithTitle:[chosenPreset objectForKey:@"Audio4Encoder"]]; - /* check our pref for core audio and use it in place of faac if applicable */ - if ([[NSUserDefaults standardUserDefaults] boolForKey: @"UseCoreAudio"] == YES && + /* check our pref for core audio and use it in place of faac if preset is built in */ + if ([[chosenPreset objectForKey:@"Type"] intValue] == 0 && + [[NSUserDefaults standardUserDefaults] boolForKey: @"UseCoreAudio"] == YES && [[chosenPreset objectForKey:@"Audio4Encoder"] isEqualToString: @"AAC (faac)"]) { [fAudTrack4CodecPopUp selectItemWithTitle:@"AAC (CoreAudio)"]; diff --git a/macosx/English.lproj/Preferences.xib b/macosx/English.lproj/Preferences.xib index 6eea5da2..b38c3761 100644 --- a/macosx/English.lproj/Preferences.xib +++ b/macosx/English.lproj/Preferences.xib @@ -3,16 +3,16 @@ 1050 10C540 - 732 + 740 1038.25 458.00 com.apple.InterfaceBuilder.CocoaPlugin - 732 + 740 YES - + YES @@ -60,14 +60,10 @@ {1.79769e+308, 1.79769e+308} - - YES - SendCompletedEncodeToApp - YES - + 256 YES @@ -567,12 +563,11 @@ {492, 236} - NSView NSControl - + 256 YES @@ -581,7 +576,6 @@ 268 {{34, 42}, {432, 17}} - YES 67239488 @@ -599,13 +593,11 @@ {496, 82} - - NSView NSResponder - + 256 YES @@ -941,7 +933,7 @@ -2080244224 131072 - Use CoreAudio instead of FAAC for preset default encoder + Use CoreAudio instead of FAAC for Built-In Presets 1211912703 @@ -956,6 +948,7 @@ {492, 91} + NSView