]> granicus.if.org Git - handbrake/commitdiff
LinGui: use "allowed passthru" options even when hidden by preference option
authorjstebbins <jstebbins.hb@gmail.com>
Sat, 5 May 2012 18:12:00 +0000 (18:12 +0000)
committerjstebbins <jstebbins.hb@gmail.com>
Sat, 5 May 2012 18:12:00 +0000 (18:12 +0000)
If you don't do this, then presets that use these will not function as
advertised.

git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@4640 b64f7644-9d1e-0410-96f1-a4d463321fa5

gtk/src/audiohandler.c

index 7efbfb74f346b22001d609202245553144479a3b..6e080dd9a57bcf914061ab06de101675ac1c61eb 100644 (file)
@@ -96,15 +96,6 @@ int ghb_get_copy_mask(GValue *settings)
 {
        gint mask = 0;
 
-       if (!ghb_settings_get_boolean(settings, "AdvancedAutoPassthru"))
-       {
-               mask =  HB_ACODEC_MP3 |
-                               HB_ACODEC_FFAAC |
-                               HB_ACODEC_AC3 |
-                               HB_ACODEC_DCA |
-                               HB_ACODEC_DCA_HD;
-               return mask;
-       }
        if (ghb_settings_get_boolean(settings, "AudioAllowMP3Pass"))
        {
                mask |= HB_ACODEC_MP3;
@@ -146,9 +137,7 @@ static int ghb_select_fallback( GValue *settings, int mux, int acodec )
 
                default:
                {
-                       if (ghb_settings_get_boolean(settings, "AdvancedAutoPassthru"))
-                               fallback = ghb_settings_combo_int(settings, 
-                                                                                               "AudioEncoderFallback");
+                       fallback = ghb_settings_combo_int(settings, "AudioEncoderFallback");
                }
        }
        if ( mux == HB_MUX_MP4 )