gint encode_frame;
gint live_id;
gchar *current;
+ gint live_enabled;
};
#if defined(_ENABLE_GST)
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);
void
ghb_preview_init(signal_user_data_t *ud)
{
+ GtkWidget *widget;
+
ud->preview = g_malloc0(sizeof(preview_t));
ud->preview->view = GHB_WIDGET(ud->builder, "preview_image");
gtk_widget_realize(ud->preview->view);
ud->preview->pause = TRUE;
ud->preview->encode_frame = -1;
ud->preview->live_id = -1;
-
+ widget = GHB_WIDGET (ud->builder, "preview_button_image");
+ gtk_widget_get_size_request(widget, &ud->preview->button_width, &ud->preview->button_height);
+
#if defined(_ENABLE_GST)
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
//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);
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])
{
{
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);
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)
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)
{
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;
gdouble dval;
gint64 pos;
+ if (!ud->preview->live_enabled)
+ return;
+
if (ud->preview->progress_lock)
return;
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;
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)
{
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);
}
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"));
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);
}