Changeset 131d1eb for python/ext/py-source.c

Timestamp:

Dec 21, 2018, 8:06:09 PM (6 years ago)

Author:

Paul Brossier <piem@piem.org>

Branches:

feature/autosink, feature/cnn, feature/crepe, fix/ffmpeg5, master

Children:

1c565c0, 59109e9

Parents:

4ed1e47 (diff), a280ed1 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' into feature/sink_vorbis

File:

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

python/ext/py-source.c

@@ -437 +437 @@
   aubio_source_do (self->o, &(self->c_read_to), &read);
 
+  if (PyErr_Occurred() != NULL) {
+    return NULL;
+  }
+
   outputs = PyTuple_New(2);
   PyTuple_SetItem( outputs, 0, self->read_to );
@@ -457 +461 @@
   /* compute _do function */
   aubio_source_do_multi (self->o, &(self->c_mread_to), &read);
+
+  if (PyErr_Occurred() != NULL) {
+    return NULL;
+  }
 
   outputs = PyTuple_New(2);
@@ -574 +582 @@
     } else if (PyLong_AsLong(size) > 0) {
       // short read, return a shorter array
-      PyArrayObject *shortread = (PyArrayObject*)
-        PyArray_FROM_OTF(PyTuple_GetItem(done, 0), NPY_NOTYPE,
-            NPY_ARRAY_ENSURECOPY);
+      PyArrayObject *shortread = (PyArrayObject*)PyTuple_GetItem(done, 0);
       PyArray_Dims newdims;
       PyObject *reshaped;