From 7721fb42755c9d3ffc5d0db3666ea44dce2f9b4d Mon Sep 17 00:00:00 2001 From: Johan Dahlin Date: Tue, 16 Mar 2004 17:57:18 +0000 Subject: [PATCH] gst/gst.defs (element_make_from_uri): Remove const from enum here, should be fixed upstream too. Original commit message from CVS: * gst/gst.defs (element_make_from_uri): Remove const from enum here, should be fixed upstream too. * gst/gst.override (_wrap_gst_bin_remove_many) (_wrap_gst_element_unlink_many): Impl. (_wrap_gst_element_get_pad_list): Impl. : Add a number of new ignores for functions/methods we won't wrap anyway --- ChangeLog | 10 +++++ gst/gst.defs | 2 +- gst/gst.override | 134 +++++++++++++++++++++++++++++++++++++++++++++++++++++-- 3 files changed, 141 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9efb809..6db19cb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2004-03-16 Johan Dahlin + + * gst/gst.defs (element_make_from_uri): Remove const from enum + here, should be fixed upstream too. + + * gst/gst.override (_wrap_gst_bin_remove_many) + (_wrap_gst_element_unlink_many): Impl. + (_wrap_gst_element_get_pad_list): Impl. + : Add a number of new ignores for functions/methods we won't wrap anyway + 2004-03-15 Johan Dahlin * gst/*: Move interfaces over here, make it build, remove gstreamer.py diff --git a/gst/gst.defs b/gst/gst.defs index 7fcb652..b87947c 100644 --- a/gst/gst.defs +++ b/gst/gst.defs @@ -5646,7 +5646,7 @@ (c-name "gst_element_make_from_uri") (return-type "GstElement*") (parameters - '("const-GstURIType" "type") + '("GstURIType" "type") '("const-gchar*" "uri") '("const-gchar*" "elementname") ) diff --git a/gst/gst.override b/gst/gst.override index 30d52c0..1074114 100644 --- a/gst/gst.override +++ b/gst/gst.override @@ -62,15 +62,46 @@ import gobject.GObject as PyGObject_Type %% ignore-glob _* - gstreamer_*init - *_get_type *_copy + *_error_quark *_free - *_valist + *_get_type *_private + *_thyself + *_valist + gst_class_* + gst_debug_* + gst_init* + gst_interface_* gst_registry_* - gst_value_* gst_tag_list_get_* + gst_value_* + gst_xml_* +%% +ignore + gst_alloc_trace_list + gst_alloc_trace_get + gst_caps_new_simple + gst_caps_new_full + gst_caps_set_simple + gst_element_get + gst_element_set + gst_element_get_property + gst_element_set_property + gst_error_get_message + gst_event_new_discontinuous + gst_object_default_deep_notify + gst_object_check_uniqueness + gst_object_replace + gst_pad_select + gst_pad_selectv + gst_pad_load_and_link + gst_parse_launchv + gst_tag_list_add + gst_tag_list_add_values + gst_tag_list_add_valist_values + gst_tag_list_copy_value + gst_trace_read_tsc %% override gst_buffer_get_data static PyObject* @@ -125,6 +156,24 @@ _wrap_gst_bin_iterate(PyGObject *self) return PyInt_FromLong(ret); } %% +override gst_element_get_pad_list noargs +static PyObject * +_wrap_gst_element_get_pad_list(PyGObject *self) +{ + GList *l, *pads; + PyObject *list; + + pads = GST_ELEMENT_PADS(GST_ELEMENT(self->obj)); + + list = PyList_New(0); + for (l = pads; l; l = l->next) { + GstPad *pad = (GstPad*)l->data; + PyList_Append(list, pygobject_new(G_OBJECT(pad))); + } + + return list; +} +%% override gst_element_set_state kwargs static PyObject * _wrap_gst_element_set_state(PyGObject *self, PyObject *args, PyObject *kwargs) @@ -246,6 +295,38 @@ _wrap_gst_bin_add_many(PyGObject *self, PyObject *args) return Py_None; } %% +override gst_bin_remove_many args +static PyObject * +_wrap_gst_bin_remove_many(PyGObject *self, PyObject *args) +{ + PyGObject *element; + int i, len; + + len = PyTuple_Size(args); + if (len == 0) { + PyErr_SetString(PyExc_TypeError, "GstBin.remove_many requires at least one argument"); + return NULL; + } + + + for (i = 0; i < len; i++) { + element = (PyGObject*)PyTuple_GetItem(args, i); + if (!pygobject_check(element, &PyGstElement_Type)) + { + PyErr_SetString(PyExc_TypeError, "argument must be a GstElement"); + return NULL; + } + } + + for (i = 0; i < len; i++) { + element = (PyGObject*)PyTuple_GetItem(args, i); + gst_bin_remove(GST_BIN(self->obj), GST_ELEMENT(element->obj)); + } + + Py_INCREF(Py_None); + return Py_None; +} +%% override gst_element_link_many args static PyObject * _wrap_gst_element_link_many(PyObject *self, PyObject *args) @@ -293,6 +374,51 @@ _wrap_gst_element_link_many(PyObject *self, PyObject *args) return PyInt_FromLong(1); } %% +override gst_element_unlink_many args +static PyObject * +_wrap_gst_element_unlink_many(PyObject *self, PyObject *args) +{ + PyGObject *element, *element2; + int i, len; + + len = PyTuple_Size(args); + if (len < 2) + { + PyErr_SetString(PyExc_TypeError, "gst.element_unlink_many requires at least two argument"); + return NULL; + } + + + for (i = 0; i < len; i++) + { + element = (PyGObject*)PyTuple_GetItem(args, i); + if (!pygobject_check(element, &PyGstElement_Type)) + { + PyErr_SetString(PyExc_TypeError, "argument must be a GstElement"); + return NULL; + } + } + + /* Mimic the real gst_element_unlink_many */ + element = (PyGObject*)PyTuple_GetItem(args, 0); + element2 = (PyGObject*)PyTuple_GetItem(args, 1); + + i = 2; + while (1) { + gst_element_unlink(GST_ELEMENT(element->obj), GST_ELEMENT(element2->obj)); + + if (i >= len) + break; + + element = element2; + element2 = (PyGObject*)PyTuple_GetItem(args, i); + + i++; + } + + return PyInt_FromLong(1); +} +%% override-slot GstBuffer.tp_getattr PyObject * _wrap_gst_buffer_tp_getattr(PyGObject *self, char *attr) -- 2.7.4