mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-20 15:27:07 +00:00
Code Issues 1 Projects Releases Wiki Activity

Merge branch 'master' of ssh://thomasvs@git.freedesktop.org/git/gstreamer/gst-python into bz-577735

Browse source
This commit is contained in:
Thomas Vander Stichele 2009-04-10 15:43:35 +02:00
commit a397586060
5 changed files with 25 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
common

@ -1 +1 @@
Subproject commit f8b3d9167a75c5acb514d43173d8d29d413a6e9c
Subproject commit b3941ea131db2d85d339a6bcf500a58bd63df0d5

4
gst/gst.defs
View file

@ -6257,8 +6257,8 @@
)
)
(define-function tag_get_type
(c-name "gst_tag_get_type")
(define-function tag_get_tag_type
(c-name "gst_tag_get_tag_type")
(return-type "GType")
(parameters
'("const-gchar*" "tag")

6
gst/gst.override
View file

@ -241,6 +241,12 @@ pygst_debug_log (PyObject *pyobject, PyObject *string, GstDebugLevel level,
return Py_None;
}
GType
gst_tag_get_tag_type (const gchar * tag)
{
return gst_tag_get_type (tag);
}
%%
include
gstbin.override

4
gst/gstobject.override
View file

@ -47,7 +47,9 @@ _wrap_gst_object_tp_repr (PyObject * self)
repr = g_strdup_printf ("<%s object (%s) at 0x%lx>",
self->ob_type->tp_name,
GST_OBJECT_NAME (object) ? GST_OBJECT_NAME (object) : "unnamed",
object ? (
GST_OBJECT_NAME (object) ? GST_OBJECT_NAME (object) : "unnamed"
) : "(null)",
(long) self);
ret = PyString_FromString (repr);
g_free (repr);

25
pygst.py.in
View file

@ -5,21 +5,22 @@
#
# pygst.py: pygst version selection code.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Library General Public
# License as published by the Free Software Foundation; either
# version 2 of the License, or (at your option) any later version.
#
# This library is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
# Library General Public License for more details.
#
# You should have received a copy of the GNU Library General Public
# License along with this library; if not, write to the
# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
# Boston, MA 02111-1307, USA.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
# USA
# This allows parallel installation of gst-python
#
# In order to have backward compatibility