From ade405ce0fcace7165c371969415fc34bc204d08 Mon Sep 17 00:00:00 2001 From: Johan Dahlin Date: Mon, 23 Feb 2004 18:19:38 +0000 Subject: [PATCH] gstreamer/gstreamer.py: Backwards compatibility module Original commit message from CVS: 2004-02-23 Johan Dahlin * gstreamer/gstreamer.py: Backwards compatibility module * gstreamer/gstreamermodule.c: * gstreamer/Makefile.am: Rename the module to gst --- ChangeLog | 7 +++++++ common | 2 +- gst/Makefile.am | 25 ++++++++++++++++--------- gst/__init__.py | 2 +- gst/gstmodule.c | 4 ++-- gst/gstreamer.py | 20 ++++++++++++++++++++ gst/gstreamermodule.c | 4 ++-- gstreamer/Makefile.am | 25 ++++++++++++++++--------- gstreamer/__init__.py | 2 +- gstreamer/gstmodule.c | 4 ++-- gstreamer/gstreamer.py | 20 ++++++++++++++++++++ gstreamer/gstreamermodule.c | 4 ++-- 12 files changed, 90 insertions(+), 29 deletions(-) create mode 100644 gst/gstreamer.py create mode 100644 gstreamer/gstreamer.py diff --git a/ChangeLog b/ChangeLog index 5aaa8722f6..171e0bd2d5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2004-02-23 Johan Dahlin + + * gstreamer/gstreamer.py: Backwards compatibility module + + * gstreamer/gstreamermodule.c: + * gstreamer/Makefile.am: Rename the module to gst + 2004-02-18 David I. Lehn * gstreamer/0.7.defs: diff --git a/common b/common index d821172609..0945c85c4c 160000 --- a/common +++ b/common @@ -1 +1 @@ -Subproject commit d821172609916bc61bbbca7f8d2e6cf0ca1ab47a +Subproject commit 0945c85c4c9139e2e5b8e04d0fc841b8aa1e6e9b diff --git a/gst/Makefile.am b/gst/Makefile.am index cfa25e1f65..b2c83e8d81 100644 --- a/gst/Makefile.am +++ b/gst/Makefile.am @@ -3,10 +3,17 @@ MODULE = gstreamer INCLUDES = $(PYTHON_INCLUDES) $(PYGTK_CFLAGS) PYGTK_DEFSDIR = @PYGTK_DEFSDIR@ -pygstreamerdir = $(pythondir)/$(MODULE) -pygstreamer_PYTHON = __init__.py +pkgpythondir = $(pythondir)/gst +pkgpyexecdir = $(pyexecdir)/gst -pygstreamerexecdir = $(pyexecdir)/$(MODULE) +pygstdir = $(pkgpythondir) +pygst_PYTHON = __init__.py + +# Backwards comptibility +pygstreamerdir = $(pythondir) +pygstreamer_PYTHON = gstreamer.py + +pygstexecdir = $(pkgpyexecdir) GST_OVERRIDES = common.override \ 0.6.override \ @@ -27,15 +34,15 @@ if GST_0_7 VERSOURCES = 0.7.c 0.7.h endif -pyexec_LTLIBRARIES = _gstreamermodule.la -_gstreamermodule_la_SOURCES = \ +pygstexec_LTLIBRARIES = _gstmodule.la +_gstmodule_la_SOURCES = \ gstreamermodule.c \ common.c common.h \ $(VERSOURCES) -_gstreamermodule_la_CFLAGS = $(GST_CFLAGS) -fno-strict-aliasing -_gstreamermodule_la_LIBADD = $(GST_LIBS) -_gstreamermodule_la_LDFLAGS = -module -avoid-version -export-symbols-regex init_gstreamer -nodist__gstreamermodule_la_SOURCES = gstreamer.c +_gstmodule_la_CFLAGS = $(GST_CFLAGS) -fno-strict-aliasing +_gstmodule_la_LIBADD = $(GST_LIBS) +_gstmodule_la_LDFLAGS = -module -avoid-version -export-symbols-regex init_gst +nodist__gstmodule_la_SOURCES = gstreamer.c CLEANFILES = $(MODULE).c h2def.defs $(MODULE).defs $(MODULE).override EXTRA_DIST = $(GST_OVERRIDES) $(GST_DEFS) $(GST_CODE) arg-types.py diff --git a/gst/__init__.py b/gst/__init__.py index c735ec12cc..7271efc3ff 100644 --- a/gst/__init__.py +++ b/gst/__init__.py @@ -35,7 +35,7 @@ if os.path.exists(devloc): sys.setdlopenflags(dl.RTLD_LAZY | dl.RTLD_GLOBAL) del devloc, sys, os -from _gstreamer import * +from _gst import * #from gtk import threads_init, threads_enter, threads_leave diff --git a/gst/gstmodule.c b/gst/gstmodule.c index b89331fc54..acef7a22fa 100644 --- a/gst/gstmodule.c +++ b/gst/gstmodule.c @@ -34,7 +34,7 @@ void pygstreamer_add_constants(PyObject *module, const gchar *strip_prefix); extern PyMethodDef pygstreamer_functions[]; DL_EXPORT(void) -init_gstreamer (void) +init_gst (void) { PyObject *m, *d; PyObject *av; @@ -70,7 +70,7 @@ init_gstreamer (void) g_free (argv); } - m = Py_InitModule ("_gstreamer", pygstreamer_functions); + m = Py_InitModule ("gst._gst", pygstreamer_functions); d = PyModule_GetDict (m); pygstreamer_register_classes (d); diff --git a/gst/gstreamer.py b/gst/gstreamer.py new file mode 100644 index 0000000000..a252e51ba9 --- /dev/null +++ b/gst/gstreamer.py @@ -0,0 +1,20 @@ +# +# 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 +# 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. +# +# Author: David I. Lehn +# + +from gst import * diff --git a/gst/gstreamermodule.c b/gst/gstreamermodule.c index b89331fc54..acef7a22fa 100644 --- a/gst/gstreamermodule.c +++ b/gst/gstreamermodule.c @@ -34,7 +34,7 @@ void pygstreamer_add_constants(PyObject *module, const gchar *strip_prefix); extern PyMethodDef pygstreamer_functions[]; DL_EXPORT(void) -init_gstreamer (void) +init_gst (void) { PyObject *m, *d; PyObject *av; @@ -70,7 +70,7 @@ init_gstreamer (void) g_free (argv); } - m = Py_InitModule ("_gstreamer", pygstreamer_functions); + m = Py_InitModule ("gst._gst", pygstreamer_functions); d = PyModule_GetDict (m); pygstreamer_register_classes (d); diff --git a/gstreamer/Makefile.am b/gstreamer/Makefile.am index cfa25e1f65..b2c83e8d81 100644 --- a/gstreamer/Makefile.am +++ b/gstreamer/Makefile.am @@ -3,10 +3,17 @@ MODULE = gstreamer INCLUDES = $(PYTHON_INCLUDES) $(PYGTK_CFLAGS) PYGTK_DEFSDIR = @PYGTK_DEFSDIR@ -pygstreamerdir = $(pythondir)/$(MODULE) -pygstreamer_PYTHON = __init__.py +pkgpythondir = $(pythondir)/gst +pkgpyexecdir = $(pyexecdir)/gst -pygstreamerexecdir = $(pyexecdir)/$(MODULE) +pygstdir = $(pkgpythondir) +pygst_PYTHON = __init__.py + +# Backwards comptibility +pygstreamerdir = $(pythondir) +pygstreamer_PYTHON = gstreamer.py + +pygstexecdir = $(pkgpyexecdir) GST_OVERRIDES = common.override \ 0.6.override \ @@ -27,15 +34,15 @@ if GST_0_7 VERSOURCES = 0.7.c 0.7.h endif -pyexec_LTLIBRARIES = _gstreamermodule.la -_gstreamermodule_la_SOURCES = \ +pygstexec_LTLIBRARIES = _gstmodule.la +_gstmodule_la_SOURCES = \ gstreamermodule.c \ common.c common.h \ $(VERSOURCES) -_gstreamermodule_la_CFLAGS = $(GST_CFLAGS) -fno-strict-aliasing -_gstreamermodule_la_LIBADD = $(GST_LIBS) -_gstreamermodule_la_LDFLAGS = -module -avoid-version -export-symbols-regex init_gstreamer -nodist__gstreamermodule_la_SOURCES = gstreamer.c +_gstmodule_la_CFLAGS = $(GST_CFLAGS) -fno-strict-aliasing +_gstmodule_la_LIBADD = $(GST_LIBS) +_gstmodule_la_LDFLAGS = -module -avoid-version -export-symbols-regex init_gst +nodist__gstmodule_la_SOURCES = gstreamer.c CLEANFILES = $(MODULE).c h2def.defs $(MODULE).defs $(MODULE).override EXTRA_DIST = $(GST_OVERRIDES) $(GST_DEFS) $(GST_CODE) arg-types.py diff --git a/gstreamer/__init__.py b/gstreamer/__init__.py index c735ec12cc..7271efc3ff 100644 --- a/gstreamer/__init__.py +++ b/gstreamer/__init__.py @@ -35,7 +35,7 @@ if os.path.exists(devloc): sys.setdlopenflags(dl.RTLD_LAZY | dl.RTLD_GLOBAL) del devloc, sys, os -from _gstreamer import * +from _gst import * #from gtk import threads_init, threads_enter, threads_leave diff --git a/gstreamer/gstmodule.c b/gstreamer/gstmodule.c index b89331fc54..acef7a22fa 100644 --- a/gstreamer/gstmodule.c +++ b/gstreamer/gstmodule.c @@ -34,7 +34,7 @@ void pygstreamer_add_constants(PyObject *module, const gchar *strip_prefix); extern PyMethodDef pygstreamer_functions[]; DL_EXPORT(void) -init_gstreamer (void) +init_gst (void) { PyObject *m, *d; PyObject *av; @@ -70,7 +70,7 @@ init_gstreamer (void) g_free (argv); } - m = Py_InitModule ("_gstreamer", pygstreamer_functions); + m = Py_InitModule ("gst._gst", pygstreamer_functions); d = PyModule_GetDict (m); pygstreamer_register_classes (d); diff --git a/gstreamer/gstreamer.py b/gstreamer/gstreamer.py new file mode 100644 index 0000000000..a252e51ba9 --- /dev/null +++ b/gstreamer/gstreamer.py @@ -0,0 +1,20 @@ +# +# 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 +# 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. +# +# Author: David I. Lehn +# + +from gst import * diff --git a/gstreamer/gstreamermodule.c b/gstreamer/gstreamermodule.c index b89331fc54..acef7a22fa 100644 --- a/gstreamer/gstreamermodule.c +++ b/gstreamer/gstreamermodule.c @@ -34,7 +34,7 @@ void pygstreamer_add_constants(PyObject *module, const gchar *strip_prefix); extern PyMethodDef pygstreamer_functions[]; DL_EXPORT(void) -init_gstreamer (void) +init_gst (void) { PyObject *m, *d; PyObject *av; @@ -70,7 +70,7 @@ init_gstreamer (void) g_free (argv); } - m = Py_InitModule ("_gstreamer", pygstreamer_functions); + m = Py_InitModule ("gst._gst", pygstreamer_functions); d = PyModule_GetDict (m); pygstreamer_register_classes (d);