Changeset 307fdfc for python/ext

Timestamp:

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

b055b4e

Parents:

1ee5e21

Message:

python/ext/py-phasevoc.c: use new_py_fvec, new_py_cvec

File:

• python/ext/py-phasevoc.c (modified) (6 diffs)

python/ext/py-phasevoc.c

@@ -10 +10 @@
   uint_t hop_s;
   fvec_t vecin;
-  cvec_t *output;
   cvec_t cvecin;
-  fvec_t *routput;
+  PyObject *output;
+  cvec_t c_output;
+  PyObject *routput;
+  fvec_t c_routput;
 } Py_pvoc;
 
@@ -71 +73 @@
   }
 
-  self->output = new_cvec(self->win_s);
-  self->routput = new_fvec(self->hop_s);
+  self->output = new_py_cvec(self->win_s);
+  self->routput = new_py_fvec(self->hop_s);
 
   return 0;
@@ -81 +83 @@
 Py_pvoc_del (Py_pvoc *self, PyObject *unused)
 {
+  Py_XDECREF(self->output);
+  Py_XDECREF(self->routput);
   del_aubio_pvoc(self->o);
-  del_cvec(self->output);
-  del_fvec(self->routput);
   Py_TYPE(self)->tp_free((PyObject *) self);
 }
@@ -101 +103 @@
   }
 
+  Py_INCREF(self->output);
+  if (!PyAubio_PyCvecToCCvec (self->output, &(self->c_output))) {
+    return NULL;
+  }
   // compute the function
-  aubio_pvoc_do (self->o, &(self->vecin), self->output);
-  // convert cvec to py_cvec
-  return PyAubio_CCvecToPyCvec(self->output);
+  aubio_pvoc_do (self->o, &(self->vecin), &(self->c_output));
+  return self->output;
 }
 
@@ -115 +120 @@
 };
 
-static PyObject * 
+static PyObject *
 Py_pvoc_rdo(Py_pvoc * self, PyObject * args)
 {
@@ -127 +132 @@
   }
 
+  Py_INCREF(self->routput);
+  if (!PyAubio_ArrayToCFvec(self->routput, &(self->c_routput)) ) {
+    return NULL;
+  }
   // compute the function
-  aubio_pvoc_rdo (self->o, &(self->cvecin), self->routput);
-  return PyAubio_CFvecToArray(self->routput);
+  aubio_pvoc_rdo (self->o, &(self->cvecin), &(self->c_routput));
+  return self->routput;
 }