X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=gtk%2Fsrc%2Faudiohandler.c;h=fbe5e90c7af0bf5b84f4df9e9d27c04b19e06436;hb=80330e859f794e9ae218d54260c70e961f1af204;hp=17699915f900161a56dd0f1a9611820feb81340e;hpb=8e206bef6510ec7a1500c62a2bfc16b85cdc16ff;p=handbrake-jp%2Fhandbrake-jp-git.git

diff --git a/gtk/src/audiohandler.c b/gtk/src/audiohandler.c
index 17699915..fbe5e90c 100644
--- a/gtk/src/audiohandler.c
+++ b/gtk/src/audiohandler.c
@@ -47,7 +47,7 @@ ghb_adjust_audio_rate_combos(signal_user_data_t *ud)
 
 	if (ghb_audio_is_passthru (acodec))
 	{
-		ghb_set_default_bitrate_opts (ud->builder, -1);
+		ghb_set_default_bitrate_opts (ud->builder, 0, -1);
 		if (ghb_get_audio_info (&ainfo, titleindex, audioindex))
 		{
 			gint br = ainfo.bitrate / 1000;
@@ -68,21 +68,29 @@ 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 = 160, first = 0;
+
+		if (mix == HB_AMIXDOWN_6CH)
+		{
+			first = 192;
+			last = 448;
+		}
 
 		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));
+		if (br < first)
+			ghb_ui_update(ud, "AudioBitrate", ghb_int64_value(first));
+		ghb_set_default_bitrate_opts (ud->builder, first, last);
 	}
 	else
 	{
-		ghb_set_default_bitrate_opts (ud->builder, -1);
+		ghb_set_default_bitrate_opts (ud->builder, 0, -1);
 	}
 }
 
@@ -347,7 +355,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)
@@ -366,7 +374,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)
@@ -388,7 +396,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)
 	{
@@ -404,7 +412,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)
 	{
@@ -430,7 +438,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)
 	{
@@ -450,7 +458,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);
 }