Changeset 74c1fb9 for python

Timestamp:

Dec 19, 2018, 5:50:42 PM (5 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/timestretch, fix/ffmpeg5, master

Children:

0045668

Parents:

c1ba75b (diff), fda3394 (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/pytest

Location:

python

Files:

• README.md (modified) (1 diff)
• ext/aubiomodule.c (modified) (2 diffs)
• ext/py-cvec.c (modified) (1 diff)
• ext/py-musicutils.c (modified) (8 diffs)

python/README.md

@@ -28 +28 @@
 -----
 
-Some examples are available in the [`python/demos`][demos_dir] folder. Each
+Some examples are available in the [`python/demos` folder][demos_dir]. Each
 script is a command line program which accepts one ore more argument.
 

python/ext/aubiomodule.c

@@ -224 +224 @@
 
   // compute the function
-  result = Py_BuildValue (AUBIO_NPY_SMPL_CHR, fvec_alpha_norm (&vec, alpha));
+  result = PyFloat_FromDouble(fvec_alpha_norm (&vec, alpha));
   if (result == NULL) {
     return NULL;
@@ -320 +320 @@
 
   // compute the function
-  result = Py_BuildValue (AUBIO_NPY_SMPL_CHR, aubio_zero_crossing_rate (&vec));
+  result = PyFloat_FromDouble(aubio_zero_crossing_rate (&vec));
   if (result == NULL) {
     return NULL;

python/ext/py-cvec.c

@@ -137 +137 @@
   }
 
-  args = Py_BuildValue ("I", self->length);
+  args = PyLong_FromLong(self->length);
   if (args == NULL) {
     goto fail;

python/ext/py-musicutils.c

@@ -40 +40 @@
   }
 
-  level_lin = Py_BuildValue(AUBIO_NPY_SMPL_CHR, aubio_level_lin(&vec));
+  level_lin = PyFloat_FromDouble(aubio_level_lin(&vec));
   if (level_lin == NULL) {
     PyErr_SetString (PyExc_ValueError, "failed computing level_lin");
@@ -68 +68 @@
   }
 
-  db_spl = Py_BuildValue(AUBIO_NPY_SMPL_CHR, aubio_db_spl(&vec));
+  db_spl = PyFloat_FromDouble(aubio_db_spl(&vec));
   if (db_spl == NULL) {
     PyErr_SetString (PyExc_ValueError, "failed computing db_spl");
@@ -97 +97 @@
   }
 
-  silence_detection = Py_BuildValue("I", aubio_silence_detection(&vec, threshold));
+  silence_detection = PyLong_FromLong(aubio_silence_detection(&vec, threshold));
   if (silence_detection == NULL) {
     PyErr_SetString (PyExc_ValueError, "failed computing silence_detection");
@@ -126 +126 @@
   }
 
-  level_detection = Py_BuildValue(AUBIO_NPY_SMPL_CHR, aubio_level_detection(&vec, threshold));
+  level_detection = PyFloat_FromDouble(aubio_level_detection(&vec, threshold));
   if (level_detection == NULL) {
     PyErr_SetString (PyExc_ValueError, "failed computing level_detection");
@@ -195 +195 @@
   }
   if (htk != NULL && PyObject_IsTrue(htk) == 1)
-    return Py_BuildValue(AUBIO_NPY_SMPL_CHR, aubio_hztomel_htk(v));
+    return PyFloat_FromDouble(aubio_hztomel_htk(v));
   else
-    return Py_BuildValue(AUBIO_NPY_SMPL_CHR, aubio_hztomel(v));
+    return PyFloat_FromDouble(aubio_hztomel(v));
 }
 
@@ -212 +212 @@
   }
   if (htk != NULL && PyObject_IsTrue(htk) == 1)
-    return Py_BuildValue(AUBIO_NPY_SMPL_CHR, aubio_meltohz_htk(v));
+    return PyFloat_FromDouble(aubio_meltohz_htk(v));
   else
-    return Py_BuildValue(AUBIO_NPY_SMPL_CHR, aubio_meltohz(v));
+    return PyFloat_FromDouble(aubio_meltohz(v));
 }
 
@@ -224 +224 @@
     return NULL;
   }
-  return Py_BuildValue(AUBIO_NPY_SMPL_CHR, aubio_hztomel_htk(v));
+  return PyFloat_FromDouble(aubio_hztomel_htk(v));
 }
 
@@ -234 +234 @@
     return NULL;
   }
-  return Py_BuildValue(AUBIO_NPY_SMPL_CHR, aubio_meltohz_htk(v));
-}
+  return PyFloat_FromDouble(aubio_meltohz_htk(v));
+}