mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-02-21 05:26:23 +00:00
Code Issues 1 Projects Releases Wiki Activity

gst/pygstiterator.c: Printf format fix.

Browse source 
Original commit message from CVS:
* gst/pygstiterator.c: (pygst_iterator_new):
Printf format fix.
This commit is contained in:
Tim-Philipp Müller 2006-10-05 18:27:58 +00:00
parent c79185a013
commit f49c8781e9
3 changed files with 105 additions and 100 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2006-10-05 Tim-Philipp Müller <tim at centricular dot net>
* gst/pygstiterator.c: (pygst_iterator_new):
Printf format fix.
2006-10-03 Edward Hervey <edward@fluendo.com> 2006-10-03 Edward Hervey <edward@fluendo.com>
* codegen/argtypes.py: * codegen/argtypes.py:

2
common

@ -1 +1 @@
Subproject commit 9991f6fa61ee11475c390dd6675ef7952f079e43 Subproject commit a4af1b8542911352e29d53fba47e2c3d7231ebdb

188
gst/pygstiterator.c
View file

@ -23,130 +23,130 @@
#include "common.h" #include "common.h"
static void static void
pygst_iterator_dealloc(PyGstIterator *self) pygst_iterator_dealloc (PyGstIterator * self)
{ {
gst_iterator_free(self->iter); gst_iterator_free (self->iter);
PyObject_Del((PyObject*) self); PyObject_Del ((PyObject *) self);
} }
static PyObject * static PyObject *
pygst_iterator_iter_next(PyGstIterator *self) pygst_iterator_iter_next (PyGstIterator * self)
{ {
gpointer element; gpointer element;
PyObject *retval = NULL; PyObject *retval = NULL;
GstIteratorResult result; GstIteratorResult result;
result = gst_iterator_next(self->iter, &element); result = gst_iterator_next (self->iter, &element);
switch (result) switch (result) {
{ case GST_ITERATOR_DONE:
case GST_ITERATOR_DONE: PyErr_SetNone (PyExc_StopIteration);
PyErr_SetNone(PyExc_StopIteration); break;
break; case GST_ITERATOR_OK:
case GST_ITERATOR_OK: if (g_type_is_a (self->iter->type, G_TYPE_OBJECT)) {
if (g_type_is_a(self->iter->type, G_TYPE_OBJECT)) { retval = pygobject_new (G_OBJECT (element));
retval = pygobject_new(G_OBJECT(element)); g_object_unref (element);
g_object_unref (element); } else if (g_type_is_a (self->iter->type, GST_TYPE_MINI_OBJECT)) {
} else if (g_type_is_a(self->iter->type, GST_TYPE_MINI_OBJECT)) { retval = pygstminiobject_new (GST_MINI_OBJECT (element));
retval = pygstminiobject_new(GST_MINI_OBJECT(element)); gst_mini_object_unref (element);
gst_mini_object_unref (element); } else {
} else { const gchar *type_name;
const gchar *type_name;
type_name = g_type_name(self->iter->type); type_name = g_type_name (self->iter->type);
PyErr_Format(PyExc_TypeError, "Unsupported child type: %s", PyErr_Format (PyExc_TypeError, "Unsupported child type: %s",
type_name ? type_name : "unknown"); type_name ? type_name : "unknown");
} }
break; break;
case GST_ITERATOR_RESYNC: case GST_ITERATOR_RESYNC:
/* XXX: add/raise gst.IteratorResync */ /* XXX: add/raise gst.IteratorResync */
PyErr_SetString(PyExc_TypeError, "Resync"); PyErr_SetString (PyExc_TypeError, "Resync");
break; break;
case GST_ITERATOR_ERROR: case GST_ITERATOR_ERROR:
PyErr_SetString(PyExc_TypeError, "Error"); PyErr_SetString (PyExc_TypeError, "Error");
break; break;
default: default:
g_assert_not_reached(); g_assert_not_reached ();
break; break;
} }
return retval; return retval;
} }
static PyObject * static PyObject *
pygst_iterator_next(PyGstIterator *self) pygst_iterator_next (PyGstIterator * self)
{ {
/* Be compatible with Pythons API rather than GStreamers */ /* Be compatible with Pythons API rather than GStreamers */
return pygst_iterator_iter_next(self); return pygst_iterator_iter_next (self);
} }
static PyObject * static PyObject *
pygst_iterator_push(PyGstIterator *self, PyObject *args) pygst_iterator_push (PyGstIterator * self, PyObject * args)
{ {
PyGstIterator *other; PyGstIterator *other;
if (!PyArg_ParseTuple(args, "O!:push", &PyGstIterator_Type, &other)) if (!PyArg_ParseTuple (args, "O!:push", &PyGstIterator_Type, &other))
return NULL; return NULL;
gst_iterator_push(self->iter, other->iter); gst_iterator_push (self->iter, other->iter);
Py_INCREF(Py_None); Py_INCREF (Py_None);
return Py_None; return Py_None;
} }
static PyObject * static PyObject *
pygst_iterator_resync(PyGstIterator *self) pygst_iterator_resync (PyGstIterator * self)
{ {
gst_iterator_resync(self->iter); gst_iterator_resync (self->iter);
Py_INCREF(Py_None); Py_INCREF (Py_None);
return Py_None; return Py_None;
} }
static PyMethodDef _PyGstIterator_methods[] = { static PyMethodDef _PyGstIterator_methods[] = {
{ "next", (PyCFunction)pygst_iterator_next, METH_NOARGS }, {"next", (PyCFunction) pygst_iterator_next, METH_NOARGS},
{ "push", (PyCFunction)pygst_iterator_push, METH_VARARGS }, {"push", (PyCFunction) pygst_iterator_push, METH_VARARGS},
{ "resync", (PyCFunction)pygst_iterator_resync, METH_NOARGS }, {"resync", (PyCFunction) pygst_iterator_resync, METH_NOARGS},
{ NULL, NULL, 0 } {NULL, NULL, 0}
}; };
PyTypeObject PyGstIterator_Type = { PyTypeObject PyGstIterator_Type = {
PyObject_HEAD_INIT(NULL) PyObject_HEAD_INIT (NULL)
0, /* ob_size */ 0, /* ob_size */
"gst.Iterator", /* tp_name */ "gst.Iterator", /* tp_name */
sizeof(PyGstIterator), /* tp_basicsize */ sizeof (PyGstIterator), /* tp_basicsize */
0, /* tp_itemsize */ 0, /* tp_itemsize */
(destructor)pygst_iterator_dealloc, /* tp_dealloc */ (destructor) pygst_iterator_dealloc, /* tp_dealloc */
0, /* tp_print */ 0, /* tp_print */
0, /* tp_getattr */ 0, /* tp_getattr */
0, /* tp_setattr */ 0, /* tp_setattr */
0, /* tp_compare */ 0, /* tp_compare */
0, /* tp_repr */ 0, /* tp_repr */
0, /* tp_as_number */ 0, /* tp_as_number */
0, /* tp_as_sequence */ 0, /* tp_as_sequence */
0, /* tp_as_mapping */ 0, /* tp_as_mapping */
0, /* tp_hash */ 0, /* tp_hash */
0, /* tp_call */ 0, /* tp_call */
0, /* tp_str */ 0, /* tp_str */
0, /* tp_getattro */ 0, /* tp_getattro */
0, /* tp_setattro */ 0, /* tp_setattro */
0, /* tp_as_buffer */ 0, /* tp_as_buffer */
Py_TPFLAGS_DEFAULT, /* tp_flags */ Py_TPFLAGS_DEFAULT, /* tp_flags */
"GstIterator wrapper", /* tp_doc */ "GstIterator wrapper", /* tp_doc */
0, /* tp_traverse */ 0, /* tp_traverse */
0, /* tp_clear */ 0, /* tp_clear */
0, /* tp_richcompare */ 0, /* tp_richcompare */
0, /* tp_weaklistoffset */ 0, /* tp_weaklistoffset */
PyObject_SelfIter, /* tp_iter */ PyObject_SelfIter, /* tp_iter */
(iternextfunc)pygst_iterator_iter_next, /* tp_iternext */ (iternextfunc) pygst_iterator_iter_next, /* tp_iternext */
_PyGstIterator_methods, /* tp_methods */ _PyGstIterator_methods, /* tp_methods */
}; };
PyObject* PyObject *
pygst_iterator_new(GstIterator *iter) pygst_iterator_new (GstIterator * iter)
{ {
PyGstIterator *self; PyGstIterator *self;
self = PyObject_NEW(PyGstIterator, &PyGstIterator_Type); self = PyObject_NEW (PyGstIterator, &PyGstIterator_Type);
self->iter = iter; self->iter = iter;
GST_DEBUG("self:%p , iterator:%p, type:%d", GST_DEBUG ("self:%p , iterator:%p, type:%lu",
self, self->iter, self->iter->type); self, self->iter, self->iter->type);
return (PyObject *) self; return (PyObject *) self;
} }