From: <wi...@fr...> - 2005-09-21 13:38:33
|
CVS Root: /cvs/gstreamer Module: gst-python Changes by: wingo Date: Wed Sep 21 2005 06:36:57 PDT Log message: 2005-09-21 Andy Wingo <wi...@po...> * gst/gst.defs: Update for probe removal api * gst/gstpad.override (_wrap_gst_pad_remove_data_probe) (_wrap_gst_pad_remove_event_probe) (_wrap_gst_pad_remove_buffer_probe): Removed, upstream does the right thing now. (_wrap_gst_pad_add_data_probe, _wrap_gst_pad_add_event_probe) (_wrap_gst_pad_add_buffer_probe): Indent. Modified files: . : ChangeLog gst : gst.defs gstpad.override Links: http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-python/ChangeLog.diff?r1=1.241&r2=1.242 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-python/gst/gst.defs.diff?r1=1.55&r2=1.56 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-python/gst/gstpad.override.diff?r1=1.11&r2=1.12 ====Begin Diffs==== Index: ChangeLog =================================================================== RCS file: /cvs/gstreamer/gst-python/ChangeLog,v retrieving revision 1.241 retrieving revision 1.242 diff -u -d -r1.241 -r1.242 --- ChangeLog 20 Sep 2005 14:50:53 -0000 1.241 +++ ChangeLog 21 Sep 2005 13:36:42 -0000 1.242 @@ -1,3 +1,14 @@ +2005-09-21 Andy Wingo <wi...@po...> + + * gst/gst.defs: Update for probe removal api + * gst/gstpad.override (_wrap_gst_pad_remove_data_probe) + (_wrap_gst_pad_remove_event_probe) + (_wrap_gst_pad_remove_buffer_probe): Removed, upstream does the + right thing now. + (_wrap_gst_pad_add_data_probe, _wrap_gst_pad_add_event_probe) + (_wrap_gst_pad_add_buffer_probe): Indent. 2005-09-20 Thomas Vander Stichele <thomas at apestaart dot org> * gst/gst.defs: Index: gst.defs RCS file: /cvs/gstreamer/gst-python/gst/gst.defs,v retrieving revision 1.55 retrieving revision 1.56 diff -u -d -r1.55 -r1.56 --- gst.defs 20 Sep 2005 14:50:54 -0000 1.55 +++ gst.defs 21 Sep 2005 13:36:45 -0000 1.56 @@ -3497,8 +3497,7 @@ (c-name "gst_pad_remove_data_probe") (return-type "none") (parameters - '("GCallback" "handler") - '("gpointer" "data") + '("guint" "handler_id") ) ) @@ -3517,8 +3516,7 @@ (c-name "gst_pad_remove_event_probe") @@ -3537,8 +3535,7 @@ (c-name "gst_pad_remove_buffer_probe") Index: gstpad.override RCS file: /cvs/gstreamer/gst-python/gst/gstpad.override,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- gstpad.override 8 Sep 2005 13:34:28 -0000 1.11 +++ gstpad.override 21 Sep 2005 13:36:45 -0000 1.12 @@ -598,20 +598,20 @@ len = PyTuple_Size(args); if (len < 1) { - PyErr_SetString(PyExc_TypeError, "Probe requires at least 1 arg"); - return NULL; + PyErr_SetString(PyExc_TypeError, "Probe requires at least 1 arg"); + return NULL; } callback = PySequence_GetItem(args, 0); if (!PyCallable_Check(callback)) { - PyErr_SetString(PyExc_TypeError, "callback is not callable"); + PyErr_SetString(PyExc_TypeError, "callback is not callable"); cbargs = PySequence_GetSlice(args, 1, len); if (cbargs == NULL) data = Py_BuildValue("(ON)", callback, cbargs); if (data == NULL) sigid = gst_pad_add_data_probe (GST_PAD (self->obj), (GCallback) probe_handler_marshal, data); return PyLong_FromUnsignedLong(sigid); @@ -628,20 +628,20 @@ sigid = gst_pad_add_event_probe (GST_PAD (self->obj), (GCallback) probe_handler_marshal, data); @@ -658,104 +658,25 @@ sigid = gst_pad_add_buffer_probe (GST_PAD (self->obj), (GCallback) probe_handler_marshal, data); } %% -override gst_pad_remove_data_probe kwargs -static PyObject * -_wrap_gst_pad_remove_data_probe(PyGObject *self, PyObject *args, PyObject *kwargs) -{ - static char *kwlist[] = { "signalid", NULL }; - gulong signalid; - GstPad *pad = GST_PAD (self->obj); - - if (!PyArg_ParseTupleAndKeywords(args, kwargs, - "k:GstPad.remove_data_probe", - kwlist, &signalid)) - GST_LOCK (pad); - if (!g_signal_handler_is_connected ((gpointer) pad, signalid)) { - GST_UNLOCK (pad); - Py_INCREF (Py_False); - return Py_False; - } - g_signal_handler_disconnect ((gpointer) pad, signalid); - GST_PAD_DO_BUFFER_SIGNALS (pad) -= 1; - GST_PAD_DO_EVENT_SIGNALS (pad) -= 1; - Py_INCREF (Py_True); - return Py_True; -} -%% -override gst_pad_remove_event_probe kwargs -_wrap_gst_pad_remove_event_probe(PyGObject *self, PyObject *args, PyObject *kwargs) - "k:GstPad.remove_event_probe", -override gst_pad_remove_buffer_probe kwargs -_wrap_gst_pad_remove_buffer_probe(PyGObject *self, PyObject *args, PyObject *kwargs) - "k:GstPad.remove_buffer_probe", override-slot GstPadTemplate.tp_getattr #define IS_ATTR(name) (strcmp (name, attr) == 0) PyObject * |