Changeset 7a6521d

Timestamp:

Mar 4, 2013, 8:28:17 PM (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:

164980f

Parents:

6514bb6

Message:

aubiomodule.c: simplify includes

Location:

python

Files:

• aubio-types.h (modified) (1 diff)
• aubiomodule.c (modified) (3 diffs)

python/aubio-types.h

@@ -1 @@
-#include <Python.h>
+#include "Python.h"
 #include <structmember.h>
+
+//#define NPY_NO_DEPRECATED_API NPY_1_7_API_VERSION
+
+// define numpy unique symbols for aubio
+#define PY_ARRAY_UNIQUE_SYMBOL PYAUBIO_ARRAY_API
+#define PY_UFUNC_UNIQUE_SYMBOL PYAUBIO_UFUNC_API
+
+// only import array and ufunc from main module
+#ifndef PY_AUBIO_MODULE_MAIN
 #define NO_IMPORT_ARRAY
-//#define NPY_NO_DEPRECATED_API NPY_1_7_API_VERSION
-#include <numpy/arrayobject.h>
+#define NO_IMPORT_UFUNC
+#endif
+
+// import aubio
+#include <numpy/ndarraytypes.h>
+#include <numpy/ufuncobject.h>
+#include <numpy/npy_3kcompat.h>
+
 #define AUBIO_UNSTABLE 1
 #include <aubio.h>
 
 #define Py_default_vector_length 1024
-#define Py_default_vector_height 1
 
 #define Py_aubio_default_samplerate 44100

python/aubiomodule.c

@@ -1 @@
-#include <Python.h>
-#define PY_ARRAY_UNIQUE_SYMBOL PyArray_API
-//#define NPY_NO_DEPRECATED_API NPY_1_7_API_VERSION
-#include <numpy/arrayobject.h>
-
+#define PY_AUBIO_MODULE_MAIN
 #include "aubio-types.h"
 #include "generated/aubio-generated.h"
@@ -247 +243 @@
   int err;
 
+  // fvec is defined in __init__.py
   if (   (PyType_Ready (&Py_cvecType) < 0)
       || (PyType_Ready (&Py_filterType) < 0)
@@ -282 +279 @@
   PyModule_AddObject (m, "pvoc", (PyObject *) & Py_pvocType);
 
-  // generated objects
+  // add generated objects
   add_generated_objects(m);
 }