From: Ronald B. <rb...@us...> - 2002-05-03 09:34:21
|
CVS Root: /cvsroot/gstreamer Module: gstreamer Changes by: rbultje Date: Fri May 03 2002 02:34:19 PDT Log message: Header file fix (these ## are needed for multi-arguments) and a fix for gst_props_get() if safe = FALSE (we still need three arguments per fetch) Modified files: gst : gstcaps.h gstprops.c Links: http://cvs.sf.net/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/gst/gstcaps.h.diff?r1=1.36&r2=1.37 http://cvs.sf.net/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/gst/gstprops.c.diff?r1=1.57&r2=1.58 ====Begin Diffs==== Index: gstcaps.h =================================================================== RCS file: /cvsroot/gstreamer/gstreamer/gst/gstcaps.h,v retrieving revision 1.36 retrieving revision 1.37 diff -u -d -r1.36 -r1.37 --- gstcaps.h 12 Apr 2002 09:36:52 -0000 1.36 +++ gstcaps.h 3 May 2002 09:34:07 -0000 1.37 @@ -112,8 +112,8 @@ GstCaps* gst_caps_set_props (GstCaps *caps, GstProps *props); GstProps* gst_caps_get_props (GstCaps *caps); -#define gst_caps_set(caps, name, args...) gst_props_set ((caps)->properties, name, args) -#define gst_caps_get(caps, name, args...) gst_props_get ((caps)->properties, name, args) +#define gst_caps_set(caps, name, args...) gst_props_set ((caps)->properties, name, ##args) +#define gst_caps_get(caps, name, args...) gst_props_get ((caps)->properties, name, ##args) #define gst_caps_get_int(caps,name,res) gst_props_entry_get_int(gst_props_get_entry((caps)->properties,name),res) #define gst_caps_get_float(caps,name,res) gst_props_entry_get_float(gst_props_get_entry((caps)->properties,name),res) Index: gstprops.c =================================================================== RCS file: /cvsroot/gstreamer/gstreamer/gst/gstprops.c,v retrieving revision 1.57 retrieving revision 1.58 diff -u -d -r1.57 -r1.58 --- gstprops.c 1 May 2002 19:38:58 -0000 1.57 +++ gstprops.c 3 May 2002 09:34:07 -0000 1.58 @@ -193,10 +193,11 @@ #define GST_PROPS_ENTRY_READ(entry, var_args, safe, result) \ G_STMT_START { \ + GstPropsType propstype = va_arg (var_args, GstPropsType); \ + \ *result = TRUE; \ \ if (safe) { \ - GstPropsType propstype = va_arg (var_args, GstPropsType); \ if (propstype != entry->propstype) { \ *result = FALSE; \ } \ |