Changeset 363ce7a for interfaces/python/py-filterbank.c

Timestamp:

Dec 25, 2009, 4:45:46 AM (14 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:

ce4bfe3

Parents:

a52d3ae

Message:

py-filterbank.c: use new proxy function, switch to mono and fmat

File:

• interfaces/python/py-filterbank.c (modified) (6 diffs)

interfaces/python/py-filterbank.c

@@ -55 +55 @@
   PyObject *input;
   Py_cvec *vec;
-  Py_fvec *output;
+  fvec_t *out;
 
   if (!PyArg_ParseTuple (args, "O", &input)) {
@@ -67 +67 @@
   }
 
-  output = (Py_fvec*) PyObject_New (Py_fvec, &Py_fvecType);
-  output->length = self->n_filters;
-  output->o = new_fvec(self->n_filters);
+  out = new_fvec (self->n_filters);
 
   // compute the function
-  aubio_filterbank_do (self->o, vec->o, output->o);
-  return (PyObject *)PyAubio_FvecToArray(output);
+  aubio_filterbank_do (self->o, vec->o, out);
+  return (PyObject *)PyAubio_CFvecToArray(out);
 }
 
@@ -90 +88 @@
   PyObject *input;
   uint_t samplerate;
-  Py_fvec *freqs;
+  fvec_t *freqs;
   if (!PyArg_ParseTuple (args, "OI", &input, &samplerate)) {
     return NULL;
@@ -99 +97 @@
   }
 
-  freqs = PyAubio_ArrayToFvec (input);
+  freqs = PyAubio_ArrayToCFvec (input);
 
   if (freqs == NULL) {
@@ -106 +104 @@
 
   err = aubio_filterbank_set_triangle_bands (self->o,
-      freqs->o, samplerate);
+      freqs, samplerate);
   if (err > 0) {
     PyErr_SetString (PyExc_ValueError,
@@ -137 +135 @@
 Py_filterbank_get_coeffs (Py_filterbank * self, PyObject *unused)
 {
-  Py_fmat *output = (Py_fmat *) PyObject_New (Py_fmat, &Py_fvecType);
-  output->o = aubio_filterbank_get_coeffs (self->o);
-  return (PyObject *)PyAubio_FmatToArray(output);
+  return (PyObject *)PyAubio_CFmatToArray(
+      aubio_filterbank_get_coeffs (self->o) );
 }