py-fvec.c: add PyAubio_CFvecToArray

diff --git a/interfaces/python/aubio-types.h b/interfaces/python/aubio-types.h
index 7311ee66d739acf52c6261fbd5e226a8929df7d0..8d00191c1aad6aac28ae70a2c0e46da52d893113 100644 (file)
--- a/interfaces/python/aubio-types.h
+++ b/interfaces/python/aubio-types.h
@@ -35,6 +35,7 @@ typedef struct
 } Py_fvec;
 extern PyTypeObject Py_fvecType;
 extern PyObject *PyAubio_FvecToArray (Py_fvec * self);
+extern PyObject *PyAubio_CFvecToArray (fvec_t * self);
 extern Py_fvec *PyAubio_ArrayToFvec (PyObject * self);
 
 typedef struct

diff --git a/interfaces/python/py-fvec.c b/interfaces/python/py-fvec.c
index bb68df33aa0a332f68d5eddc5d28448085631ee5..a6254510657d2a30a9f8411130cfb7b1b7cb5387 100644 (file)
--- a/interfaces/python/py-fvec.c
+++ b/interfaces/python/py-fvec.c
@@ -175,6 +175,23 @@ fail:
   return NULL;
 }
 
+PyObject *
+PyAubio_CFvecToArray (fvec_t * self)
+{
+  PyObject *array = NULL;
+  uint_t i;
+  npy_intp dims[] = { self->length, 1 };
+  PyObject *concat = PyList_New (0), *tmp = NULL;
+  for (i = 0; i < self->channels; i++) {
+    tmp = PyArray_SimpleNewFromData (1, dims, AUBIO_NPY_SMPL, self->data[i]);
+    PyList_Append (concat, tmp);
+    Py_DECREF (tmp);
+  }
+  array = PyArray_FromObject (concat, AUBIO_NPY_SMPL, 2, 2);
+  Py_DECREF (concat);
+  return array;
+}
+
 PyObject *
 PyAubio_FvecToArray (Py_fvec * self)
 {
@@ -264,7 +281,7 @@ static PyMemberDef Py_fvec_members[] = {
 
 static PyMethodDef Py_fvec_methods[] = {
   {"__array__", (PyCFunction) PyAubio_FvecToArray, METH_NOARGS,
-      "Returns the first channel as a numpy array."},
+      "Returns the vector as a numpy array."},
   {NULL}
 };