Changeset 1164bcdf

Timestamp:

Feb 23, 2014, 8:13:43 PM (11 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:

31a5c405

Parents:

4a1378c

Message:

python/ext/py-source.c: add do_multi and channels

File:

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

python/ext/py-source.c

@@ -7 +7 @@
   char_t* uri;
   uint_t samplerate;
+  uint_t channels;
   uint_t hop_size;
 } Py_source;
@@ -67 +68 @@
   }
   self->samplerate = aubio_source_get_samplerate ( self->o );
+  self->channels = aubio_source_get_channels ( self->o );
 
   return 0;
@@ -74 +76 @@
 
 /* function Py_source_do */
-static PyObject * 
+static PyObject *
 Py_source_do(Py_source * self, PyObject * args)
 {
@@ -87 +89 @@
 
 
-  
+
   /* creating output read_to as a new_fvec of length self->hop_size */
   read_to = new_fvec (self->hop_size);
@@ -103 +105 @@
 }
 
+/* function Py_source_do_multi */
+static PyObject *
+Py_source_do_multi(Py_source * self, PyObject * args)
+{
+
+
+  /* output vectors prototypes */
+  fmat_t* read_to;
+  uint_t read;
+
+
+
+
+
+
+  /* creating output read_to as a new_fvec of length self->hop_size */
+  read_to = new_fmat (self->channels, self->hop_size);
+  read = 0;
+
+
+  /* compute _do function */
+  aubio_source_do_multi (self->o, read_to, &read);
+
+  PyObject *outputs = PyList_New(0);
+  PyList_Append( outputs, (PyObject *)PyAubio_CFmatToArray (read_to));
+  //del_fvec (read_to);
+  PyList_Append( outputs, (PyObject *)PyInt_FromLong (read));
+  return outputs;
+}
+
 AUBIO_MEMBERS_START(source)
   {"uri", T_STRING, offsetof (Py_source, uri), READONLY, ""},
   {"samplerate", T_INT, offsetof (Py_source, samplerate), READONLY, ""},
+  {"channels", T_INT, offsetof (Py_source, channels), READONLY, ""},
   {"hop_size", T_INT, offsetof (Py_source, hop_size), READONLY, ""},
 AUBIO_MEMBERS_STOP(source)
@@ -136 +169 @@
   {"get_channels", (PyCFunction) Pyaubio_source_get_channels,
     METH_NOARGS, ""},
+  {"do_multi", (PyCFunction) Py_source_do_multi,
+    METH_NOARGS, ""},
   {"close", (PyCFunction) Pyaubio_source_close,
     METH_NOARGS, ""},