Changeset b5bef11 for python/ext/py-sink.c

Timestamp:

Apr 21, 2016, 9:31:10 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:

a7f398d

Parents:

bfe8256

Message:

ext/: use new proxy functions

File:

• python/ext/py-sink.c (modified) (7 diffs)

python/ext/py-sink.c

@@ -8 +8 @@
   uint_t samplerate;
   uint_t channels;
+  fvec_t *write_data;
+  fmat_t *mwrite_data;
 } Py_sink;
 
@@ -122 +124 @@
   self->channels = aubio_sink_get_channels ( self->o );
 
+  self->write_data = (fvec_t *)malloc(sizeof(fvec_t));
+  self->mwrite_data = (fmat_t *)malloc(sizeof(fmat_t));
+  self->mwrite_data->height = self->channels;
+  self->mwrite_data->data = (smpl_t **)malloc(sizeof(smpl_t*) * self->channels);
   return 0;
 }
@@ -129 +135 @@
 {
   del_aubio_sink(self->o);
+  free(self->write_data);
+  free(self->mwrite_data->data);
+  free(self->mwrite_data);
   Py_TYPE(self)->tp_free((PyObject *) self);
 }
@@ -140 +149 @@
 
   /* input vectors prototypes */
-  fvec_t* write_data;
   uint_t write;
 
@@ -148 +156 @@
   }
 
-
   /* input vectors parsing */
-  write_data = PyAubio_ArrayToCFvec (write_data_obj);
-
-  if (write_data == NULL) {
-    return NULL;
-  }
-
-
-
+  if (!PyAubio_ArrayToCFvec(write_data_obj, self->write_data)) {
+    return NULL;
+  }
 
 
   /* compute _do function */
-  aubio_sink_do (self->o, write_data, write);
+  aubio_sink_do (self->o, self->write_data, write);
 
   Py_RETURN_NONE;
@@ -174 +176 @@
 
   /* input vectors prototypes */
-  fmat_t * write_data;
   uint_t write;
 
@@ -184 +185 @@
 
   /* input vectors parsing */
-  write_data = PyAubio_ArrayToCFmat (write_data_obj);
-
-  if (write_data == NULL) {
-    return NULL;
-  }
-
-
-
-
+  if (!PyAubio_ArrayToCFmat(write_data_obj, self->mwrite_data)) {
+    return NULL;
+  }
 
   /* compute _do function */
-  aubio_sink_do_multi (self->o, write_data, write);
+  aubio_sink_do_multi (self->o, self->mwrite_data, write);
   Py_RETURN_NONE;
 }