ref: 7a7b00f3a3d6681b34287a8e94d5314cd6ae2c0e
parent: f7b05d4f2431cb41112fd2c497acd49e918707d7
author: Paul Brossier <piem@piem.org>
date: Fri Dec 4 20:42:46 EST 2009
py-fvec.c, py-cvec.c: towards mono
--- a/interfaces/python/py-cvec.c
+++ b/interfaces/python/py-cvec.c
@@ -3,25 +3,24 @@
/* cvec type definition
class cvec():
- def __init__(self, length = 1024, channels = 1):
+ def __init__(self, length = 1024):
self.length = length
- self.channels = channels
- self.norm = array(length, channels)
- self.phas = array(length, channels)
+ self.norm = array(length)
+ self.phas = array(length)
+
*/
-
static char Py_cvec_doc[] = "cvec object";
static PyObject *
Py_cvec_new (PyTypeObject * type, PyObject * args, PyObject * kwds)
{- int length= 0, channels = 0;
+ int length= 0;
Py_cvec *self;
- static char *kwlist[] = { "length", "channels", NULL };+ static char *kwlist[] = { "length", NULL };- if (!PyArg_ParseTupleAndKeywords (args, kwds, "|II", kwlist,
- &length, &channels)) {+ if (!PyArg_ParseTupleAndKeywords (args, kwds, "|I", kwlist,
+ &length)) {return NULL;
}
@@ -29,7 +28,6 @@
self = (Py_cvec *) type->tp_alloc (type, 0);
self->length = Py_default_vector_length / 2 + 1;
- self->channels = Py_default_vector_channels;
if (self == NULL) {return NULL;
@@ -43,14 +41,6 @@
return NULL;
}
- if (channels > 0) {- self->channels = channels;
- } else if (channels < 0) {- PyErr_SetString (PyExc_ValueError,
- "can not use negative number of channels");
- return NULL;
- }
-
return (PyObject *) self;
}
@@ -57,7 +47,7 @@
static int
Py_cvec_init (Py_cvec * self, PyObject * args, PyObject * kwds)
{- self->o = new_cvec ((self->length - 1) * 2, self->channels);
+ self->o = new_cvec ((self->length - 1) * 2);
if (self->o == NULL) {return -1;
}
@@ -79,16 +69,16 @@
PyObject *args = NULL;
PyObject *result = NULL;
- format = PyString_FromString ("aubio cvec of %d elements with %d channels");+ format = PyString_FromString ("aubio cvec of %d elements"); if (format == NULL) {goto fail;
}
- args = Py_BuildValue ("II", self->length, self->channels);+ args = Py_BuildValue ("I", self->length); if (args == NULL) {goto fail;
}
- //cvec_print ( self->o );
+ cvec_print ( self->o );
result = PyString_Format (format, args);
@@ -103,7 +93,10 @@
PyAubio_ArrayToCvec (PyObject *input) {PyObject *array;
Py_cvec *vec;
- uint_t i;
+ if (input == NULL) {+ PyErr_SetString (PyExc_ValueError, "input array is not a python object");
+ goto fail;
+ }
// parsing input object into a Py_cvec
if (PyObject_TypeCheck (input, &Py_cvecType)) {// input is an cvec, nothing else to do
@@ -114,9 +107,9 @@
if (PyArray_NDIM (input) == 0) {PyErr_SetString (PyExc_ValueError, "input array is a scalar");
goto fail;
- } else if (PyArray_NDIM (input) > 2) {+ } else if (PyArray_NDIM (input) > 1) {PyErr_SetString (PyExc_ValueError,
- "input array has more than two dimensions");
+ "input array has more than one dimensions");
goto fail;
}
@@ -123,19 +116,9 @@
if (!PyArray_ISFLOAT (input)) {PyErr_SetString (PyExc_ValueError, "input array should be float");
goto fail;
-#if AUBIO_DO_CASTING
} else if (PyArray_TYPE (input) != AUBIO_NPY_SMPL) {- // input data type is not float32, casting
- array = PyArray_Cast ( (PyArrayObject*) input, AUBIO_NPY_SMPL);
- if (array == NULL) {- PyErr_SetString (PyExc_IndexError, "failed converting to NPY_FLOAT");
- goto fail;
- }
-#else
- } else if (PyArray_TYPE (input) != AUBIO_NPY_SMPL) {PyErr_SetString (PyExc_ValueError, "input array should be float32");
goto fail;
-#endif
} else {// input data type is float32, nothing else to do
array = input;
@@ -143,29 +126,21 @@
// create a new cvec object
vec = (Py_cvec*) PyObject_New (Py_cvec, &Py_cvecType);
- if (PyArray_NDIM (array) == 1) {+ if (PyArray_NDIM (array) != 2) {PyErr_SetString (PyExc_ValueError,
- "input array should be have at least two rows for norm and phas");
+ "input array should be have exactly two rows for norm and phas");
goto fail;
- } else if (PyArray_NDIM (array) == 2) {- vec->channels = 1;
- vec->length = PyArray_SIZE (array);
} else {- vec->channels = PyArray_DIM (array, 0) / 2;
- vec->length = PyArray_DIM (array, 1);
+ vec->length = PyArray_SIZE (array);
}
// no need to really allocate cvec, just its struct member
- // vec->o = new_cvec (vec->length, vec->channels);
+ // vec->o = new_cvec (vec->length);
vec->o = (cvec_t *)malloc(sizeof(cvec_t));
- vec->o->length = vec->length; vec->o->channels = vec->channels;
- vec->o->norm = (smpl_t**)malloc(vec->o->channels * sizeof(smpl_t*));
- vec->o->phas = (smpl_t**)malloc(vec->o->channels * sizeof(smpl_t*));
- // hat data[i] point to array line
- for (i = 0; i < vec->channels; i+=2) {- vec->o->norm[i] = (smpl_t *) PyArray_GETPTR1 (array, i);
- vec->o->phas[i] = (smpl_t *) PyArray_GETPTR1 (array, i+1);
- }
+ vec->o->length = vec->length;
+ // have norm and phas point to array rows
+ vec->o->norm = (smpl_t *) PyArray_GETPTR1 (array, 0);
+ vec->o->phas = (smpl_t *) PyArray_GETPTR1 (array, 1);
} else {PyErr_SetString (PyExc_ValueError, "can only accept array or cvec as input");
@@ -182,17 +157,14 @@
PyAubio_CvecToArray (Py_cvec * self)
{PyObject *array = NULL;
- uint_t i;
npy_intp dims[] = { self->o->length, 1 };PyObject *concat = PyList_New (0), *tmp = NULL;
- for (i = 0; i < self->channels; i++) {- tmp = PyArray_SimpleNewFromData (1, dims, NPY_FLOAT, self->o->norm[i]);
- PyList_Append (concat, tmp);
- Py_DECREF (tmp);
- tmp = PyArray_SimpleNewFromData (1, dims, NPY_FLOAT, self->o->phas[i]);
- PyList_Append (concat, tmp);
- Py_DECREF (tmp);
- }
+ tmp = PyArray_SimpleNewFromData (1, dims, NPY_FLOAT, self->o->norm);
+ PyList_Append (concat, tmp);
+ Py_DECREF (tmp);
+ tmp = PyArray_SimpleNewFromData (1, dims, NPY_FLOAT, self->o->phas);
+ PyList_Append (concat, tmp);
+ Py_DECREF (tmp);
array = PyArray_FromObject (concat, NPY_FLOAT, 2, 2);
Py_DECREF (concat);
return array;
@@ -201,18 +173,8 @@
PyObject *
PyAubio_CvecNormToArray (Py_cvec * self)
{- PyObject *array = NULL;
- uint_t i;
npy_intp dims[] = { self->o->length, 1 };- PyObject *concat = PyList_New (0), *tmp = NULL;
- for (i = 0; i < self->channels; i++) {- tmp = PyArray_SimpleNewFromData (1, dims, NPY_FLOAT, self->o->norm[i]);
- PyList_Append (concat, tmp);
- Py_DECREF (tmp);
- }
- array = PyArray_FromObject (concat, NPY_FLOAT, 2, 2);
- Py_DECREF (concat);
- return array;
+ return PyArray_SimpleNewFromData (1, dims, NPY_FLOAT, self->o->norm);
}
@@ -219,18 +181,8 @@
PyObject *
PyAubio_CvecPhasToArray (Py_cvec * self)
{- PyObject *array = NULL;
- uint_t i;
npy_intp dims[] = { self->o->length, 1 };- PyObject *concat = PyList_New (0), *tmp = NULL;
- for (i = 0; i < self->channels; i++) {- tmp = PyArray_SimpleNewFromData (1, dims, NPY_FLOAT, self->o->phas[i]);
- PyList_Append (concat, tmp);
- Py_DECREF (tmp);
- }
- array = PyArray_FromObject (concat, NPY_FLOAT, 2, 2);
- Py_DECREF (concat);
- return array;
+ return PyArray_SimpleNewFromData (1, dims, NPY_FLOAT, self->o->phas);
}
PyObject *
@@ -254,7 +206,6 @@
static int
Py_cvec_set_norm (Py_cvec * vec, PyObject *input, void * closure)
{- uint_t i;
PyObject * array;
if (input == NULL) {PyErr_SetString (PyExc_ValueError, "input array is not a python object");
@@ -282,12 +233,12 @@
array = input;
// check input array dimensions
- if (PyArray_NDIM (array) == 1) {- if (vec->channels != 1) {- PyErr_SetString (PyExc_ValueError,
- "input array should have more than one channel");
- goto fail;
- }
+ if (PyArray_NDIM (array) != 1) {+ PyErr_Format (PyExc_ValueError,
+ "input array has %d dimensions, not 1",
+ PyArray_NDIM (array));
+ goto fail;
+ } else { if (vec->o->length != PyArray_SIZE (array)) {PyErr_Format (PyExc_ValueError,
"input array has length %d, but cvec has length %d",
@@ -294,24 +245,9 @@
PyArray_SIZE (array), vec->o->length);
goto fail;
}
- } else {- if (vec->channels != PyArray_DIM (array, 0)) {- PyErr_Format (PyExc_ValueError,
- "input array has %d channels, but vector has %d channels",
- PyArray_DIM (array, 0), vec->channels);
- goto fail;
- }
- if (vec->o->length != PyArray_DIM (array, 1)) {- PyErr_Format (PyExc_ValueError,
- "input array has length %d, but vector has length %d",
- PyArray_DIM (array, 1), vec->o->length);
- goto fail;
- }
}
- for (i = 0; i < vec->channels; i++) {- vec->o->norm[i] = (smpl_t *) PyArray_GETPTR1 (array, i);
- }
+ vec->o->norm = (smpl_t *) PyArray_GETPTR1 (array, 0);
} else {PyErr_SetString (PyExc_ValueError, "can only accept array as input");
@@ -328,7 +264,6 @@
static int
Py_cvec_set_phas (Py_cvec * vec, PyObject *input, void * closure)
{- uint_t i;
PyObject * array;
if (input == NULL) {PyErr_SetString (PyExc_ValueError, "input array is not a python object");
@@ -356,12 +291,12 @@
array = input;
// check input array dimensions
- if (PyArray_NDIM (array) == 1) {- if (vec->channels != 1) {- PyErr_SetString (PyExc_ValueError,
- "input array should have more than one channel");
- goto fail;
- }
+ if (PyArray_NDIM (array) != 1) {+ PyErr_Format (PyExc_ValueError,
+ "input array has %d dimensions, not 1",
+ PyArray_NDIM (array));
+ goto fail;
+ } else { if (vec->o->length != PyArray_SIZE (array)) {PyErr_Format (PyExc_ValueError,
"input array has length %d, but cvec has length %d",
@@ -368,24 +303,9 @@
PyArray_SIZE (array), vec->o->length);
goto fail;
}
- } else {- if (vec->channels != PyArray_DIM (array, 0)) {- PyErr_Format (PyExc_ValueError,
- "input array has %d channels, but vector has %d channels",
- PyArray_DIM (array, 0), vec->channels);
- goto fail;
- }
- if (vec->o->length != PyArray_DIM (array, 1)) {- PyErr_Format (PyExc_ValueError,
- "input array has length %d, but vector has length %d",
- PyArray_DIM (array, 1), vec->o->length);
- goto fail;
- }
}
- for (i = 0; i < vec->channels; i++) {- vec->o->phas[i] = (smpl_t *) PyArray_GETPTR1 (array, i);
- }
+ vec->o->phas = (smpl_t *) PyArray_GETPTR1 (array, 0);
} else {PyErr_SetString (PyExc_ValueError, "can only accept array as input");
@@ -399,68 +319,10 @@
return 1;
}
-static Py_ssize_t
-Py_cvec_getchannels (Py_cvec * self)
-{- return self->channels;
-}
-
-static PyObject *
-Py_cvec_getitem (Py_cvec * self, Py_ssize_t index)
-{- PyObject *array;
-
- if (index < 0 || index >= self->channels) {- PyErr_SetString (PyExc_IndexError, "no such channel");
- return NULL;
- }
-
- npy_intp dims[] = { self->length, 1 };- array = PyArray_SimpleNewFromData (1, dims, NPY_FLOAT, self->o->norm[index]);
- return array;
-}
-
-static int
-Py_cvec_setitem (Py_cvec * self, Py_ssize_t index, PyObject * o)
-{- PyObject *array;
-
- if (index < 0 || index >= self->channels) {- PyErr_SetString (PyExc_IndexError, "no such channel");
- return -1;
- }
-
- array = PyArray_FROM_OT (o, NPY_FLOAT);
- if (array == NULL) {- PyErr_SetString (PyExc_ValueError, "should be an array of float");
- goto fail;
- }
-
- if (PyArray_NDIM (array) != 1) {- PyErr_SetString (PyExc_ValueError, "should be a one-dimensional array");
- goto fail;
- }
-
- if (PyArray_SIZE (array) != self->length) {- PyErr_SetString (PyExc_ValueError,
- "should be an array of same length as target cvec");
- goto fail;
- }
-
- self->o->norm[index] = (smpl_t *) PyArray_GETPTR1 (array, 0);
-
- return 0;
-
-fail:
- return -1;
-}
-
static PyMemberDef Py_cvec_members[] = {// TODO remove READONLY flag and define getter/setter
{"length", T_INT, offsetof (Py_cvec, length), READONLY,"length attribute"},
- {"channels", T_INT, offsetof (Py_cvec, channels), READONLY,- "channels attribute"},
{NULL} /* Sentinel */};
@@ -480,20 +342,6 @@
{NULL} /* sentinel */};
-static PySequenceMethods Py_cvec_tp_as_sequence = {- (lenfunc) Py_cvec_getchannels, /* sq_length */
- 0, /* sq_concat */
- 0, /* sq_repeat */
- (ssizeargfunc) Py_cvec_getitem, /* sq_item */
- 0, /* sq_slice */
- (ssizeobjargproc) Py_cvec_setitem, /* sq_ass_item */
- 0, /* sq_ass_slice */
- 0, /* sq_contains */
- 0, /* sq_inplace_concat */
- 0, /* sq_inplace_repeat */
-};
-
-
PyTypeObject Py_cvecType = {PyObject_HEAD_INIT (NULL)
0, /* ob_size */
@@ -507,7 +355,7 @@
0, /* tp_compare */
(reprfunc) Py_cvec_repr, /* tp_repr */
0, /* tp_as_number */
- &Py_cvec_tp_as_sequence, /* tp_as_sequence */
+ 0, //&Py_cvec_tp_as_sequence, /* tp_as_sequence */
0, /* tp_as_mapping */
0, /* tp_hash */
0, /* tp_call */
--- a/interfaces/python/py-fvec.c
+++ b/interfaces/python/py-fvec.c
@@ -3,10 +3,9 @@
/* fvec type definition
class fvec():
- def __init__(self, length = 1024, channels = 1):
+ def __init__(self, length = 1024):
self.length = length
- self.channels = channels
- self.data = array(length, channels)
+ self.data = array(length)
*/
@@ -15,20 +14,18 @@
static PyObject *
Py_fvec_new (PyTypeObject * type, PyObject * args, PyObject * kwds)
{- int length= 0, channels = 0;
+ int length= 0;
Py_fvec *self;
- static char *kwlist[] = { "length", "channels", NULL };+ static char *kwlist[] = { "length", NULL };- if (!PyArg_ParseTupleAndKeywords (args, kwds, "|II", kwlist,
- &length, &channels)) {+ if (!PyArg_ParseTupleAndKeywords (args, kwds, "|I", kwlist,
+ &length)) {return NULL;
}
-
self = (Py_fvec *) type->tp_alloc (type, 0);
self->length = Py_default_vector_length;
- self->channels = Py_default_vector_channels;
if (self == NULL) {return NULL;
@@ -42,14 +39,6 @@
return NULL;
}
- if (channels > 0) {- self->channels = channels;
- } else if (channels < 0) {- PyErr_SetString (PyExc_ValueError,
- "can not use negative number of channels");
- return NULL;
- }
-
return (PyObject *) self;
}
@@ -56,7 +45,7 @@
static int
Py_fvec_init (Py_fvec * self, PyObject * args, PyObject * kwds)
{- self->o = new_fvec (self->length, self->channels);
+ self->o = new_fvec (self->length);
if (self->o == NULL) {return -1;
}
@@ -74,16 +63,17 @@
static PyObject *
Py_fvec_repr (Py_fvec * self, PyObject * unused)
{+#if 0
PyObject *format = NULL;
PyObject *args = NULL;
PyObject *result = NULL;
- format = PyString_FromString ("aubio fvec of %d elements with %d channels");+ format = PyString_FromString ("aubio fvec of %d elements"); if (format == NULL) {goto fail;
}
- args = Py_BuildValue ("II", self->length, self->channels);+ args = Py_BuildValue ("I", self->length); if (args == NULL) {goto fail;
}
@@ -96,6 +86,27 @@
Py_XDECREF (args);
return result;
+#endif
+ PyObject *format = NULL;
+ PyObject *args = NULL;
+ PyObject *result = NULL;
+
+ format = PyString_FromString ("%s");+ if (format == NULL) {+ goto fail;
+ }
+
+ args = Py_BuildValue ("O", PyAubio_FvecToArray (self));+ if (args == NULL) {+ goto fail;
+ }
+
+ result = PyString_Format (format, args);
+fail:
+ Py_XDECREF (format);
+ Py_XDECREF (args);
+
+ return result;
}
Py_fvec *
@@ -102,7 +113,6 @@
PyAubio_ArrayToFvec (PyObject *input) {PyObject *array;
Py_fvec *vec;
- uint_t i;
if (input == NULL) {PyErr_SetString (PyExc_ValueError, "input array is not a python object");
goto fail;
@@ -117,9 +127,9 @@
if (PyArray_NDIM (input) == 0) {PyErr_SetString (PyExc_ValueError, "input array is a scalar");
goto fail;
- } else if (PyArray_NDIM (input) > 2) {+ } else if (PyArray_NDIM (input) > 1) {PyErr_SetString (PyExc_ValueError,
- "input array has more than two dimensions");
+ "input array has more than one dimensions");
goto fail;
}
@@ -126,19 +136,9 @@
if (!PyArray_ISFLOAT (input)) {PyErr_SetString (PyExc_ValueError, "input array should be float");
goto fail;
-#if AUBIO_DO_CASTING
} else if (PyArray_TYPE (input) != AUBIO_NPY_SMPL) {- // input data type is not float32, casting
- array = PyArray_Cast ( (PyArrayObject*) input, AUBIO_NPY_SMPL);
- if (array == NULL) {- PyErr_SetString (PyExc_IndexError, "failed converting to AUBIO_NPY_SMPL");
- goto fail;
- }
-#else
- } else if (PyArray_TYPE (input) != AUBIO_NPY_SMPL) {PyErr_SetString (PyExc_ValueError, "input array should be float32");
goto fail;
-#endif
} else {// input data type is float32, nothing else to do
array = input;
@@ -146,26 +146,19 @@
// create a new fvec object
vec = (Py_fvec*) PyObject_New (Py_fvec, &Py_fvecType);
- if (PyArray_NDIM (array) == 1) {- vec->channels = 1;
- vec->length = PyArray_SIZE (array);
- } else {- vec->channels = PyArray_DIM (array, 0);
- vec->length = PyArray_DIM (array, 1);
- }
+ vec->length = PyArray_SIZE (array);
// no need to really allocate fvec, just its struct member
- // vec->o = new_fvec (vec->length, vec->channels);
+ // vec->o = new_fvec (vec->length);
vec->o = (fvec_t *)malloc(sizeof(fvec_t));
- vec->o->length = vec->length; vec->o->channels = vec->channels;
- vec->o->data = (smpl_t**)malloc(vec->o->channels * sizeof(smpl_t*));
- // hat data[i] point to array line
- for (i = 0; i < vec->channels; i++) {- vec->o->data[i] = (smpl_t *) PyArray_GETPTR1 (array, i);
- }
+ vec->o->length = vec->length;
+ vec->o->data = (smpl_t *) PyArray_GETPTR1 (array, 0);
+ } else if (PyObject_TypeCheck (input, &PyList_Type)) {+ PyErr_SetString (PyExc_ValueError, "does not convert from list yet");
+ return NULL;
} else {- PyErr_SetString (PyExc_ValueError, "can only accept array or fvec as input");
+ PyErr_SetString (PyExc_ValueError, "can only accept vector or fvec as input");
return NULL;
}
@@ -178,18 +171,8 @@
PyObject *
PyAubio_CFvecToArray (fvec_t * self)
{- PyObject *array = NULL;
- uint_t i;
npy_intp dims[] = { self->length, 1 };- PyObject *concat = PyList_New (0), *tmp = NULL;
- for (i = 0; i < self->channels; i++) {- tmp = PyArray_SimpleNewFromData (1, dims, AUBIO_NPY_SMPL, self->data[i]);
- PyList_Append (concat, tmp);
- Py_DECREF (tmp);
- }
- array = PyArray_FromObject (concat, AUBIO_NPY_SMPL, 2, 2);
- Py_DECREF (concat);
- return array;
+ return PyArray_SimpleNewFromData (1, dims, AUBIO_NPY_SMPL, self->data);
}
PyObject *
@@ -196,74 +179,38 @@
PyAubio_FvecToArray (Py_fvec * self)
{PyObject *array = NULL;
- if (self->channels == 1) {- npy_intp dims[] = { self->length, 1 };- array = PyArray_SimpleNewFromData (1, dims, AUBIO_NPY_SMPL, self->o->data[0]);
- } else {- uint_t i;
- npy_intp dims[] = { self->length, 1 };- PyObject *concat = PyList_New (0), *tmp = NULL;
- for (i = 0; i < self->channels; i++) {- tmp = PyArray_SimpleNewFromData (1, dims, AUBIO_NPY_SMPL, self->o->data[i]);
- PyList_Append (concat, tmp);
- Py_DECREF (tmp);
- }
- array = PyArray_FromObject (concat, AUBIO_NPY_SMPL, 2, 2);
- Py_DECREF (concat);
- }
+ npy_intp dims[] = { self->length, 1 };+ array = PyArray_SimpleNewFromData (1, dims, AUBIO_NPY_SMPL, self->o->data);
return array;
}
-static Py_ssize_t
-Py_fvec_getchannels (Py_fvec * self)
-{- return self->channels;
-}
-
static PyObject *
Py_fvec_getitem (Py_fvec * self, Py_ssize_t index)
{- PyObject *array;
-
- if (index < 0 || index >= self->channels) {- PyErr_SetString (PyExc_IndexError, "no such channel");
+ if (index < 0 || index >= self->length) {+ PyErr_SetString (PyExc_IndexError, "no such element");
return NULL;
}
- npy_intp dims[] = { self->length, 1 };- array = PyArray_SimpleNewFromData (1, dims, AUBIO_NPY_SMPL, self->o->data[index]);
- return array;
+ return PyFloat_FromDouble (self->o->data[index]);
}
static int
Py_fvec_setitem (Py_fvec * self, Py_ssize_t index, PyObject * o)
{- PyObject *array;
- if (index < 0 || index >= self->channels) {- PyErr_SetString (PyExc_IndexError, "no such channel");
- return -1;
- }
-
- array = PyArray_FROM_OT (o, AUBIO_NPY_SMPL);
- if (array == NULL) {- PyErr_SetString (PyExc_ValueError, "should be an array of float");
+ if (index < 0 || index >= self->length) {+ PyErr_SetString (PyExc_IndexError, "no such element");
goto fail;
}
- if (PyArray_NDIM (array) != 1) {- PyErr_SetString (PyExc_ValueError, "should be a one-dimensional array");
+ if (PyFloat_Check (o)) {+ PyErr_SetString (PyExc_ValueError, "should be a float");
goto fail;
}
- if (PyArray_SIZE (array) != self->length) {- PyErr_SetString (PyExc_ValueError,
- "should be an array of same length as target fvec");
- goto fail;
- }
+ self->o->data[index] = (smpl_t) PyFloat_AsDouble(o);
- self->o->data[index] = (smpl_t *) PyArray_GETPTR1 (array, 0);
-
return 0;
fail:
@@ -270,12 +217,16 @@
return -1;
}
+int
+Py_fvec_get_length (Py_fvec * self)
+{ + return self->length;
+}
+
static PyMemberDef Py_fvec_members[] = {// TODO remove READONLY flag and define getter/setter
{"length", T_INT, offsetof (Py_fvec, length), READONLY,"length attribute"},
- {"channels", T_INT, offsetof (Py_fvec, channels), READONLY,- "channels attribute"},
{NULL} /* Sentinel */};
@@ -286,7 +237,7 @@
};
static PySequenceMethods Py_fvec_tp_as_sequence = {- (lenfunc) Py_fvec_getchannels, /* sq_length */
+ (lenfunc) Py_fvec_get_length, /* sq_length */
0, /* sq_concat */
0, /* sq_repeat */
(ssizeargfunc) Py_fvec_getitem, /* sq_item */