Changeset 352fd5f for interfaces

Timestamp:

Oct 2, 2009, 11:19:48 AM (15 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:

6b1aafc

Parents:

eb7f743

Message:

python/py-fvec.c, python/aubio-types.g: define AUBIO_FLOAT, move default length and channels here, rename fvec to aubio.fvec

Location:

interfaces/python

Files:

• aubio-types.h (modified) (2 diffs)
• py-fvec.c (modified) (4 diffs)

interfaces/python/aubio-types.h

@@ -4 +4 @@
 #include <numpy/arrayobject.h>
 #include <aubio.h>
+
+#define Py_fvec_default_length   1024
+#define Py_fvec_default_channels 1
+
+#ifdef HAVE_AUBIO_DOUBLE
+#define AUBIO_FLOAT NPY_FLOAT
+#else
+#define AUBIO_FLOAT NPY_LONG
+#endif
+
+/**
+
+Defining this constant to 1 will allow PyAubio_CastToFvec to convert from data
+types different than NPY_FLOAT to and fvec, and therefore creating a copy of
+it. 
+
+*/
+#define AUBIO_DO_CASTING 0
 
 typedef struct
@@ -12 +30 @@
 } Py_fvec;
 extern PyTypeObject Py_fvecType;
+
+extern PyObject *PyAubio_FvecToArray (Py_fvec * self);
+
+extern Py_fvec *PyAubio_ArrayToFvec (PyObject * self);

interfaces/python/py-fvec.c

@@ -11 +11 @@
 */
 
-#define Py_fvec_default_length   1024
-#define Py_fvec_default_channels 1
-
 static char Py_fvec_doc[] = "fvec object";
 
@@ -109 +106 @@
 }
 
-static PyObject *
-Py_fvec_array (Py_fvec * self)
+PyObject *
+PyAubio_FvecToArray (Py_fvec * self)
 {
   PyObject *array = NULL;
@@ -199 +196 @@
   {"dump", (PyCFunction) Py_fvec_print, METH_NOARGS,
       "Dumps the contents of the vector to stdout."},
-  {"__array__", (PyCFunction) Py_fvec_array, METH_NOARGS,
+  {"__array__", (PyCFunction) PyAubio_FvecToArray, METH_NOARGS,
       "Returns the first channel as a numpy array."},
   {NULL}
@@ -221 +218 @@
   PyObject_HEAD_INIT (NULL)
   0,                            /* ob_size           */
-  "fvec",                       /* tp_name           */
+  "aubio.fvec",                 /* tp_name           */
   sizeof (Py_fvec),             /* tp_basicsize      */
   0,                            /* tp_itemsize       */