configure.ac (PYGST_MICRO_VERSION): Doc fix.

Original commit message from CVS:
2006-04-05  Andy Wingo  <wingo@pobox.com>

* configure.ac (PYGST_MICRO_VERSION): Doc fix.
(PYGST_NANO_VERSION): New define.

* gst/__init__.py (version): Add as an alias for get_gst_version.
Should use the deprecation infrastructure here.

* gst/gst.defs: Add defs for the new wrapped functions.

* gst/gst.override (_wrap_gst_get_pygst_version)
(_wrap_gst_get_gst_version): New overrides, functions to access
the gstreamer and pygst versions. The first used to be called
gst_version(); we ignore gst_version now.
This commit is contained in:
Andy Wingo 2006-04-05 11:55:48 +00:00
parent fda4bddb99
commit b3fb726a67
5 changed files with 41 additions and 3 deletions

View file

@ -1,5 +1,18 @@
2006-04-05 Andy Wingo <wingo@pobox.com> 2006-04-05 Andy Wingo <wingo@pobox.com>
* configure.ac (PYGST_MICRO_VERSION): Doc fix.
(PYGST_NANO_VERSION): New define.
* gst/__init__.py (version): Add as an alias for get_gst_version.
Should use the deprecation infrastructure here.
* gst/gst.defs: Add defs for the new wrapped functions.
* gst/gst.override (_wrap_gst_get_pygst_version)
(_wrap_gst_get_gst_version): New overrides, functions to access
the gstreamer and pygst versions. The first used to be called
gst_version(); we ignore gst_version now.
* gst/gstpad.override (_wrap_gst_pad_set_blocked_async): * gst/gstpad.override (_wrap_gst_pad_set_blocked_async):
PyObject_IsTrue, not PyBool_Check. Grr. PyObject_IsTrue, not PyBool_Check. Grr.

View file

@ -27,7 +27,8 @@ AM_MAINTAINER_MODE
AC_DEFINE_UNQUOTED(PYGST_MAJOR_VERSION, $PACKAGE_VERSION_MAJOR, [PyGst major version]) AC_DEFINE_UNQUOTED(PYGST_MAJOR_VERSION, $PACKAGE_VERSION_MAJOR, [PyGst major version])
AC_DEFINE_UNQUOTED(PYGST_MINOR_VERSION, $PACKAGE_VERSION_MINOR, [PyGst minor version]) AC_DEFINE_UNQUOTED(PYGST_MINOR_VERSION, $PACKAGE_VERSION_MINOR, [PyGst minor version])
AC_DEFINE_UNQUOTED(PYGST_MICRO_VERSION, $PACKAGE_VERSION_MICRO, [PyGst macro version]) AC_DEFINE_UNQUOTED(PYGST_MICRO_VERSION, $PACKAGE_VERSION_MICRO, [PyGst micro version])
AC_DEFINE_UNQUOTED(PYGST_NANO_VERSION, $PACKAGE_VERSION_NANO, [PyGst nano version])
dnl Add parameters for aclocal dnl Add parameters for aclocal
AC_SUBST(ACLOCAL_AMFLAGS, "-I common/m4") AC_SUBST(ACLOCAL_AMFLAGS, "-I common/m4")

View file

@ -90,6 +90,8 @@ sys.setdlopenflags(DLFCN.RTLD_LAZY | DLFCN.RTLD_GLOBAL)
from _gst import * from _gst import *
import interfaces import interfaces
version = get_gst_version
sys.setdlopenflags(dlsave) sys.setdlopenflags(dlsave)
del DLFCN, sys del DLFCN, sys

View file

@ -52,6 +52,15 @@
(return-type "gchar*") (return-type "gchar*")
) )
(define-function get_gst_version
(c-name "gst_get_gst_version")
(return-type "none")
)
(define-function get_pygst_version
(c-name "gst_get_pygst_version")
(return-type "none")
)
;; From ../gstreamer/gst/gstbin.h ;; From ../gstreamer/gst/gstbin.h

View file

@ -307,6 +307,7 @@ ignore
gst_implements_interface_check gst_implements_interface_check
gst_plugin_get_module gst_plugin_get_module
gst_object_sink gst_object_sink
gst_version
%% %%
/* /*
Magic to be able to use bugfixes of new releases without having to use Magic to be able to use bugfixes of new releases without having to use
@ -911,9 +912,9 @@ _wrap_gst_type_find_factory_get_list (PyObject *self)
return py_list; return py_list;
} }
%% %%
override gst_version noargs override gst_get_gst_version noargs
static PyObject * static PyObject *
_wrap_gst_version (PyObject *self) _wrap_gst_get_gst_version (PyObject *self)
{ {
guint major, minor, micro, nano; guint major, minor, micro, nano;
PyObject *py_tuple; PyObject *py_tuple;
@ -928,6 +929,18 @@ _wrap_gst_version (PyObject *self)
return py_tuple; return py_tuple;
} }
%% %%
override gst_get_pygst_version noargs
static PyObject *
_wrap_gst_get_pygst_version (PyObject *self)
{
PyObject *py_tuple;
py_tuple = Py_BuildValue ("(iiii)", PYGST_MAJOR_VERSION, PYGST_MINOR_VERSION,
PYGST_MICRO_VERSION, PYGST_NANO_VERSION);
return py_tuple;
}
%%
override gst_clock_get_calibration noargs override gst_clock_get_calibration noargs
static PyObject * static PyObject *
_wrap_gst_clock_get_calibration (PyGObject * self) _wrap_gst_clock_get_calibration (PyGObject * self)