Changeset 1458de5 for interfaces/python/aubioproxy.c

Timestamp:

Jul 11, 2012, 3:41:33 AM (12 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:

988f580

Parents:

c71e405

Message:

aubio-types.h, aubiomodule.c: update for numpy 1.8

File:

• interfaces/python/aubioproxy.c (modified) (3 diffs)

interfaces/python/aubioproxy.c

@@ -13 +13 @@
 
     // we got an array, convert it to an fvec 
-    if (PyArray_NDIM (input) == 0) {
+    if (PyArray_NDIM ((PyArrayObject *)input) == 0) {
       PyErr_SetString (PyExc_ValueError, "input array is a scalar");
       goto fail;
-    } else if (PyArray_NDIM (input) > 1) {
+    } else if (PyArray_NDIM ((PyArrayObject *)input) > 1) {
       PyErr_SetString (PyExc_ValueError,
           "input array has more than one dimensions");
@@ -22 +22 @@
     }
 
-    if (!PyArray_ISFLOAT (input)) {
+    if (!PyArray_ISFLOAT ((PyArrayObject *)input)) {
       PyErr_SetString (PyExc_ValueError, "input array should be float");
       goto fail;
-    } else if (PyArray_TYPE (input) != AUBIO_NPY_SMPL) {
+    } else if (PyArray_TYPE ((PyArrayObject *)input) != AUBIO_NPY_SMPL) {
       PyErr_SetString (PyExc_ValueError, "input array should be float32");
       goto fail;
@@ -36 +36 @@
     // no need to really allocate fvec, just its struct member 
     vec = (fvec_t *)malloc(sizeof(fvec_t));
-    vec->length = PyArray_SIZE (array);
-    vec->data = (smpl_t *) PyArray_GETPTR1 (array, 0);
+    vec->length = PyArray_SIZE ((PyArrayObject *)array);
+    vec->data = (smpl_t *) PyArray_GETPTR1 ((PyArrayObject *)array, 0);
 
   } else if (PyObject_TypeCheck (input, &PyList_Type)) {