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

3 files changed, 10 insertions, 2 deletions

diff --git a/libhb/common.c b/libhb/common.c
index f320ff2c1..ce0f1a7f6 100644
--- a/libhb/common.c
+++ b/libhb/common.c
@@ -171,7 +171,7 @@ int hb_autopassthru_get_encoder( int in_codec, int copy_mask, int fallback, int
     int i;
     int out_codec = ( copy_mask & in_codec ) | HB_ACODEC_PASS_FLAG;
     // sanitize fallback encoder and selected passthru
-    // note: invalid fallbacks are caught in work.c
+    // note: invalid fallbacks are caught in hb_autopassthru_apply_settings
     for( i = 0; i < hb_audio_encoders_count; i++ )
     {
         if( ( hb_audio_encoders[i].encoder == fallback ) &&
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"])
             {