From 2d3c19e231b485c640d554fce1ddf1aad4ec9248 Mon Sep 17 00:00:00 2001 From: Johan Dahlin Date: Thu, 4 Nov 2004 15:31:11 +0000 Subject: [PATCH] gst/gst.override (tag_foreach_func_list): Disable lists instead of raising an exception. Original commit message from CVS: * gst/gst.override (tag_foreach_func_list): Disable lists instead of raising an exception. * gst/gst-types.defs (ImplementsInterface, TagSetter): Define these here. --- ChangeLog | 6 ++++++ configure.ac | 2 +- examples/Makefile.am | 3 ++- gst/gst-types.defs | 13 +++++++++++++ gst/gst.override | 5 ++++- 5 files changed, 26 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4c9d1d3..e86c95d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,11 @@ 2004-11-04 Johan Dahlin + * gst/gst.override (tag_foreach_func_list): Disable lists instead + of raising an exception. + + * gst/gst-types.defs (ImplementsInterface, TagSetter): Define + these here. + * gst/interfaces.override (_wrap_gst_mixer_list_tracks): Impl. (_wrap_gst_tuner_list_norms, _wrap_gst_tuner_list_channels): Plug leaks. diff --git a/configure.ac b/configure.ac index 99a1178..ef167a6 100644 --- a/configure.ac +++ b/configure.ac @@ -8,7 +8,7 @@ dnl AM_MAINTAINER_MODE only provides the option to configure to enable it AM_MAINTAINER_MODE dnl when going to/from release please set the nano (fourth number) right ! -AS_VERSION(gst-python, PYGST_VERSION, 0, 7, 93, 0, GST_CVS="no", GST_CVS="yes") +AS_VERSION(gst-python, PYGST_VERSION, 0, 7, 94, 0, GST_CVS="no", GST_CVS="yes") AM_INIT_AUTOMAKE($PACKAGE, $VERSION) diff --git a/examples/Makefile.am b/examples/Makefile.am index 04bf732..e228a74 100644 --- a/examples/Makefile.am +++ b/examples/Makefile.am @@ -1,2 +1,3 @@ SUBDIRS = \ - gst + gst \ + gstplay diff --git a/gst/gst-types.defs b/gst/gst-types.defs index c4e1d4c..651e579 100644 --- a/gst/gst-types.defs +++ b/gst/gst-types.defs @@ -877,3 +877,16 @@ (c-name "GstURIHandler") (gtype-id "GST_TYPE_URI_HANDLER") ) + +(define-interface TagSetter + (in-module "Gst") + (c-name "GstTagSetter") + (gtype-id "GST_TYPE_TAG_SETTER") +) + +(define-interface ImplementsInterface + (in-module "Gst") + (c-name "GstImplementsInterface") + (gtype-id "GST_TYPE_IMPLEMENTS_INTERFACE") +) + diff --git a/gst/gst.override b/gst/gst.override index b0c3f8a..a4091ac 100644 --- a/gst/gst.override +++ b/gst/gst.override @@ -33,6 +33,7 @@ headers #include #include #include +#include extern gboolean pygst_data_from_pyobject (PyObject *object, GstData **data); @@ -530,8 +531,11 @@ tag_foreach_func_list (const GstTagList *list, PyErr_SetString(PyExc_KeyError, tag); else if (count == 1) PyList_Append(py_list, PyString_FromString(tag)); +#if 0 else if (count > 1) PyErr_SetString(PyExc_TypeError, "lists are currently unspported"); +#endif + } static PyObject* @@ -544,7 +548,6 @@ _wrap_gst_tag_list_keys(PyGObject *self) gst_tag_list_foreach(GST_TAG_LIST(self->obj), (GstTagForeachFunc)tag_foreach_func_list, (gpointer)dict); - return dict; } %% -- 2.7.4