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: fix gtk3 code path in camerabin example app

Browse source 
Just add rows via the combobox's model, which should work with
both gtk2 and gtk3, instead of using the gtk_combo_box_append_text()
convenience API (which was renamed to gtk_combo_box_text_append_text()).
Fixes compilation against gtk3 (there was a typo in the list store
variable name, spotted by Markus Vartiainen).
This commit is contained in:
Tim-Philipp Müller 2010-12-26 17:07:38 +00:00
parent 74d82c4c1e
commit f90b8bdfa0
1 changed files with 2 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1105,6 +1105,7 @@ format_value_callback (GtkScale * scale, gdouble value, gpointer user_data)
static gint static gint
create_menu_items_from_structure (GstStructure * structure) create_menu_items_from_structure (GstStructure * structure)
{ {
GtkListStore *store;
const GValue *framerate_list = NULL; const GValue *framerate_list = NULL;
const gchar *structure_name; const gchar *structure_name;
GString *item_str = NULL; GString *item_str = NULL;
@ -1159,12 +1160,10 @@ create_menu_items_from_structure (GstStructure * structure)
goto range_found; goto range_found;
} }
store = GTK_LIST_STORE (gtk_combo_box_get_model (ui_cbbox_resolution));
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; 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);
@ -1175,13 +1174,8 @@ 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_append (store, &iter);
gtk_list_store_set (store, &iter, 0, item_str->str, -1); gtk_list_store_set (store, &iter, 0, item_str->str, -1);
#else
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,