From 6992f7de67fdd5d7296b8cf1596e9d4e542bf2fd Mon Sep 17 00:00:00 2001 From: Edward Hervey Date: Mon, 3 Jul 2006 09:31:26 +0000 Subject: [PATCH] gst/gstmessage.override: State change is a list and not a tuple Original commit message from CVS: * gst/gstmessage.override: State change is a list and not a tuple * gst/gstpad.override: query_position() got busted in previous commit. --- ChangeLog | 7 +++++++ gst/gstmessage.override | 2 +- gst/gstpad.override | 26 ++++++++++++++++++++++++++ 3 files changed, 34 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 3cf4763a0b..70c5ec4886 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2006-07-03 Edward Hervey + + * gst/gstmessage.override: + State change is a list and not a tuple + * gst/gstpad.override: + query_position() got busted in previous commit. + 2006-07-03 Johan Dahlin reviewed by: Edward Hervey diff --git a/gst/gstmessage.override b/gst/gstmessage.override index 73cb630380..486138b28c 100644 --- a/gst/gstmessage.override +++ b/gst/gstmessage.override @@ -64,7 +64,7 @@ _wrap_gst_message_parse_state_changed (PyGstMiniObject *self) } gst_message_parse_state_changed (GST_MESSAGE(self->obj), &old, &new, &pen); - return Py_BuildValue("(OOO)", + return Py_BuildValue("[OOO]", pyg_enum_from_gtype(GST_TYPE_STATE, old), pyg_enum_from_gtype(GST_TYPE_STATE, new), pyg_enum_from_gtype(GST_TYPE_STATE, pen)); diff --git a/gst/gstpad.override b/gst/gstpad.override index c0d480af42..f042cd9529 100644 --- a/gst/gstpad.override +++ b/gst/gstpad.override @@ -690,6 +690,32 @@ _wrap_gst_pad_query_position (PyGObject *self, PyObject *args) return ret; } %% +override gst_pad_query_duration args +static PyObject * +_wrap_gst_pad_query_duration (PyGObject *self, PyObject *args) +{ + gint64 cur; + gint format; + PyObject *pformat; + PyObject *ret; + + pformat = (PyObject*)PyTuple_GetItem(args, 0); + if (pyg_enum_get_value (GST_TYPE_FORMAT, pformat, &format)) { + PyErr_SetString(PyExc_TypeError, "argument should be a GstFormat"); + return NULL; + } + + if ((gst_pad_query_duration(GST_PAD (self->obj), (GstFormat*) &format, &cur))) { + ret = Py_BuildValue("(LO)", cur, + pyg_enum_from_gtype (GST_TYPE_FORMAT, format)); + } else { + Py_INCREF(Py_None); + ret = Py_None; + } + + return ret; +} +%% override gst_pad_query_convert kwargs static PyObject * _wrap_gst_pad_query_convert (PyGObject *self, PyObject *args, PyObject *kwargs)