History

Merge branch 'master' into feature/cdocstrings

Paul Brossier committed 8 years ago

Commit 81abf912 parents 92948ab 4bc10e230 files · +362 −101Browse files

Showing the changes to python/ext (2 of 30 files). Show all

Unified · Split

2 files
  1. python/ext/aubiomodule.c +12 −4
  2. python/ext/py-filterbank.c +3 −3
python/ext/aubiomodule.c+12−4
@@ -237,7 +237,9 @@ Py_bintomidi (PyObject * self, PyObject * args) · 236 unmodified lines
237237 smpl_t input, samplerate, fftsize;
238238 smpl_t output;
239239
240− if (!PyArg_ParseTuple (args, "|" AUBIO_NPY_SMPL_CHR AUBIO_NPY_SMPL_CHR AUBIO_NPY_SMPL_CHR , &input, &samplerate, &fftsize)) {
240+ if (!PyArg_ParseTuple (args,
241+ "" AUBIO_NPY_SMPL_CHR AUBIO_NPY_SMPL_CHR AUBIO_NPY_SMPL_CHR,
242+ &input, &samplerate, &fftsize)) {
241243 return NULL;
242244 }
243245
@@ -252,7 +254,9 @@ Py_miditobin (PyObject * self, PyObject * args) · 8 unmodified lines
252254 smpl_t input, samplerate, fftsize;
253255 smpl_t output;
254256
255− if (!PyArg_ParseTuple (args, "|" AUBIO_NPY_SMPL_CHR AUBIO_NPY_SMPL_CHR AUBIO_NPY_SMPL_CHR , &input, &samplerate, &fftsize)) {
257+ if (!PyArg_ParseTuple (args,
258+ "" AUBIO_NPY_SMPL_CHR AUBIO_NPY_SMPL_CHR AUBIO_NPY_SMPL_CHR,
259+ &input, &samplerate, &fftsize)) {
256260 return NULL;
257261 }
258262
@@ -267,7 +271,9 @@ Py_bintofreq (PyObject * self, PyObject * args) · 8 unmodified lines
267271 smpl_t input, samplerate, fftsize;
268272 smpl_t output;
269273
270− if (!PyArg_ParseTuple (args, "|" AUBIO_NPY_SMPL_CHR AUBIO_NPY_SMPL_CHR AUBIO_NPY_SMPL_CHR, &input, &samplerate, &fftsize)) {
274+ if (!PyArg_ParseTuple (args,
275+ "" AUBIO_NPY_SMPL_CHR AUBIO_NPY_SMPL_CHR AUBIO_NPY_SMPL_CHR,
276+ &input, &samplerate, &fftsize)) {
271277 return NULL;
272278 }
273279
@@ -282,7 +288,9 @@ Py_freqtobin (PyObject * self, PyObject * args) · 8 unmodified lines
282288 smpl_t input, samplerate, fftsize;
283289 smpl_t output;
284290
285− if (!PyArg_ParseTuple (args, "|" AUBIO_NPY_SMPL_CHR AUBIO_NPY_SMPL_CHR AUBIO_NPY_SMPL_CHR, &input, &samplerate, &fftsize)) {
291+ if (!PyArg_ParseTuple (args,
292+ "" AUBIO_NPY_SMPL_CHR AUBIO_NPY_SMPL_CHR AUBIO_NPY_SMPL_CHR,
293+ &input, &samplerate, &fftsize)) {
286294 return NULL;
287295 }
288296
python/ext/py-filterbank.c+3−3
@@ -94,7 +94,7 @@ Py_filterbank_do(Py_filterbank * self, PyObject * args) · 93 unmodified lines
9494
9595 if (self->vec.length != self->win_s / 2 + 1) {
9696 PyErr_Format(PyExc_ValueError,
97− "input cvec has length %d, but fft expects length %d",
97+ "input cvec has length %d, but filterbank expects length %d",
9898 self->vec.length, self->win_s / 2 + 1);
9999 return NULL;
100100 }
@@ -139,7 +139,7 @@ Py_filterbank_set_triangle_bands (Py_filterbank * self, PyObject *args) · 38 unmodified lines
139139 &(self->freqs), samplerate);
140140 if (err > 0) {
141141 PyErr_SetString (PyExc_ValueError,
142− "error when setting filter to A-weighting");
142+ "error when running set_triangle_bands");
143143 return NULL;
144144 }
145145 Py_RETURN_NONE;
@@ -158,7 +158,7 @@ Py_filterbank_set_mel_coeffs_slaney (Py_filterbank * self, PyObject *args) · 12 unmodified lines
158158 err = aubio_filterbank_set_mel_coeffs_slaney (self->o, samplerate);
159159 if (err > 0) {
160160 PyErr_SetString (PyExc_ValueError,
161− "error when setting filter to A-weighting");
161+ "error when running set_mel_coeffs_slaney");
162162 return NULL;
163163 }
164164 Py_RETURN_NONE;

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t