Showing the changes to python/ext (2 of 2 files). Show all
Unified · Split
| @@ -63,7 +63,6 @@ extern int PyAubio_IsValidVector (PyObject *input); · 62 unmodified lines | |||
| 63 | extern PyObject *PyAubio_CFvecToArray (fvec_t * self); | 63 | extern PyObject *PyAubio_CFvecToArray (fvec_t * self); |
| 64 | extern int PyAubio_ArrayToCFvec (PyObject * self, fvec_t *out); | 64 | extern int PyAubio_ArrayToCFvec (PyObject * self, fvec_t *out); |
| 65 | 65 | ||
| 66 | extern PyObject * PyAubio_CCvecToPyCvec (cvec_t * self); | ||
| 67 | extern int PyAubio_PyCvecToCCvec (PyObject *input, cvec_t *i); | 66 | extern int PyAubio_PyCvecToCCvec (PyObject *input, cvec_t *i); |
| 68 | 67 | ||
| 69 | extern PyObject *PyAubio_CFmatToArray (fmat_t * self); | 68 | extern PyObject *PyAubio_CFmatToArray (fmat_t * self); |
| @@ -32,20 +32,6 @@ new_py_cvec(uint_t length) { · 31 unmodified lines | |||
| 32 | return (PyObject*)vec; | 32 | return (PyObject*)vec; |
| 33 | } | 33 | } |
| 34 | 34 | ||
| 35 | PyObject * | ||
| 36 | PyAubio_CCvecToPyCvec (cvec_t * input) { | ||
| 37 | if (input == NULL) { | ||
| 38 | PyErr_SetString (PyExc_ValueError, "PyAubio_CCvecToPyCvec got a null cvec!"); | ||
| 39 | return NULL; | ||
| 40 | } | ||
| 41 | Py_cvec* vec = (Py_cvec*) PyObject_New (Py_cvec, &Py_cvecType); | ||
| 42 | npy_intp dims[] = { input->length, 1 }; | ||
| 43 | vec->norm = PyArray_SimpleNewFromData (1, dims, AUBIO_NPY_SMPL, input->norm); | ||
| 44 | vec->phas = PyArray_SimpleNewFromData (1, dims, AUBIO_NPY_SMPL, input->phas); | ||
| 45 | vec->length = input->length; | ||
| 46 | return (PyObject *)vec; | ||
| 47 | } | ||
| 48 | |||
| 49 | int | 35 | int |
| 50 | PyAubio_PyCvecToCCvec (PyObject *input, cvec_t *i) { | 36 | PyAubio_PyCvecToCCvec (PyObject *input, cvec_t *i) { |
| 51 | if (PyObject_TypeCheck (input, &Py_cvecType)) { | 37 | if (PyObject_TypeCheck (input, &Py_cvecType)) { |