X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;ds=sidebyside;f=gtk%2Fsrc%2Fqueuehandler.c;h=76107230078341c049f12dcfdf742981704084f4;hb=a3a7afcb7aa68ec73f6552c528d93ea989905cc2;hp=8456d2754f4f804be715313f2dcc2a1caf9b8247;hpb=3d9cac66b27f6c14560a932db8e0bbacc966f76d;p=handbrake-jp%2Fhandbrake-jp-git.git

diff --git a/gtk/src/queuehandler.c b/gtk/src/queuehandler.c
index 8456d275..76107230 100644
--- a/gtk/src/queuehandler.c
+++ b/gtk/src/queuehandler.c
@@ -256,7 +256,7 @@ add_to_queue_list(signal_user_data_t *ud, GValue *settings, GtkTreeIter *piter)
 		vqvalue = ghb_settings_get_double(settings, "VideoQualitySlider");
 		vq_desc = "Constant Quality:";
 		vqstr = g_strdup_printf("%d", (gint)vqvalue);
-		vq_units = "(crf)";
+		vq_units = "(RF)";
 	}
 	fps = ghb_settings_get_string(settings, "VideoFramerate");
 	if (strcmp("source", fps) == 0)
@@ -511,6 +511,7 @@ audio_list_refresh(signal_user_data_t *ud)
 		{
 			const gchar *track, *codec, *br, *sr, *mix;
 			gchar *drc, *s_track, *s_codec, *s_br, *s_sr, *s_mix;
+			gint itrack, icodec;
 			gdouble s_drc;
 			GValue *asettings;
 
@@ -520,7 +521,9 @@ audio_list_refresh(signal_user_data_t *ud)
 			asettings = ghb_array_get_nth(audio_list, row);
 
 			track = ghb_settings_combo_option(asettings, "AudioTrack");
+			itrack = ghb_settings_combo_int(asettings, "AudioTrack");
 			codec = ghb_settings_combo_option(asettings, "AudioEncoder");
+			icodec = ghb_settings_combo_int(asettings, "AudioEncoder");
 			br = ghb_settings_combo_option(asettings, "AudioBitrate");
 			sr = ghb_settings_combo_option(asettings, "AudioSamplerate");
 			mix = ghb_settings_combo_option(asettings, "AudioMixdown");
@@ -536,6 +539,9 @@ audio_list_refresh(signal_user_data_t *ud)
 			else
 				drc = g_strdup_printf("%.1f", s_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
 				0, track,
@@ -1271,6 +1277,8 @@ ghb_reload_queue(signal_user_data_t *ud)
 		{
 			GtkWidget *widget = GHB_WIDGET (ud->builder, "queue_window");
 			gtk_widget_show (widget);
+			widget = GHB_WIDGET (ud->builder, "show_queue");
+			gtk_toggle_tool_button_set_active(GTK_TOGGLE_TOOL_BUTTON(widget), TRUE);
 
 			ud->queue = queue;
 			// First get rid of any old items we don't want
@@ -1407,6 +1415,10 @@ queue_edit_clicked_cb(GtkWidget *xwidget, signal_user_data_t *ud)
 			// Remove the corresponding item from the queue list
 			ghb_array_remove(ud->queue, row);
 		}
+		else
+		{
+			ghb_queue_edit_settings = ghb_value_dup(ghb_queue_edit_settings);
+		}
 		gchar *source;
 		source = ghb_settings_get_string(ghb_queue_edit_settings, "source");
 		ghb_do_scan(ud, source, 0, FALSE);