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

diff --git a/gtk/src/queuehandler.c b/gtk/src/queuehandler.c
index 4ba09571..7be812b7 100644
--- a/gtk/src/queuehandler.c
+++ b/gtk/src/queuehandler.c
@@ -70,7 +70,7 @@ 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 = FALSE, keep_aspect, vqtype, turbo;
 	gint pic_par;
@@ -84,8 +84,8 @@ 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");
+	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);
@@ -94,12 +94,19 @@ add_to_queue_list(signal_user_data_t *ud, GValue *settings, GtkTreeIter *piter)
 	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);
@@ -1044,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);
 
@@ -1205,7 +1213,8 @@ 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))
 	{
 		ghb_cancel_encode(ud, "You are currently encoding.  "
 								"What would you like to do?");
@@ -1250,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++)
@@ -1268,6 +1284,9 @@ ghb_reload_queue(signal_user_data_t *ud)
 			unfinished++;
 		}
 	}
+	if (!unfinished)
+		goto find_pid;
+
 	if (unfinished)
 	{
 		message = g_strdup_printf(
@@ -1305,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);
 	}