diff options
| author | Rodeo <[email protected]> | 2011-09-19 21:51:00 +0000 |
|---|---|---|
| committer | Rodeo <[email protected]> | 2011-09-19 21:51:00 +0000 |
| commit | d522dcb3ab53099ad4e6d7546037a588de3adad3 (patch) | |
| tree | 2598d01cf760cdac4d73ed675719957096730d47 /macosx | |
| parent | a3367322b982a61975df2a28307455d16a7ab081 (diff) | |
MacGui: since Auto Passthru isn't enabled yet, we still need to fall back to AC3 Passthru when loading a preset.
Also, update an outdated comment.
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@4238 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'macosx')
| -rw-r--r-- | macosx/Controller.m | 2 | ||||
| -rw-r--r-- | macosx/HBAudioController.m | 8 |
2 files changed, 9 insertions, 1 deletions
diff --git a/macosx/Controller.m b/macosx/Controller.m index 57ea2cc3b..390a0e001 100644 --- a/macosx/Controller.m +++ b/macosx/Controller.m @@ -3761,7 +3761,7 @@ bool one_burned = FALSE; job->acodec_fallback = [[queueToApply objectForKey: @"JobAudioEncoderFallback"] intValue]; /* Audio tracks and mixdowns */ - /* Lets make sure there arent any erroneous audio tracks in the job list, so lets make sure its empty */ + /* Lets make sure there arent any erroneous audio tracks in the job list, so lets make sure it's empty */ int audiotrack_count = hb_list_count(job->list_audio); for( int i = 0; i < audiotrack_count; i++ ) { diff --git a/macosx/HBAudioController.m b/macosx/HBAudioController.m index b275f7a82..cc1a62165 100644 --- a/macosx/HBAudioController.m +++ b/macosx/HBAudioController.m @@ -302,6 +302,14 @@ NSString *HBMixdownChangedNotification = @"HBMixdownChangedNotification"; [dict setObject: @"AAC (CoreAudio)" forKey: @"AudioEncoder"]; } + // Auto Passthru not yet enabled - fallback to AC3 Passthru as it is + // compatible with all source codecs (via the AC3 encoder fallback) + if ([key isEqualToString: @"Auto Passthru"]) + { + [dict setObject: @"AC3 Passthru" forKey: @"AudioEncoder"]; + key = @"AC3 Passthru"; + } + // passthru fallbacks if ([key isEqualToString: @"AAC Passthru"]) { |