LinGui: modify toolbar buttons to adapt to new user customizable

[handbrake-jp/handbrake-jp-git.git] / gtk / src / audiohandler.c

diff --git a/gtk/src/audiohandler.c b/gtk/src/audiohandler.c
index 017a8b8..39d54c1 100644 (file)
--- a/gtk/src/audiohandler.c
+++ b/gtk/src/audiohandler.c
@@ -68,17 +68,22 @@ ghb_adjust_audio_rate_combos(signal_user_data_t *ud)
                }
                ghb_ui_update(ud, "AudioTrackDRCSlider", ghb_double_value(0));
        }
-       else if (acodec == HB_ACODEC_FAAC && mix != HB_AMIXDOWN_6CH)
+       else if (acodec == HB_ACODEC_FAAC)
        {
-               gint br;
+               gint br, last;
+
+               if (mix == HB_AMIXDOWN_6CH)
+                       last = 448;
+               else
+                       last = 160;
 
                widget = GHB_WIDGET(ud->builder, "AudioBitrate");
                gval = ghb_widget_value(widget);
                br = ghb_lookup_combo_int("AudioBitrate", gval);
                ghb_value_free(gval);
-               if (br > 160)
-                       ghb_ui_update(ud, "AudioBitrate", ghb_int64_value(160));
-               ghb_set_default_bitrate_opts (ud->builder, 160);
+               if (br > last)
+                       ghb_ui_update(ud, "AudioBitrate", ghb_int64_value(last));
+               ghb_set_default_bitrate_opts (ud->builder, last);
        }
        else
        {
@@ -290,9 +295,7 @@ ghb_audio_list_refresh_selected(signal_user_data_t *ud)
                        s_drc = g_strdup_printf("%.1f", drc);
 
                if (icodec == HB_ACODEC_MASK)
-               {
                        codec = ghb_select_audio_codec_str(ud, itrack);
-               }
 
                gtk_list_store_set(GTK_LIST_STORE(store), &iter, 
                        // These are displayed in list
@@ -349,7 +352,7 @@ audio_codec_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
        }
        ghb_adjust_audio_rate_combos(ud);
        ghb_grey_combo_options (ud->builder);
-       ghb_check_dependency(ud, widget);
+       ghb_check_dependency(ud, widget, NULL);
        prev_acodec = acodec_code;
        asettings = get_selected_asettings(ud);
        if (asettings != NULL)
@@ -368,7 +371,7 @@ audio_track_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
 
        g_debug("audio_track_changed_cb ()");
        ghb_adjust_audio_rate_combos(ud);
-       ghb_check_dependency(ud, widget);
+       ghb_check_dependency(ud, widget, NULL);
        ghb_grey_combo_options(ud->builder);
        asettings = get_selected_asettings(ud);
        if (asettings != NULL)
@@ -390,7 +393,7 @@ audio_mix_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
 
        g_debug("audio_mix_changed_cb ()");
        ghb_adjust_audio_rate_combos(ud);
-       ghb_check_dependency(ud, widget);
+       ghb_check_dependency(ud, widget, NULL);
        asettings = get_selected_asettings(ud);
        if (asettings != NULL)
        {
@@ -406,7 +409,7 @@ audio_widget_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
        GValue *asettings;
 
        g_debug("audio_widget_changed_cb ()");
-       ghb_check_dependency(ud, widget);
+       ghb_check_dependency(ud, widget, NULL);
        asettings = get_selected_asettings(ud);
        if (asettings != NULL)
        {
@@ -432,7 +435,7 @@ drc_widget_changed_cb(GtkWidget *widget, gdouble val, signal_user_data_t *ud)
                drc = g_strdup_printf("%.1f", val);
        gtk_label_set_text(label, drc);
        g_free(drc);
-       ghb_check_dependency(ud, widget);
+       ghb_check_dependency(ud, widget, NULL);
        asettings = get_selected_asettings(ud);
        if (asettings != NULL)
        {
@@ -452,7 +455,7 @@ subtitle_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
        const gchar *name = gtk_widget_get_name(widget);
        g_debug("subtitle_changed_cb () %s", name);
        ghb_widget_to_setting(ud->settings, widget);
-       ghb_check_dependency(ud, widget);
+       ghb_check_dependency(ud, widget, NULL);
        ghb_live_reset(ud);
 }