diff --git a/ChangeLog b/ChangeLog index 76d7f4a1e8..cdc4fedd4a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2006-04-07 Andy Wingo + + * gst/arg-types.py (GstCapsArg.beforenull): py_caps can be NULL if + it is an optional argument. Translate this python non-value to the + C NULL. + + * gst/gst.defs (get_compatible_pad): Filter caps is optional and + can be None. It defaults to None. + 2006-04-07 Edward Hervey * Makefile.am: diff --git a/gst/arg-types.py b/gst/arg-types.py index c561b26ec5..6fa9efb5d3 100644 --- a/gst/arg-types.py +++ b/gst/arg-types.py @@ -84,7 +84,7 @@ class GstCapsArg(ArgType): before = (' %(name)s = pygst_caps_from_pyobject (py_%(name)s, %(namecopy)s);\n' ' if (PyErr_Occurred())\n' ' return NULL;\n') - beforenull = (' if (py_%(name)s == Py_None)\n' + beforenull = (' if (py_%(name)s == Py_None || py_%(name)s == NULL)\n' ' %(name)s = NULL;\n' ' else\n' ' ' + before) diff --git a/gst/gst.defs b/gst/gst.defs index 315142975b..05cc62a9fb 100644 --- a/gst/gst.defs +++ b/gst/gst.defs @@ -6320,7 +6320,7 @@ (return-type "GstPad*") (parameters '("GstPad*" "pad") - '("const-GstCaps*" "caps") + '("const-GstCaps*" "caps" (null-ok) (default "NULL")) ) )