gst/pygstiterator.c: Printf format fix.

Original commit message from CVS:
* gst/pygstiterator.c: (pygst_iterator_new):
Printf format fix.

diff --git a/ChangeLog b/ChangeLog
index dba7719..cf059e7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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>
 
        * codegen/argtypes.py:

diff --git a/common b/common
index 9991f6f..a4af1b8 160000 (submodule)
--- a/common
+++ b/common
@@ -1 +1 @@
-Subproject commit 9991f6fa61ee11475c390dd6675ef7952f079e43
+Subproject commit a4af1b8542911352e29d53fba47e2c3d7231ebdb

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