Ignore:
Timestamp:
Nov 21, 2018, 1:00:47 PM (21 months ago)
Author:
Paul Brossier <piem@piem.org>
Branches:
feature/constantq
Children:
f87e191
Parents:
c03d191 (diff), 5eea3b2 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge branch 'master' into feature/constantq

File:
1 edited

Legend:

Unmodified
Added
Removed
  • python/ext/py-filterbank.c

    rc03d191 rd1d4ad4  
    123123
    124124  PyObject *input;
    125   uint_t samplerate;
    126   if (!PyArg_ParseTuple (args, "OI", &input, &samplerate)) {
     125  smpl_t samplerate;
     126  if (!PyArg_ParseTuple (args, "O" AUBIO_NPY_SMPL_CHR, &input, &samplerate)) {
    127127    return NULL;
    128128  }
     
    269269Py_filterbank_set_power(Py_filterbank *self, PyObject *args)
    270270{
    271   uint_t power;
    272 
    273   if (!PyArg_ParseTuple (args, "I", &power)) {
     271  smpl_t power;
     272
     273  if (!PyArg_ParseTuple (args, AUBIO_NPY_SMPL_CHR, &power)) {
    274274    return NULL;
    275275  }
     
    292292Py_filterbank_set_norm(Py_filterbank *self, PyObject *args)
    293293{
    294   uint_t playing;
    295 
    296   if (!PyArg_ParseTuple (args, "I", &playing)) {
    297     return NULL;
    298   }
    299   if(aubio_filterbank_set_norm (self->o, playing)) {
     294  smpl_t norm;
     295
     296  if (!PyArg_ParseTuple (args, AUBIO_NPY_SMPL_CHR, &norm)) {
     297    return NULL;
     298  }
     299  if(aubio_filterbank_set_norm (self->o, norm)) {
    300300    if (PyErr_Occurred() == NULL) {
    301301      PyErr_SetString (PyExc_ValueError,
Note: See TracChangeset for help on using the changeset viewer.