Changeset d6f9b3a

Timestamp:

Nov 15, 2009, 3:01:06 PM (15 years ago)

Author:

Paul Brossier <piem@piem.org>

Branches:

feature/autosink, feature/cnn, feature/cnn_org, feature/constantq, feature/crepe, feature/crepe_org, feature/pitchshift, feature/pydocstrings, feature/timestretch, fix/ffmpeg5, master, pitchshift, sampler, timestretch, yinfft+

Children:

4bc098c

Parents:

965ea78

Message:

py-fvec.c: add PyAubio_CFvecToArray

Location:

interfaces/python

Files:

• aubio-types.h (modified) (1 diff)
• py-fvec.c (modified) (2 diffs)

interfaces/python/aubio-types.h

@@ -36 +36 @@
 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);
 

interfaces/python/py-fvec.c

@@ -177 +177 @@
 
 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)
 {
@@ -265 +282 @@
 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}
 };