mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-12-25 09:40:37 +00:00
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.
This commit is contained in:
parent
9fcba18fa9
commit
2d3c19e231
5 changed files with 26 additions and 3 deletions
|
@ -1,5 +1,11 @@
|
||||||
2004-11-04 Johan Dahlin <johan@gnome.org>
|
2004-11-04 Johan Dahlin <johan@gnome.org>
|
||||||
|
|
||||||
|
* 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.
|
* gst/interfaces.override (_wrap_gst_mixer_list_tracks): Impl.
|
||||||
(_wrap_gst_tuner_list_norms, _wrap_gst_tuner_list_channels): Plug
|
(_wrap_gst_tuner_list_norms, _wrap_gst_tuner_list_channels): Plug
|
||||||
leaks.
|
leaks.
|
||||||
|
|
|
@ -8,7 +8,7 @@ dnl AM_MAINTAINER_MODE only provides the option to configure to enable it
|
||||||
AM_MAINTAINER_MODE
|
AM_MAINTAINER_MODE
|
||||||
|
|
||||||
dnl when going to/from release please set the nano (fourth number) right !
|
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)
|
AM_INIT_AUTOMAKE($PACKAGE, $VERSION)
|
||||||
|
|
||||||
|
|
|
@ -1,2 +1,3 @@
|
||||||
SUBDIRS = \
|
SUBDIRS = \
|
||||||
gst
|
gst \
|
||||||
|
gstplay
|
||||||
|
|
|
@ -877,3 +877,16 @@
|
||||||
(c-name "GstURIHandler")
|
(c-name "GstURIHandler")
|
||||||
(gtype-id "GST_TYPE_URI_HANDLER")
|
(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")
|
||||||
|
)
|
||||||
|
|
||||||
|
|
|
@ -33,6 +33,7 @@ headers
|
||||||
#include <gst/gstqueue.h>
|
#include <gst/gstqueue.h>
|
||||||
#include <gst/gsttypefind.h>
|
#include <gst/gsttypefind.h>
|
||||||
#include <gst/gsttag.h>
|
#include <gst/gsttag.h>
|
||||||
|
#include <gst/gsttaginterface.h>
|
||||||
|
|
||||||
extern gboolean pygst_data_from_pyobject (PyObject *object, GstData **data);
|
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);
|
PyErr_SetString(PyExc_KeyError, tag);
|
||||||
else if (count == 1)
|
else if (count == 1)
|
||||||
PyList_Append(py_list, PyString_FromString(tag));
|
PyList_Append(py_list, PyString_FromString(tag));
|
||||||
|
#if 0
|
||||||
else if (count > 1)
|
else if (count > 1)
|
||||||
PyErr_SetString(PyExc_TypeError, "lists are currently unspported");
|
PyErr_SetString(PyExc_TypeError, "lists are currently unspported");
|
||||||
|
#endif
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static PyObject*
|
static PyObject*
|
||||||
|
@ -544,7 +548,6 @@ _wrap_gst_tag_list_keys(PyGObject *self)
|
||||||
gst_tag_list_foreach(GST_TAG_LIST(self->obj),
|
gst_tag_list_foreach(GST_TAG_LIST(self->obj),
|
||||||
(GstTagForeachFunc)tag_foreach_func_list,
|
(GstTagForeachFunc)tag_foreach_func_list,
|
||||||
(gpointer)dict);
|
(gpointer)dict);
|
||||||
|
|
||||||
return dict;
|
return dict;
|
||||||
}
|
}
|
||||||
%%
|
%%
|
||||||
|
|
Loading…
Reference in a new issue