Changeset 3636600
- Timestamp:
- Nov 21, 2018, 1:53:41 AM (6 years ago)
- Branches:
- feature/autosink, feature/cnn, feature/cnn_org, feature/constantq, feature/crepe, feature/crepe_org, feature/pitchshift, feature/pydocstrings, feature/timestretch, fix/ffmpeg5, master
- Children:
- 5eea3b2
- Parents:
- 062eaf1 (diff), 51284ab (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. - Location:
- python/ext
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
python/ext/py-filterbank.c
r062eaf1 r3636600 123 123 124 124 PyObject *input; 125 uint_t samplerate;126 if (!PyArg_ParseTuple (args, "O I", &input, &samplerate)) {125 smpl_t samplerate; 126 if (!PyArg_ParseTuple (args, "O" AUBIO_NPY_SMPL_CHR, &input, &samplerate)) { 127 127 return NULL; 128 128 } … … 269 269 Py_filterbank_set_power(Py_filterbank *self, PyObject *args) 270 270 { 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)) { 274 274 return NULL; 275 275 } … … 292 292 Py_filterbank_set_norm(Py_filterbank *self, PyObject *args) 293 293 { 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)) { 300 300 if (PyErr_Occurred() == NULL) { 301 301 PyErr_SetString (PyExc_ValueError, -
python/ext/py-source.c
r062eaf1 r3636600 156 156 "... n_frames += len(samples)\n" 157 157 "... print('read', n_frames, 'samples in', samples.shape[0], 'channels',\n" 158 "... 'from file \" \%s\"' \% source.uri)\n"158 "... 'from file \"%%s\"' %% source.uri)\n" 159 159 "...\n" 160 160 "read 239334 samples in 2 channels from file \"audiotrack.wav\"\n"
Note: See TracChangeset
for help on using the changeset viewer.