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

Paul Brossier committed 10 years ago

Commit b055b4e1 parent 307fdfc1 file · +10 −5Browse files

Showing the changes to python/ext (1 of 1 file). Show all

Unified · Split

   cvec_t vec;
   fvec_t freqs;
   fmat_t coeffs;
-  fvec_t *out;
+  PyObject *out;
+  fvec_t c_out;
 } Py_filterbank;
 static PyObject *
     PyErr_SetString (PyExc_RuntimeError, errstr);
     return -1;
   }
-  self->out = new_fvec(self->n_filters);
+  self->out = new_py_fvec(self->n_filters);
   return 0;
 }
 Py_filterbank_del (Py_filterbank *self, PyObject *unused)
 {
   del_aubio_filterbank(self->o);
-  del_fvec(self->out);
+  Py_DECREF(self->out);
   free(self->coeffs.data);
   Py_TYPE(self)->tp_free((PyObject *) self);
 }
     return NULL;
   }
+  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);
+  aubio_filterbank_do (self->o, &(self->vec), &(self->c_out));
-  return (PyObject *)PyAubio_CFvecToArray(self->out);
+  return self->out;
 }
 static PyMemberDef Py_filterbank_members[] = {

Keyboard shortcuts