mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2025-02-17 11:45:25 +00:00
Cleanup, add versioning
Original commit message from CVS: Cleanup, add versioning
This commit is contained in:
parent
e1aed306f9
commit
6e85edcd38
5 changed files with 356 additions and 471 deletions
2
common
2
common
|
@ -1 +1 @@
|
|||
Subproject commit 874dab5c3461ad7487f1ae029256b6da82dddf6d
|
||||
Subproject commit 4eb02711e49a6aadf900d6fd9d220c17115fec2a
|
|
@ -25,8 +25,6 @@
|
|||
gboolean
|
||||
pygst_data_from_pyobject(PyObject *object, GstData **data)
|
||||
{
|
||||
g_return_val_if_fail(*data != NULL, FALSE);
|
||||
|
||||
if (pyg_boxed_check(object, GST_TYPE_DATA)) {
|
||||
*data = pyg_boxed_get(object, GstData);
|
||||
return TRUE;
|
||||
|
|
30
gst/gst.defs
30
gst/gst.defs
|
@ -5266,23 +5266,23 @@
|
|||
(return-type "GstTagList*")
|
||||
)
|
||||
|
||||
;; Added python method
|
||||
(define-method keys
|
||||
(of-object "GstTagList")
|
||||
(c-name "pygst_tag_list_keys")
|
||||
)
|
||||
; ;; Added python method
|
||||
; (define-method keys
|
||||
; (of-object "GstTagList")
|
||||
; (c-name "pygst_tag_list_keys")
|
||||
; )
|
||||
|
||||
(define-method has_key
|
||||
(of-object "GstTagList")
|
||||
(c-name "pygst_tag_list_has_key")
|
||||
(parameters '("gchar*" "key"))
|
||||
)
|
||||
; (define-method has_key
|
||||
; (of-object "GstTagList")
|
||||
; (c-name "pygst_tag_list_has_key")
|
||||
; (parameters '("gchar*" "key"))
|
||||
; )
|
||||
|
||||
(define-method get
|
||||
(of-object "GstTagList")
|
||||
(c-name "pygst_tag_list_get")
|
||||
(parameters '("gchar*" "key"))
|
||||
)
|
||||
; (define-method get
|
||||
; (of-object "GstTagList")
|
||||
; (c-name "pygst_tag_list_get")
|
||||
; (parameters '("gchar*" "key"))
|
||||
; )
|
||||
|
||||
;; From /opt/gnome/include/gstreamer-0.7/gst/gsttaginterface.h
|
||||
|
||||
|
|
698
gst/gst.override
698
gst/gst.override
File diff suppressed because it is too large
Load diff
|
@ -1,4 +1,4 @@
|
|||
/* -*- Mode: C; c-basic-offset: 4 -*- */
|
||||
/* -*- Mode: C; ; c-file-style: "k&r"; c-basic-offset: 4 -*- */
|
||||
/* gst-python
|
||||
* Copyright (C) 2002 David I. Lehn
|
||||
*
|
||||
|
@ -27,6 +27,7 @@
|
|||
/* include this first, before NO_IMPORT_PYGOBJECT is defined */
|
||||
#include <pygobject.h>
|
||||
#include <gst/gst.h>
|
||||
#include <gst/gstversion.h>
|
||||
|
||||
void pygst_register_classes (PyObject *d);
|
||||
void pygst_add_constants(PyObject *module, const gchar *strip_prefix);
|
||||
|
@ -36,47 +37,59 @@ extern PyMethodDef pygst_functions[];
|
|||
DL_EXPORT(void)
|
||||
init_gst (void)
|
||||
{
|
||||
PyObject *m, *d;
|
||||
PyObject *av;
|
||||
int argc, i;
|
||||
char **argv;
|
||||
PyObject *m, *d;
|
||||
PyObject *av, *tuple;
|
||||
int argc, i;
|
||||
char **argv;
|
||||
|
||||
init_pygobject ();
|
||||
|
||||
/* pull in arguments */
|
||||
av = PySys_GetObject ("argv");
|
||||
if (av != NULL) {
|
||||
argc = PyList_Size (av);
|
||||
argv = g_new (char *, argc);
|
||||
for (i = 0; i < argc; i++)
|
||||
argv[i] = g_strdup (PyString_AsString (PyList_GetItem (av, i)));
|
||||
} else {
|
||||
argc = 0;
|
||||
argv = NULL;
|
||||
}
|
||||
|
||||
if (!gst_init_check (&argc, &argv)) {
|
||||
if (argv != NULL) {
|
||||
for (i = 0; i < argc; i++)
|
||||
init_pygobject ();
|
||||
|
||||
/* pull in arguments */
|
||||
av = PySys_GetObject ("argv");
|
||||
if (av != NULL) {
|
||||
argc = PyList_Size (av);
|
||||
argv = g_new (char *, argc);
|
||||
for (i = 0; i < argc; i++)
|
||||
argv[i] = g_strdup (PyString_AsString (PyList_GetItem (av, i)));
|
||||
} else {
|
||||
argc = 0;
|
||||
argv = NULL;
|
||||
}
|
||||
|
||||
if (!gst_init_check (&argc, &argv)) {
|
||||
if (argv != NULL) {
|
||||
for (i = 0; i < argc; i++)
|
||||
g_free (argv[i]);
|
||||
g_free (argv);
|
||||
}
|
||||
PyErr_SetString (PyExc_RuntimeError, "can't initialize module gst");
|
||||
}
|
||||
if (argv != NULL) {
|
||||
PySys_SetArgv (argc, argv);
|
||||
for (i = 0; i < argc; i++)
|
||||
g_free (argv[i]);
|
||||
g_free (argv);
|
||||
}
|
||||
g_free (argv);
|
||||
}
|
||||
PyErr_SetString (PyExc_RuntimeError, "can't initialize module gst");
|
||||
}
|
||||
if (argv != NULL) {
|
||||
PySys_SetArgv (argc, argv);
|
||||
for (i = 0; i < argc; i++)
|
||||
g_free (argv[i]);
|
||||
g_free (argv);
|
||||
}
|
||||
|
||||
m = Py_InitModule ("_gst", pygst_functions);
|
||||
d = PyModule_GetDict (m);
|
||||
|
||||
m = Py_InitModule ("_gst", pygst_functions);
|
||||
d = PyModule_GetDict (m);
|
||||
|
||||
pygst_register_classes (d);
|
||||
pygst_add_constants (m, "GST_");
|
||||
|
||||
if (PyErr_Occurred ()) {
|
||||
Py_FatalError ("can't initialize module gst");
|
||||
}
|
||||
/* gst+ version */
|
||||
tuple = Py_BuildValue ("(iii)", GST_VERSION_MAJOR, GST_VERSION_MINOR,
|
||||
GST_VERSION_MICRO);
|
||||
PyDict_SetItemString(d, "gst_version", tuple);
|
||||
Py_DECREF(tuple);
|
||||
|
||||
/* gst-python version */
|
||||
tuple = Py_BuildValue ("(iii)", PYGST_MAJOR_VERSION, PYGST_MINOR_VERSION,
|
||||
PYGST_MICRO_VERSION);
|
||||
PyDict_SetItemString(d, "pygst_version", tuple);
|
||||
Py_DECREF(tuple);
|
||||
|
||||
pygst_register_classes (d);
|
||||
pygst_add_constants (m, "GST_");
|
||||
|
||||
if (PyErr_Occurred ()) {
|
||||
Py_FatalError ("can't initialize module gst");
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue