Changeset 03c3450


Ignore:
Timestamp:
Dec 25, 2009, 4:37:03 AM (14 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:
0178c65
Parents:
7395ec5
Message:

aubio-types.h: kill fvec and fmat, update proxy functions

File:
1 edited

Legend:

Unmodified
Added
Removed

  • interfaces/python/aubio-types.h

    r7395ec5 r03c3450  
    1818#endif
    1919
    20 /**
    21 
    22 Defining this constant to 1 will allow PyAubio_CastToFvec to convert from data
    23 types different than NPY_FLOAT to and fvec, and therefore creating a copy of
    24 it.
    25 
    26 */
    27 
    28 typedef struct
    29 {
    30   PyObject_HEAD
    31   fvec_t * o;
    32   uint_t length;
    33 } Py_fvec;
    34 extern PyTypeObject Py_fvecType;
    35 extern PyObject *PyAubio_FvecToArray (Py_fvec * self);
    36 extern PyObject *PyAubio_CFvecToArray (fvec_t * self);
    37 extern Py_fvec *PyAubio_ArrayToFvec (PyObject * self);
    38 
    39 typedef struct
    40 {
    41   PyObject_HEAD
    42   fmat_t * o;
    43   uint_t length;
    44   uint_t height;
    45 } Py_fmat;
    46 extern PyTypeObject Py_fmatType;
    47 extern PyObject *PyAubio_FmatToArray (Py_fmat * self);
    48 extern PyObject *PyAubio_CFmatToArray (fmat_t * self);
    49 extern Py_fmat *PyAubio_ArrayToFmat (PyObject * self);
    50 
     20// special python type for cvec
    5121typedef struct
    5222{
    … …  
    6030extern Py_cvec *PyAubio_ArrayToCvec (PyObject * self);
    6131
     32// defined in aubio-proxy.c
     33extern PyObject *PyAubio_CFvecToArray (fvec_t * self);
     34extern fvec_t *PyAubio_ArrayToCFvec (PyObject * self);
     35
     36extern Py_cvec *PyAubio_CCvecToPyCvec (cvec_t * self);
     37extern cvec_t *PyAubio_ArrayToCCvec (PyObject *input);
     38
     39extern PyObject *PyAubio_CFmatToArray (fmat_t * self);
     40extern fmat_t *PyAubio_ArrayToCFmat (PyObject *input);
     41
     42// hand written wrappers
    6243extern PyTypeObject Py_filterType;
    6344
    … …  
    6748
    6849extern PyTypeObject Py_pvocType;
     50
Note: See TracChangeset for help on using the changeset viewer.