X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=gtk%2Fsrc%2Fpreview.c;h=fc713f6d298b720362ec6f6c39f0ade6afa4b7b0;hb=0884cb45aeeb60a46effe1d1056a61fe68300ea7;hp=e85130e905e7b1a79fe1ecc6d59a323e547906c7;hpb=4221965a8d37b5a3dd665b9de4754fbc8ebb0ab6;p=handbrake-jp%2Fhandbrake-jp-git.git

diff --git a/gtk/src/preview.c b/gtk/src/preview.c
index e85130e9..fc713f6d 100644
--- a/gtk/src/preview.c
+++ b/gtk/src/preview.c
@@ -62,6 +62,7 @@ struct preview_s
 	gint encode_frame;
 	gint live_id;
 	gchar *current;
+	gint live_enabled;
 };
 
 #if defined(_ENABLE_GST)
@@ -82,6 +83,9 @@ ghb_screen_par(signal_user_data_t *ud, gint *par_n, gint *par_d)
 	GObjectClass *klass;
 	GParamSpec *pspec;
 
+	if (!ud->preview->live_enabled)
+		goto fail;
+
 	g_value_init(&disp_par, GST_TYPE_FRACTION);
 	gst_value_set_fraction(&disp_par, 1, 1);
 	g_object_get(ud->preview->play, "video-sink", &xover, NULL);
@@ -160,6 +164,18 @@ ghb_preview_init(signal_user_data_t *ud)
 	GstBus *bus;
 	GstElement *xover;
 
+#if GTK_CHECK_VERSION(2,18,0)
+	if (!gdk_window_ensure_native(ud->preview->view->window))
+	{
+		g_message("Couldn't create native window for GstXOverlay. Disabling live preview.");
+		GtkWidget *widget = GHB_WIDGET(ud->builder, "live_preview_box");
+		gtk_widget_hide (widget);
+		widget = GHB_WIDGET(ud->builder, "live_preview_duration_box");
+		gtk_widget_hide (widget);
+		return;
+	}
+#endif
+
 #if !defined(_WIN32)
 	ud->preview->xid = GDK_DRAWABLE_XID(ud->preview->view->window);
 #else
@@ -169,26 +185,30 @@ ghb_preview_init(signal_user_data_t *ud)
 	//xover = gst_element_factory_make("xvimagesink", "xover");
 	//xover = gst_element_factory_make("ximagesink", "xover");
 	xover = gst_element_factory_make("gconfvideosink", "xover");
-	if (xover == NULL)
+	if (ud->preview->play == NULL || xover == NULL)
 	{
+		g_message("Couldn't initialize gstreamer. Disabling live preview.");
 		GtkWidget *widget = GHB_WIDGET(ud->builder, "live_preview_box");
 		gtk_widget_hide (widget);
 		widget = GHB_WIDGET(ud->builder, "live_preview_duration_box");
 		gtk_widget_hide (widget);
 		return;
 	}
+	else
+	{
 
-	g_object_set(G_OBJECT(ud->preview->play), "video-sink", xover, NULL);
-	g_object_set(ud->preview->play, "subtitle-font-desc", 
-				"sans bold 20", NULL);
-	//g_object_set(G_OBJECT(xover), "force-aspect-ratio", TRUE, NULL);
+		g_object_set(G_OBJECT(ud->preview->play), "video-sink", xover, NULL);
+		g_object_set(ud->preview->play, "subtitle-font-desc", 
+					"sans bold 20", NULL);
 
-	bus = gst_pipeline_get_bus(GST_PIPELINE(ud->preview->play));
-	gst_bus_add_watch(bus, live_preview_cb, ud);
-	gst_bus_set_sync_handler(bus, create_window, ud->preview);
-	gst_object_unref(bus);
+		bus = gst_pipeline_get_bus(GST_PIPELINE(ud->preview->play));
+		gst_bus_add_watch(bus, live_preview_cb, ud);
+		gst_bus_set_sync_handler(bus, create_window, ud->preview);
+		gst_object_unref(bus);
+		ud->preview->live_enabled = 1;
+	}
 #else
-	GtkWidget *widget = GHB_WIDGET(ud->builder, "live_preview_box");
+	widget = GHB_WIDGET(ud->builder, "live_preview_box");
 	gtk_widget_hide (widget);
 	widget = GHB_WIDGET(ud->builder, "live_preview_duration_box");
 	gtk_widget_hide (widget);
@@ -445,6 +465,9 @@ live_preview_start(signal_user_data_t *ud)
 	GtkImage *img;
 	gchar *uri;
 
+	if (!ud->preview->live_enabled)
+		return;
+
 	img = GTK_IMAGE(GHB_WIDGET(ud->builder, "live_preview_play_image"));
 	if (!ud->preview->encoded[ud->preview->frame])
 	{
@@ -468,6 +491,9 @@ live_preview_pause(signal_user_data_t *ud)
 {
 	GtkImage *img;
 
+	if (!ud->preview->live_enabled)
+		return;
+
 	img = GTK_IMAGE(GHB_WIDGET(ud->builder, "live_preview_play_image"));
 	gtk_image_set_from_stock(img, "gtk-media-play", GTK_ICON_SIZE_BUTTON);
 	gst_element_set_state(ud->preview->play, GST_STATE_PAUSED);
@@ -481,6 +507,9 @@ live_preview_stop(signal_user_data_t *ud)
 	GtkImage *img;
 	GtkRange *progress;
 
+	if (!ud->preview->live_enabled)
+		return;
+
 	img = GTK_IMAGE(GHB_WIDGET(ud->builder, "live_preview_play_image"));
 	gtk_image_set_from_stock(img, "gtk-media-play", GTK_ICON_SIZE_BUTTON);
 #if defined(_ENABLE_GST)
@@ -517,8 +546,6 @@ ghb_live_reset(signal_user_data_t *ud)
 		ghb_set_preview_image(ud);
 }
 
-extern void hb_get_tempory_directory(hb_handle_t *h, char path[512]);
-
 G_MODULE_EXPORT void
 live_preview_start_cb(GtkWidget *xwidget, signal_user_data_t *ud)
 {
@@ -605,6 +632,9 @@ ghb_live_preview_progress(signal_user_data_t *ud)
 	GstFormat fmt = GST_FORMAT_TIME;
 	gint64 len = -1, pos = -1;
 
+	if (!ud->preview->live_enabled)
+		return;
+
 	if (ud->preview->state != PREVIEW_STATE_LIVE || ud->preview->seek_lock)
 		return;
 
@@ -654,6 +684,9 @@ live_preview_seek_cb(GtkWidget *widget, signal_user_data_t *ud)
 	gdouble dval;
 	gint64 pos;
 
+	if (!ud->preview->live_enabled)
+		return;
+
 	if (ud->preview->progress_lock)
 		return;
 
@@ -757,6 +790,9 @@ delayed_expose_cb(signal_user_data_t *ud)
 	GstElement *vsink;
 	GstXOverlay *xover;
 
+	if (!ud->preview->live_enabled)
+		return FALSE;
+
 	g_object_get(ud->preview->play, "video-sink", &vsink, NULL);
 	if (vsink == NULL)
 		return FALSE;
@@ -780,7 +816,7 @@ preview_expose_cb(
 	signal_user_data_t *ud)
 {
 #if defined(_ENABLE_GST)
-	if (ud->preview->state == PREVIEW_STATE_LIVE)
+	if (ud->preview->live_enabled && ud->preview->state == PREVIEW_STATE_LIVE)
 	{
 		if (GST_STATE(ud->preview->play) >= GST_STATE_PAUSED)
 		{
@@ -877,7 +913,7 @@ preview_button_clicked_cb(GtkWidget *xwidget, signal_user_data_t *ud)
 	ghb_widget_to_setting (ud->settings, xwidget);
 	ghb_preview_set_visible(ud);
 	ghb_check_dependency(ud, xwidget, NULL);
-	const gchar *name = gtk_widget_get_name(xwidget);
+	const gchar *name = ghb_get_setting_key(xwidget);
 	ghb_pref_save(ud->settings, name);
 }
 
@@ -934,7 +970,7 @@ fullscreen_clicked_cb(GtkWidget *toggle, signal_user_data_t *ud)
 	g_debug("fullscreen_clicked_cb()");
 	ghb_widget_to_setting (ud->settings, toggle);
 	ghb_check_dependency(ud, toggle, NULL);
-	const gchar *name = gtk_widget_get_name(toggle);
+	const gchar *name = ghb_get_setting_key(toggle);
 	ghb_pref_save(ud->settings, name);
 
 	window = GTK_WINDOW(GHB_WIDGET (ud->builder, "preview_window"));
@@ -1030,7 +1066,7 @@ preview_duration_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
 	ghb_live_reset(ud);
 	ghb_widget_to_setting (ud->settings, widget);
 	ghb_check_dependency(ud, widget, NULL);
-	const gchar *name = gtk_widget_get_name(widget);
+	const gchar *name = ghb_get_setting_key(widget);
 	ghb_pref_save(ud->settings, name);
 }