.

[aubio.git] / interfaces / python / aubio-types.h

diff --git a/interfaces/python/aubio-types.h b/interfaces/python/aubio-types.h
index d5609e7b1c46d11975d9d29c1b8507727a648d8d..cbab5a0b7c2bb6dea554d587171afbde052eed8c 100644 (file)
--- a/interfaces/python/aubio-types.h
+++ b/interfaces/python/aubio-types.h
@@ -9,10 +9,11 @@
 
 #define Py_aubio_default_samplerate 44100
 
-#ifdef HAVE_AUBIO_DOUBLE
-#define AUBIO_FLOAT NPY_FLOAT
+#if HAVE_AUBIO_DOUBLE
+#error "Ouch! Python interface for aubio has not been much tested yet."
+#define AUBIO_NPY_SMPL NPY_DOUBLE
 #else
-#define AUBIO_FLOAT NPY_LONG
+#define AUBIO_NPY_SMPL NPY_FLOAT
 #endif
 
 /**
@@ -32,11 +33,24 @@ typedef struct
   uint_t channels;
 } Py_fvec;
 extern PyTypeObject Py_fvecType;
+extern PyObject *PyAubio_FvecToArray (Py_fvec * self);
+extern Py_fvec *PyAubio_ArrayToFvec (PyObject * self);
 
+typedef struct
+{
+  PyObject_HEAD
+  cvec_t * o;
+  uint_t length;
+  uint_t channels;
+} Py_cvec;
 extern PyTypeObject Py_cvecType;
+extern PyObject *PyAubio_CvecToArray (Py_cvec * self);
+extern Py_cvec *PyAubio_ArrayToCvec (PyObject * self);
 
 extern PyTypeObject Py_filterType;
 
-extern PyObject *PyAubio_FvecToArray (Py_fvec * self);
+extern PyTypeObject Py_filterbankType;
 
-extern Py_fvec *PyAubio_ArrayToFvec (PyObject * self);
+extern PyTypeObject Py_fftType;
+
+extern PyTypeObject Py_pvocType;