X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=gtk%2Fsrc%2Fqueuehandler.c;h=7be812b708941c1b90b0bcf6c1f98f7cb65ec939;hb=0884cb45aeeb60a46effe1d1056a61fe68300ea7;hp=c019f21257a6c4315a43a843da721e82130ba0d0;hpb=bff5799461349873d699b07618b6838cf9f1b2d2;p=handbrake-jp%2Fhandbrake-jp-git.git

diff --git a/gtk/src/queuehandler.c b/gtk/src/queuehandler.c
index c019f212..7be812b7 100644
--- a/gtk/src/queuehandler.c
+++ b/gtk/src/queuehandler.c
@@ -70,9 +70,9 @@ add_to_queue_list(signal_user_data_t *ud, GValue *settings, GtkTreeIter *piter)
 	gchar *dest, *preset, *vol_name, *basename;
 	const gchar *vcodec, *container;
 	gchar *fps, *vcodec_abbr;
-	gint title, start_chapter, end_chapter, width, height;
+	gint title, start_point, end_point, width, height;
 	gint source_width, source_height;
-	gboolean pass2, keep_aspect, vqtype, turbo;
+	gboolean pass2 = FALSE, keep_aspect, vqtype, turbo;
 	gint pic_par;
 	gboolean tweaks;
 	gchar *escape;
@@ -84,19 +84,29 @@ add_to_queue_list(signal_user_data_t *ud, GValue *settings, GtkTreeIter *piter)
 		
 	tweaks = ghb_settings_get_boolean(settings, "allow_tweaks");
 	title = ghb_settings_get_int(settings, "titlenum");
-	start_chapter = ghb_settings_get_int(settings, "start_chapter");
-	end_chapter = ghb_settings_get_int(settings, "end_chapter");
-	pass2 = ghb_settings_get_boolean(settings, "VideoTwoPass");
+	start_point = ghb_settings_get_int(settings, "start_point");
+	end_point = ghb_settings_get_int(settings, "end_point");
 	vol_name = ghb_settings_get_string(settings, "volume_label");
 	dest = ghb_settings_get_string(settings, "destination");
 	basename = g_path_get_basename(dest);
 	escape = g_markup_escape_text(basename, -1);
+
+	vqtype = ghb_settings_get_boolean(settings, "vquality_type_constant");
+	if (!vqtype)
+		pass2 = ghb_settings_get_boolean(settings, "VideoTwoPass");
+	const gchar *points = "Chapters";
+	if (ghb_settings_combo_int(settings, "PtoPType") == 0)
+		points = "Chapters";
+	else if (ghb_settings_combo_int(settings, "PtoPType") == 1)
+		points = "Seconds";
+	else if (ghb_settings_combo_int(settings, "PtoPType") == 2)
+		points = "Frames";
 	info = g_strdup_printf 
 	(
 		"<big><b>%s</b></big> "
-		"<small>(Title %d, Chapters %d through %d, %d Video %s)"
+		"<small>(Title %d, %s %d through %d, %d Video %s)"
 		" --> %s</small>",
-		 vol_name, title, start_chapter, end_chapter, 
+		 vol_name, title, points, start_point, end_point, 
 		 pass2 ? 2:1, pass2 ? "Passes":"Pass", escape
 	);
 	g_free(basename);
@@ -256,7 +266,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)
@@ -283,8 +293,10 @@ add_to_queue_list(signal_user_data_t *ud, GValue *settings, GtkTreeIter *piter)
 		 source_width, source_height, width, height, aspect_desc);
 
 	gint decomb, detel;
+	gboolean decomb_deint;
 	gboolean filters = FALSE;
 
+	decomb_deint = ghb_settings_get_boolean(settings, "PictureDecombDeinterlace");
 	decomb = ghb_settings_combo_int(settings, "PictureDecomb");
 	g_string_append_printf(str, "<b>Filters:</b><small>");
 	detel = ghb_settings_combo_int(settings, "PictureDetelecine");
@@ -300,7 +312,7 @@ add_to_queue_list(signal_user_data_t *ud, GValue *settings, GtkTreeIter *piter)
 		}
 		filters = TRUE;
 	}
-	if (decomb)
+	if (decomb_deint && decomb)
 	{
 		g_string_append_printf(str, " - Decomb");
 		if (decomb == 1)
@@ -312,7 +324,7 @@ add_to_queue_list(signal_user_data_t *ud, GValue *settings, GtkTreeIter *piter)
 		}
 		filters = TRUE;
 	}
-	else
+	else if (!decomb_deint)
 	{
 		gint deint = ghb_settings_combo_int(settings, "PictureDeinterlace");
 		if (deint)
@@ -509,6 +521,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;
 
@@ -518,7 +531,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");
@@ -534,6 +549,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,
@@ -783,7 +801,7 @@ queue_remove_clicked_cb(GtkWidget *widget, gchar *path, signal_user_data_t *ud)
 		if (status == GHB_QUEUE_RUNNING)
 		{
 			// Ask if wants to stop encode.
-			if (!ghb_cancel_encode(NULL))
+			if (!ghb_cancel_encode2(ud, NULL))
 			{
 				return;
 			}
@@ -1033,7 +1051,8 @@ ghb_queue_buttons_grey(signal_user_data_t *ud)
 	scan_state = ghb_get_scan_state();
 
 	show_stop = queue_state & 
-				(GHB_STATE_WORKING | GHB_STATE_SCANNING | GHB_STATE_MUXING);
+				(GHB_STATE_WORKING | GHB_STATE_SEARCHING | 
+				 GHB_STATE_SCANNING | GHB_STATE_MUXING);
 	show_start = !(scan_state & GHB_STATE_SCANNING) && 
 					(titleindex >= 0 || queue_count > 0);
 
@@ -1105,31 +1124,67 @@ ghb_queue_buttons_grey(signal_user_data_t *ud)
 	if (show_stop)
 	{
 		gtk_action_set_sensitive (action, TRUE);
+#if GTK_CHECK_VERSION(2, 16, 0)
 		gtk_action_set_icon_name(action, "hb-stop");
 		gtk_action_set_label(action, "S_top Queue");
 		gtk_action_set_tooltip(action, "Stop Encoding");
+#else
+		g_object_set_property(G_OBJECT(action), "icon-name", 
+											ghb_string_value("hb-stop"));
+		g_object_set_property(G_OBJECT(action), "label",
+											ghb_string_value("S_top Queue"));
+		g_object_set_property(G_OBJECT(action), "tooltip",
+											ghb_string_value("Stop Encoding"));
+#endif
 	}
 	else
 	{
 		gtk_action_set_sensitive (action, show_start);
+#if GTK_CHECK_VERSION(2, 16, 0)
 		gtk_action_set_icon_name(action, "hb-play");
 		gtk_action_set_label(action, "_Start Queue");
 		gtk_action_set_tooltip(action, "Start Encoding");
+#else
+		g_object_set_property(G_OBJECT(action), "icon-name", 
+											ghb_string_value("hb-play"));
+		g_object_set_property(G_OBJECT(action), "label",
+											ghb_string_value("_Start Queue"));
+		g_object_set_property(G_OBJECT(action), "tooltip",
+											ghb_string_value("Start Encoding"));
+#endif
 	}
 	action = GHB_ACTION (ud->builder, "queue_pause_menu");
 	if (paused)
 	{
 		gtk_action_set_sensitive (action, show_start);
+#if GTK_CHECK_VERSION(2, 16, 0)
 		gtk_action_set_icon_name(action, "hb-play");
 		gtk_action_set_label(action, "_Resume Queue");
 		gtk_action_set_tooltip(action, "Resume Encoding");
+#else
+		g_object_set_property(G_OBJECT(action), "icon-name", 
+										ghb_string_value("hb-play"));
+		g_object_set_property(G_OBJECT(action), "label",
+										ghb_string_value("_Resume Queue"));
+		g_object_set_property(G_OBJECT(action), "tooltip",
+										ghb_string_value("Resume Encoding"));
+#endif
 	}
 	else
 	{
 		gtk_action_set_sensitive (action, show_stop);
+#if GTK_CHECK_VERSION(2, 16, 0)
 		gtk_action_set_icon_name(action, "hb-pause");
 		gtk_action_set_label(action, "_Pause Queue");
 		gtk_action_set_tooltip(action, "Pause Encoding");
+#else
+		g_object_set_property(G_OBJECT(action), "icon-name", 
+										ghb_string_value("hb-pause"));
+		g_object_set_property(G_OBJECT(action), "label",
+										ghb_string_value("_Pause Queue"));
+		g_object_set_property(G_OBJECT(action), "tooltip",
+										ghb_string_value("Pause Encoding"));
+#endif
 	}
 }
 
@@ -1158,10 +1213,11 @@ queue_start_clicked_cb(GtkWidget *xwidget, signal_user_data_t *ud)
 	gint state;
 
 	state = ghb_get_queue_state();
-	if (state & (GHB_STATE_WORKING | GHB_STATE_SCANNING | GHB_STATE_MUXING))
+	if (state & (GHB_STATE_WORKING | GHB_STATE_SEARCHING | 
+				 GHB_STATE_SCANNING | GHB_STATE_MUXING))
 	{
-		ud->cancel_encode = TRUE;
-		ghb_cancel_encode(NULL);
+		ghb_cancel_encode(ud, "You are currently encoding.  "
+								"What would you like to do?");
 		return;
 	}
 
@@ -1203,13 +1259,20 @@ ghb_reload_queue(signal_user_data_t *ud)
 	GValue *queue;
 	gint unfinished = 0;
 	gint count, ii;
+	gint pid;
 	gint status;
 	GValue *settings;
 	gchar *message;
 
 	g_debug("ghb_reload_queue");
 
-	queue = ghb_load_queue();
+find_pid:
+	pid = ghb_find_pid_file();
+	if (pid < 0)
+		return FALSE;
+
+	queue = ghb_load_old_queue(pid);
+	ghb_remove_old_queue_file(pid);
 	// Look for unfinished entries
 	count = ghb_array_len(queue);
 	for (ii = 0; ii < count; ii++)
@@ -1221,6 +1284,9 @@ ghb_reload_queue(signal_user_data_t *ud)
 			unfinished++;
 		}
 	}
+	if (!unfinished)
+		goto find_pid;
+
 	if (unfinished)
 	{
 		message = g_strdup_printf(
@@ -1233,6 +1299,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
@@ -1256,11 +1324,11 @@ ghb_reload_queue(signal_user_data_t *ud)
 				add_to_queue_list(ud, settings, NULL);
 			}
 			ghb_queue_buttons_grey(ud);
+			ghb_save_queue(ud->queue);
 		}
 		else
 		{
 			ghb_value_free(queue);
-			ghb_remove_queue_file();
 		}
 		g_free(message);
 	}
@@ -1309,7 +1377,7 @@ queue_key_press_cb(
 		if (status == GHB_QUEUE_RUNNING)
 		{
 			// Ask if wants to stop encode.
-			if (!ghb_cancel_encode(NULL))
+			if (!ghb_cancel_encode2(ud, NULL))
 			{
 				return TRUE;
 			}
@@ -1369,6 +1437,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);