mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-04-26 06:54:49 +00:00
Code Issues 1 Projects Releases Wiki Activity

camerabin: fix for latest GTK+ API changes

Browse source
This commit is contained in:
Saleem Abdulrasool 2010-12-20 07:19:04 -08:00 committed by Stefan Kost
parent 54d6546bda
commit 516c977c76
1 changed files with 14 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -276,7 +276,11 @@ 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)
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;
@ -1157,6 +1161,10 @@ create_menu_items_from_structure (GstStructure * structure)
for (j = 0; j < num_framerates; j++) { for (j = 0; j < num_framerates; j++) {
GstCaps *video_caps; GstCaps *video_caps;
#if GTK_CHECK_VERSION (2, 91, 6)
GtkListStore *sotre;
GtkTreeIter iter;
#endif
if (framerate_list) { if (framerate_list) {
const GValue *item = gst_value_list_get_value (framerate_list, j); const GValue *item = gst_value_list_get_value (framerate_list, j);
@ -1167,7 +1175,13 @@ create_menu_items_from_structure (GstStructure * structure)
g_string_append_printf (item_str, " (%" GST_FOURCC_FORMAT ")", g_string_append_printf (item_str, " (%" GST_FOURCC_FORMAT ")",
GST_FOURCC_ARGS (fourcc)); GST_FOURCC_ARGS (fourcc));
g_string_append_printf (item_str, ", %dx%d at %d/%d", w, h, n, d); g_string_append_printf (item_str, ", %dx%d at %d/%d", w, h, n, d);
#if GTK_CHECK_VERSION (2, 91, 6)
store = GTK_LIST_STORE (gtk_combo_box_get_model (ui_cbbox_resolution));
gtk_list_store_append (store, &iter);
gtk_list_store_set (store, &iter, 0, item_str->str, -1);
#else
gtk_combo_box_append_text (ui_cbbox_resolution, item_str->str); gtk_combo_box_append_text (ui_cbbox_resolution, item_str->str);
#endif
video_caps = video_caps =
gst_caps_new_simple (structure_name, "format", GST_TYPE_FOURCC, gst_caps_new_simple (structure_name, "format", GST_TYPE_FOURCC,