From a1a58d438f005bcecc533babc0f4e296ce892e89 Mon Sep 17 00:00:00 2001 From: Thiago Santos Date: Mon, 27 Apr 2015 15:41:04 -0300 Subject: [PATCH] examples: gst-camera: update to GTK3 When opening the .ui file it complains about being for GTK 2 and automatically updates it to GTK3. Commit this version and update the makefile --- tests/examples/camerabin2/Makefile.am | 6 +++--- tests/examples/camerabin2/gst-camera2.c | 11 ----------- tests/examples/camerabin2/gst-camera2.ui | 9 ++++----- 3 files changed, 7 insertions(+), 19 deletions(-) diff --git a/tests/examples/camerabin2/Makefile.am b/tests/examples/camerabin2/Makefile.am index d29e6792bf..56f5769a62 100644 --- a/tests/examples/camerabin2/Makefile.am +++ b/tests/examples/camerabin2/Makefile.am @@ -2,7 +2,7 @@ GST_CAMERABIN_UI_FILES = gst-camera2.ui AM_CPPFLAGS = -DCAMERA_APPS_UIDIR=\""$(srcdir)"\" -if HAVE_GTK +if HAVE_GTK3 GST_CAMERABIN_GTK_EXAMPLES = gst-camera2 @@ -10,7 +10,7 @@ gst_camera2_SOURCES = gst-camera2.h gst-camera2.c gst_camera2_CFLAGS = \ $(GST_PLUGINS_BAD_CFLAGS) \ $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) \ - $(GTK_CFLAGS) \ + $(GTK3_CFLAGS) \ $(GMODULE_EXPORT_CFLAGS) \ -DGST_USE_UNSTABLE_API gst_camera2_LDADD = \ @@ -21,7 +21,7 @@ gst_camera2_LDADD = \ -lgstpbutils-@GST_API_VERSION@ \ -lgstvideo-@GST_API_VERSION@ \ $(GST_LIBS) \ - $(GTK_LIBS) \ + $(GTK3_LIBS) \ $(GMODULE_EXPORT_LIBS) noinst_DATA = $(GST_CAMERABIN_UI_FILES) diff --git a/tests/examples/camerabin2/gst-camera2.c b/tests/examples/camerabin2/gst-camera2.c index 0bb986930b..0b656a54c2 100644 --- a/tests/examples/camerabin2/gst-camera2.c +++ b/tests/examples/camerabin2/gst-camera2.c @@ -170,9 +170,7 @@ on_videoRButton_toggled (GtkToggleButton * button, gpointer user_data) void on_viewfinderArea_realize (GtkWidget * widget, gpointer data) { -#if GTK_CHECK_VERSION (2, 18, 0) gdk_window_ensure_native (gtk_widget_get_window (widget)); -#endif } void @@ -219,11 +217,7 @@ bus_sync_callback (GstBus * bus, GstMessage * message, gpointer data) /* FIXME: make sure to get XID in main thread */ ui_drawing = GTK_WIDGET (gtk_builder_get_object (builder, "viewfinderArea")); gst_video_overlay_set_window_handle (GST_VIDEO_OVERLAY (message->src), -#if GTK_CHECK_VERSION (2, 91, 6) GDK_WINDOW_XID (gtk_widget_get_window (ui_drawing))); -#else - GDK_WINDOW_XWINDOW (gtk_widget_get_window (ui_drawing))); -#endif gst_message_unref (message); return GST_BUS_DROP; @@ -276,7 +270,6 @@ bus_callback (GstBus * bus, GstMessage * message, gpointer data) static gboolean init_gtkwidgets_data (void) { -#if GTK_CHECK_VERSION(2,24,0) gint i; GtkComboBoxText *combobox = GTK_COMBO_BOX_TEXT (gtk_builder_get_object (builder, "formatComboBox")); @@ -291,10 +284,6 @@ init_gtkwidgets_data (void) /* default to the first one -> ogg */ gtk_combo_box_set_active (GTK_COMBO_BOX (combobox), 0); return TRUE; -#else - g_warning ("This needs a newer version of GTK (2.24 at least)"); - return FALSE; -#endif } int diff --git a/tests/examples/camerabin2/gst-camera2.ui b/tests/examples/camerabin2/gst-camera2.ui index 9dc1fee3d5..3e1cd4ea34 100644 --- a/tests/examples/camerabin2/gst-camera2.ui +++ b/tests/examples/camerabin2/gst-camera2.ui @@ -1,6 +1,7 @@ + - + False 800 @@ -21,7 +22,7 @@ True True False - False + 0.5 True True @@ -39,7 +40,7 @@ True True False - False + 0.5 True True imageRButton @@ -97,7 +98,6 @@ True True True - False @@ -113,7 +113,6 @@ True True True - False