Merge branch 'master' into feature/pytest

Paul Brossier committed 7 years ago

Commit 74c1fb92 parents c1ba75b fda339442 files · +900 −1139Browse files

Showing the changes to python (4 of 42 files). Show all

Unified · Split

4 files

python/README.md +1 −1
python/ext/aubiomodule.c +2 −2
python/ext/py-cvec.c +1 −1
python/ext/py-musicutils.c +10 −10

@@ -27,7 +27,7 @@ Links · 26 unmodified lines
27	Demos	27	Demos
28	-----	28	-----
29		29
30	Some examples are available in the [`python/demos`][demos_dir] folder. Each	30	Some examples are available in the [`python/demos` folder][demos_dir]. Each
31	script is a command line program which accepts one ore more argument.	31	script is a command line program which accepts one ore more argument.
32		32
33	Notes: installing additional modules is required to run some of the demos.	33	Notes: installing additional modules is required to run some of the demos.

python/ext/aubiomodule.c+2−2

@@ -223,7 +223,7 @@ Py_alpha_norm (PyObject * self, PyObject * args) · 222 unmodified lines
223	}	223	}
224		224
225	// compute the function	225	// compute the function
226	result = Py_BuildValue (AUBIO_NPY_SMPL_CHR, fvec_alpha_norm (&vec, alpha));	226	result = PyFloat_FromDouble(fvec_alpha_norm (&vec, alpha));
227	if (result == NULL) {	227	if (result == NULL) {
228	return NULL;	228	return NULL;
229	}	229	}
@@ -319,7 +319,7 @@ Py_zero_crossing_rate (PyObject * self, PyObject * args) · 89 unmodified lines
319	}	319	}
320		320
321	// compute the function	321	// compute the function
322	result = Py_BuildValue (AUBIO_NPY_SMPL_CHR, aubio_zero_crossing_rate (&vec));	322	result = PyFloat_FromDouble(aubio_zero_crossing_rate (&vec));
323	if (result == NULL) {	323	if (result == NULL) {
324	return NULL;	324	return NULL;
325	}	325	}

python/ext/py-cvec.c+1−1

@@ -136,7 +136,7 @@ Py_cvec_repr (Py_cvec * self, PyObject * unused) · 135 unmodified lines
136	goto fail;	136	goto fail;
137	}	137	}
138		138
139	args = Py_BuildValue ("I", self->length);	139	args = PyLong_FromLong(self->length);
140	if (args == NULL) {	140	if (args == NULL) {
141	goto fail;	141	goto fail;
142	}	142	}

python/ext/py-musicutils.c+10−10

@@ -39,7 +39,7 @@ Py_aubio_level_lin(PyObject self, PyObject args) · 38 unmodified lines
39	return NULL;	39	return NULL;
40	}	40	}
41		41
42	level_lin = Py_BuildValue(AUBIO_NPY_SMPL_CHR, aubio_level_lin(&vec));	42	level_lin = PyFloat_FromDouble(aubio_level_lin(&vec));
43	if (level_lin == NULL) {	43	if (level_lin == NULL) {
44	PyErr_SetString (PyExc_ValueError, "failed computing level_lin");	44	PyErr_SetString (PyExc_ValueError, "failed computing level_lin");
45	return NULL;	45	return NULL;
@@ -67,7 +67,7 @@ Py_aubio_db_spl(PyObject self, PyObject args) · 21 unmodified lines
67	return NULL;	67	return NULL;
68	}	68	}
69		69
70	db_spl = Py_BuildValue(AUBIO_NPY_SMPL_CHR, aubio_db_spl(&vec));	70	db_spl = PyFloat_FromDouble(aubio_db_spl(&vec));
71	if (db_spl == NULL) {	71	if (db_spl == NULL) {
72	PyErr_SetString (PyExc_ValueError, "failed computing db_spl");	72	PyErr_SetString (PyExc_ValueError, "failed computing db_spl");
73	return NULL;	73	return NULL;
@@ -96,7 +96,7 @@ Py_aubio_silence_detection(PyObject self, PyObject args) · 22 unmodified lines
96	return NULL;	96	return NULL;
97	}	97	}
98		98
99	silence_detection = Py_BuildValue("I", aubio_silence_detection(&vec, threshold));	99	silence_detection = PyLong_FromLong(aubio_silence_detection(&vec, threshold));
100	if (silence_detection == NULL) {	100	if (silence_detection == NULL) {
101	PyErr_SetString (PyExc_ValueError, "failed computing silence_detection");	101	PyErr_SetString (PyExc_ValueError, "failed computing silence_detection");
102	return NULL;	102	return NULL;
@@ -125,7 +125,7 @@ Py_aubio_level_detection(PyObject self, PyObject args) · 22 unmodified lines
125	return NULL;	125	return NULL;
126	}	126	}
127		127
128	level_detection = Py_BuildValue(AUBIO_NPY_SMPL_CHR, aubio_level_detection(&vec, threshold));	128	level_detection = PyFloat_FromDouble(aubio_level_detection(&vec, threshold));
129	if (level_detection == NULL) {	129	if (level_detection == NULL) {
130	PyErr_SetString (PyExc_ValueError, "failed computing level_detection");	130	PyErr_SetString (PyExc_ValueError, "failed computing level_detection");
131	return NULL;	131	return NULL;
@@ -194,9 +194,9 @@ Py_aubio_hztomel(PyObject self, PyObject args, PyObject *kwds) · 62 unmodified lines
194	return NULL;	194	return NULL;
195	}	195	}
196	if (htk != NULL && PyObject_IsTrue(htk) == 1)	196	if (htk != NULL && PyObject_IsTrue(htk) == 1)
197	return Py_BuildValue(AUBIO_NPY_SMPL_CHR, aubio_hztomel_htk(v));	197	return PyFloat_FromDouble(aubio_hztomel_htk(v));
198	else	198	else
199	return Py_BuildValue(AUBIO_NPY_SMPL_CHR, aubio_hztomel(v));	199	return PyFloat_FromDouble(aubio_hztomel(v));
200	}	200	}
201		201
202	PyObject*	202	PyObject*
@@ -211,9 +211,9 @@ Py_aubio_meltohz(PyObject self, PyObject args, PyObject *kwds) · 8 unmodified lines
211	return NULL;	211	return NULL;
212	}	212	}
213	if (htk != NULL && PyObject_IsTrue(htk) == 1)	213	if (htk != NULL && PyObject_IsTrue(htk) == 1)
214	return Py_BuildValue(AUBIO_NPY_SMPL_CHR, aubio_meltohz_htk(v));	214	return PyFloat_FromDouble(aubio_meltohz_htk(v));
215	else	215	else
216	return Py_BuildValue(AUBIO_NPY_SMPL_CHR, aubio_meltohz(v));	216	return PyFloat_FromDouble(aubio_meltohz(v));
217	}	217	}
218		218
219	PyObject*	219	PyObject*
@@ -223,7 +223,7 @@ Py_aubio_hztomel_htk(PyObject self, PyObject args) · 3 unmodified lines
223	if (!PyArg_ParseTuple(args, AUBIO_NPY_SMPL_CHR, &v)) {	223	if (!PyArg_ParseTuple(args, AUBIO_NPY_SMPL_CHR, &v)) {
224	return NULL;	224	return NULL;
225	}	225	}
226	return Py_BuildValue(AUBIO_NPY_SMPL_CHR, aubio_hztomel_htk(v));	226	return PyFloat_FromDouble(aubio_hztomel_htk(v));
227	}	227	}
228		228
229	PyObject*	229	PyObject*
@@ -233,5 +233,5 @@ Py_aubio_meltohz_htk(PyObject self, PyObject args) · 3 unmodified lines
233	if (!PyArg_ParseTuple(args, AUBIO_NPY_SMPL_CHR, &v)) {	233	if (!PyArg_ParseTuple(args, AUBIO_NPY_SMPL_CHR, &v)) {
234	return NULL;	234	return NULL;
235	}	235	}
236	return Py_BuildValue(AUBIO_NPY_SMPL_CHR, aubio_meltohz_htk(v));	236	return PyFloat_FromDouble(aubio_meltohz_htk(v));
237	}	237	}

Merge branch 'master' into feature/pytest

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code