Changeset b055b4e for python/ext

Timestamp:

Apr 29, 2016, 9:57:35 PM (9 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:

21e8408

Parents:

307fdfc

Message:

python/ext/py-filterbank.c: use new_py_fvec

File:

• python/ext/py-filterbank.c (modified) (4 diffs)

python/ext/py-filterbank.c

@@ -12 +12 @@
   fvec_t freqs;
   fmat_t coeffs;
-  fvec_t *out;
+  PyObject *out;
+  fvec_t c_out;
 } Py_filterbank;
 
@@ -65 +66 @@
     return -1;
   }
-  self->out = new_fvec(self->n_filters);
+  self->out = new_py_fvec(self->n_filters);
 
   return 0;
@@ -74 +75 @@
 {
   del_aubio_filterbank(self->o);
-  del_fvec(self->out);
+  Py_DECREF(self->out);
   free(self->coeffs.data);
   Py_TYPE(self)->tp_free((PyObject *) self);
@@ -92 +93 @@
   }
 
+  Py_INCREF(self->out);
+  if (!PyAubio_ArrayToCFvec(self->out, &(self->c_out))) {
+    return NULL;
+  }
   // compute the function
-  aubio_filterbank_do (self->o, &(self->vec), self->out);
-  return (PyObject *)PyAubio_CFvecToArray(self->out);
+  aubio_filterbank_do (self->o, &(self->vec), &(self->c_out));
+  return self->out;
 }