[gst-devel] Compilation error in "[gst-cvs] gst-plugins-bad: camerabin: fix for latest GTK+ API changes" ?

[Markus Vartiainen]

Hi,

I just skimmed through latest commits and could not help noticing that 
there is a typo in the variable "store" (it is written "sotre"):

 > +#if GTK_CHECK_VERSION (2, 91, 6)
 > +      GtkListStore *sotre;
 > +      GtkTreeIter iter;
 > +#endif

The variable is later used as "store", like this:

#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

To me it seems like this would not even compile, if the #if statements 
resolve to true, since there is no other variable "store" defined in the 
scope.

Regards,

   Markus Vartiainen


ext Stefan Kost wrote:
> Module: gst-plugins-bad
> Branch: master
> Commit: 516c977c76ba4cd86a7147aab7416a33d76f870f
> URL:    http://cgit.freedesktop.org/gstreamer/gst-plugins-bad/commit/?id=516c977c76ba4cd86a7147aab7416a33d76f870f
> 
> Author: Saleem Abdulrasool <compnerd at compnerd.org>
> Date:   Mon Dec 20 07:19:04 2010 -0800
> 
> camerabin: fix for latest GTK+ API changes
> 
> ---
> 
>  tests/examples/camerabin/gst-camera.c |   14 ++++++++++++++
>  1 files changed, 14 insertions(+), 0 deletions(-)
> 
> diff --git a/tests/examples/camerabin/gst-camera.c b/tests/examples/camerabin/gst-camera.c
> index c837ba5..e439bb8 100644
> --- a/tests/examples/camerabin/gst-camera.c
> +++ b/tests/examples/camerabin/gst-camera.c
> @@ -276,7 +276,11 @@ my_bus_sync_callback (GstBus * bus, GstMessage * message, gpointer data)
>  
>    /* FIXME: make sure to get XID in main thread */
>    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)));
> +#endif
>  
>    gst_message_unref (message);
>    return GST_BUS_DROP;
> @@ -1157,6 +1161,10 @@ create_menu_items_from_structure (GstStructure * structure)
>  
>      for (j = 0; j < num_framerates; j++) {
>        GstCaps *video_caps;
> +#if GTK_CHECK_VERSION (2, 91, 6)
> +      GtkListStore *sotre;
> +      GtkTreeIter iter;
> +#endif
>  
>        if (framerate_list) {
>          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 ")",
>            GST_FOURCC_ARGS (fourcc));
>        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);
> +#endif
>  
>        video_caps =
>            gst_caps_new_simple (structure_name, "format", GST_TYPE_FOURCC,
> 
> 
> ------------------------------------------------------------------------------
> Lotusphere 2011
> Register now for Lotusphere 2011 and learn how
> to connect the dots, take your collaborative environment
> to the next level, and enter the era of Social Business.
> http://p.sf.net/sfu/lotusphere-d2d
> _______________________________________________
> gstreamer-cvs mailing list
> gstreamer-cvs at lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/gstreamer-cvs