mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-27 20:21:24 +00:00
Code Issues 1 Projects Releases Wiki Activity

examples: Fixes for compiling with GTK+ 3.0

Browse source 
camerabing example had a missing ')' and the fix to build against GTK+3
that was introduced in commit 516c977c76
is also applied to the camerabin2 example.

The scaletempo demo was using API which has been removed, so that's
wrapped in a version check.
This commit is contained in:
Arun Raghavan 2011-10-06 23:22:51 +05:30
parent f94236078c
commit 2c4bc6134c
3 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
tests/examples/camerabin/gst-camera.c
View file

@ -276,7 +276,7 @@ my_bus_sync_callback (GstBus * bus, GstMessage * message, gpointer data)
/* FIXME: make sure to get XID in main thread */ /* FIXME: make sure to get XID in main thread */
gst_x_overlay_set_window_handle (GST_X_OVERLAY (message->src), gst_x_overlay_set_window_handle (GST_X_OVERLAY (message->src),
#if GTK_CHECK_VERSION (2, 91, 6) #if GTK_CHECK_VERSION (2, 91, 6)
GDK_WINDOW_XID (gtk_widget_get_window (ui_drawing)); GDK_WINDOW_XID (gtk_widget_get_window (ui_drawing)));
#else #else
GDK_WINDOW_XWINDOW (gtk_widget_get_window (ui_drawing))); GDK_WINDOW_XWINDOW (gtk_widget_get_window (ui_drawing)));
#endif #endif

4
tests/examples/camerabin2/gst-camera2.c
View file

@ -98,7 +98,11 @@ bus_sync_callback (GstBus * bus, GstMessage * message, gpointer data)
/* FIXME: make sure to get XID in main thread */ /* FIXME: make sure to get XID in main thread */
ui_drawing = GTK_WIDGET (gtk_builder_get_object (builder, "viewfinderArea")); ui_drawing = GTK_WIDGET (gtk_builder_get_object (builder, "viewfinderArea"));
gst_x_overlay_set_window_handle (GST_X_OVERLAY (message->src), gst_x_overlay_set_window_handle (GST_X_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))); GDK_WINDOW_XWINDOW (gtk_widget_get_window (ui_drawing)));
#endif
gst_message_unref (message); gst_message_unref (message);
return GST_BUS_DROP; return GST_BUS_DROP;

2
tests/examples/scaletempo/demo-gui.c
View file

@ -1035,8 +1035,10 @@ demo_gui_show_func (DemoGui * gui)
seek_range = seek_range =
gtk_hscale_new (GTK_ADJUSTMENT (gtk_adjustment_new (0.0, 0.0, 0.0, 5.0, gtk_hscale_new (GTK_ADJUSTMENT (gtk_adjustment_new (0.0, 0.0, 0.0, 5.0,
30.0, 0.00))); 30.0, 0.00)));
#if !GTK_CHECK_VERSION (3, 0, 0)
gtk_range_set_update_policy (GTK_RANGE (seek_range), gtk_range_set_update_policy (GTK_RANGE (seek_range),
GTK_UPDATE_DISCONTINUOUS); GTK_UPDATE_DISCONTINUOUS);
#endif
seek_bar = gtk_hbox_new (FALSE, 0); seek_bar = gtk_hbox_new (FALSE, 0);
gtk_box_pack_start (GTK_BOX (seek_bar), amount_played, FALSE, FALSE, 2); gtk_box_pack_start (GTK_BOX (seek_bar), amount_played, FALSE, FALSE, 2);
gtk_box_pack_start (GTK_BOX (seek_bar), seek_range, TRUE, TRUE, 2); gtk_box_pack_start (GTK_BOX (seek_bar), seek_range, TRUE, TRUE, 2);