Changeset 3636600

Timestamp:

Nov 21, 2018, 1:53:41 AM (6 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

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.

Message:

Merge branch 'fix/pyextwarnings'

Location:

python/ext

Files:

• py-filterbank.c (modified) (3 diffs)
• py-source.c (modified) (1 diff)

python/ext/py-filterbank.c

@@ -123 +123 @@
 
   PyObject *input;
-  uint_t samplerate;
-  if (!PyArg_ParseTuple (args, "OI", &input, &samplerate)) {
+  smpl_t samplerate;
+  if (!PyArg_ParseTuple (args, "O" AUBIO_NPY_SMPL_CHR, &input, &samplerate)) {
     return NULL;
   }
@@ -269 +269 @@
 Py_filterbank_set_power(Py_filterbank *self, PyObject *args)
 {
-  uint_t power;
-
-  if (!PyArg_ParseTuple (args, "I", &power)) {
+  smpl_t power;
+
+  if (!PyArg_ParseTuple (args, AUBIO_NPY_SMPL_CHR, &power)) {
     return NULL;
   }
@@ -292 +292 @@
 Py_filterbank_set_norm(Py_filterbank *self, PyObject *args)
 {
-  uint_t playing;
-
-  if (!PyArg_ParseTuple (args, "I", &playing)) {
-    return NULL;
-  }
-  if(aubio_filterbank_set_norm (self->o, playing)) {
+  smpl_t norm;
+
+  if (!PyArg_ParseTuple (args, AUBIO_NPY_SMPL_CHR, &norm)) {
+    return NULL;
+  }
+  if(aubio_filterbank_set_norm (self->o, norm)) {
     if (PyErr_Occurred() == NULL) {
       PyErr_SetString (PyExc_ValueError,

python/ext/py-source.c

@@ -156 +156 @@
 "...         n_frames += len(samples)\n"
 "...     print('read', n_frames, 'samples in', samples.shape[0], 'channels',\n"
-"...         'from file \"\%s\"' \% source.uri)\n"
+"...         'from file \"%%s\"' %% source.uri)\n"
 "...\n"
 "read 239334 samples in 2 channels from file \"audiotrack.wav\"\n"