From ff6728de7b4f3c845914a8492a2c8cacf6fa2418 Mon Sep 17 00:00:00 2001 From: Edward Hervey Date: Wed, 28 Sep 2005 17:08:11 +0000 Subject: [PATCH] gst/: Updated definitions Original commit message from CVS: * gst/gst.defs: * gst/libs.defs: Updated definitions * gst/gst.override: * gst/gststructure.override: Added functions not to be used from python, or that have better existing equivalents, to the ignore list. --- ChangeLog | 10 +++++++ gst/gst.defs | 6 ++--- gst/gst.override | 2 ++ gst/gststructure.override | 57 +++++++++++---------------------------- gst/libs.defs | 11 +++++++- 5 files changed, 40 insertions(+), 46 deletions(-) diff --git a/ChangeLog b/ChangeLog index 959484f1fb..c05eec781c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2005-09-28 Edward Hervey + + * gst/gst.defs: + * gst/libs.defs: + Updated definitions + * gst/gst.override: + * gst/gststructure.override: + Added functions not to be used from python, or that have better + existing equivalents, to the ignore list. + 2005-09-28 Thomas Vander Stichele * testsuite/common.py: diff --git a/gst/gst.defs b/gst/gst.defs index d921d3bad4..9d63a8d993 100644 --- a/gst/gst.defs +++ b/gst/gst.defs @@ -842,9 +842,9 @@ (return-type "gboolean") ) -(define-method get_clock +(define-method provide_clock (of-object "GstElement") - (c-name "gst_element_get_clock") + (c-name "gst_element_provide_clock") (return-type "GstClock*") (caller-owns-return #t) ) @@ -1186,7 +1186,7 @@ ) ) -(define-virtual get_clock +(define-virtual provide_clock (of-object "GstElement") (return-type "GstClock*") ) diff --git a/gst/gst.override b/gst/gst.override index 7d6964718f..497cfa22b8 100644 --- a/gst/gst.override +++ b/gst/gst.override @@ -302,6 +302,8 @@ ignore gst_error_get_message gst_parse_launchv gst_trace_read_tsc + gst_debug_log + gst_debug_log_default %% override-slot GstPluginFeature.tp_repr static PyObject * diff --git a/gst/gststructure.override b/gst/gststructure.override index 9b119ea5e9..d3af6c7471 100644 --- a/gst/gststructure.override +++ b/gst/gststructure.override @@ -20,6 +20,21 @@ * Author: Johan Dahlin */ %% +ignore + gst_structure_get_boolean + gst_structure_get_int + gst_structure_get_fourcc + gst_structure_get_double + gst_structure_get_date + gst_structure_get_clock_time + gst_structure_get_string + gst_structure_get_value + gst_structure_set + gst_structure_get_name_id + gst_structure_id_get_value + gst_structure_id_set_value + gst_structure_set_parent_refcount +%% override gst_structure_new kwargs static int _wrap_gst_structure_new(PyGBoxed *self, PyObject *args, PyObject *kwargs) @@ -110,48 +125,6 @@ _wrap_gst_structure_set_value(PyObject *self, PyObject *args, PyObject *kwargs) return Py_None; } %% -override gst_structure_get_int kwargs -static PyObject * -_wrap_gst_structure_get_int(PyObject *self, PyObject *args, PyObject *kwargs) -{ - static char *kwlist[] = { "fieldname", NULL }; - char *fieldname; - int value; - - if (!PyArg_ParseTupleAndKeywords(args, kwargs, - "s:GstStructure.get_int", - kwlist, &fieldname)) - return NULL; - - if (gst_structure_get_int(pyg_boxed_get(self, GstStructure), fieldname, &value)) - return PyInt_FromLong(value); - - /* XXX: Raise exception? */ - Py_INCREF(Py_None); - return Py_None; -} -%% -override gst_structure_get_double kwargs -static PyObject * -_wrap_gst_structure_get_double(PyObject *self, PyObject *args, PyObject *kwargs) -{ - static char *kwlist[] = { "fieldname", NULL }; - char *fieldname; - gdouble value; - - if (!PyArg_ParseTupleAndKeywords(args, kwargs, - "s:GstStructure.get_double", - kwlist, &fieldname)) - return NULL; - - if (gst_structure_get_double(pyg_boxed_get(self, GstStructure), fieldname, &value)) - return PyFloat_FromDouble(value); - - /* XXX: Raise exception? */ - Py_INCREF(Py_None); - return Py_None; -} -%% define GstStructure.has_key args static PyObject* _wrap_gst_structure_has_key(PyGObject *self, PyObject *args) diff --git a/gst/libs.defs b/gst/libs.defs index 85b11a5829..a330b43c7d 100644 --- a/gst/libs.defs +++ b/gst/libs.defs @@ -61,9 +61,18 @@ ) ) +(define-function gst_controller_new_list + (c-name "gst_controller_new_list") + (is-constructor-of "GstController") + (return-type "GstController*") + (parameters + '("GObject*" "object") + '("GList*" "list") + ) +) + (define-function gst_controller_new (c-name "gst_controller_new") - (is-constructor-of "GstController") (return-type "GstController*") (parameters '("GObject*" "object")