Changes in / [1ec59e4:7abefed]


Ignore:
Files:
12 edited

Legend:

Unmodified
Added
Removed

  • TabularUnified .travis.yml

    r1ec59e4 r7abefed  
    3939      os: osx
    4040      compiler: clang
    41       env: WAFOPTS="--enable-fat --disable-avcodec --disable-sndfile --disable-samplerate --disable-vorbis --disable-flac"
     41      env: WAFOPTS="--enable-fat --disable-avcodec --disable-sndfile --disable-vorbis --disable-flac"
    4242    - language: C
    4343      os: osx
    4444      compiler: clang
    45       env: WAFOPTS="--with-target-platform=ios --disable-avcodec --disable-sndfile --disable-samplerate --disable-vorbis --disable-flac" AUBIO_NOTESTS=1
     45      env: WAFOPTS="--with-target-platform=ios --disable-avcodec --disable-sndfile --disable-vorbis --disable-flac" AUBIO_NOTESTS=1
    4646    - language: C
    4747      os: osx
    4848      compiler: clang
    49       env: WAFOPTS="--with-target-platform=iosimulator --disable-avcodec --disable-sndfile --disable-samplerate --disable-vorbis --disable-flac" AUBIO_NOTESTS=1
     49      env: WAFOPTS="--with-target-platform=iosimulator --disable-avcodec --disable-sndfile --disable-vorbis --disable-flac" AUBIO_NOTESTS=1
    5050
    5151# use trusty
    … …  
    7878    - flac
    7979    - lcov
    80     update: true
     80    #update: true
    8181
    8282before_install:

  • TabularUnified doc/binaries.rst

    r1ec59e4 r7abefed  
    99`windows <https://aubio.org/download#win>`_
    1010
    11 For Windows, aubio is also available from `vcpkg
    12 <https://vcpkg.readthedocs.io/en/latest/examples/installing-and-using-packages/>`_.
    13 
    1411To use aubio in a macOS or iOS application, see :ref:`xcode-frameworks-label`.
    1512

  • TabularUnified python/ext/aubio-docstrings.h

    r1ec59e4 r7abefed  
    22    "dct(size=1024)\n"\
    33    "\n"\
    4     "Compute Discrete Fourier Transforms of Type-II.\n"\
     4    "Compute Discrete Fourier Transorms of Type-II.\n"\
    55    "\n"\
    66    "Parameters\n"\

  • TabularUnified python/ext/py-fft.c

    r1ec59e4 r7abefed  
    44"fft(size=1024)\n"
    55"\n"
    6 "Compute Fast Fourier Transforms.\n"
     6"Compute Fast Fourier Transorms.\n"
    77"\n"
    88"Parameters\n"

  • TabularUnified python/ext/py-filter.c

    r1ec59e4 r7abefed  
    157157  err = aubio_filter_set_c_weighting (self->o, samplerate);
    158158  if (err > 0) {
    159     if (PyErr_Occurred() == NULL) {
    160       PyErr_SetString (PyExc_ValueError,
    161           "error when setting filter to C-weighting");
    162     } else {
    163       // change the RuntimeError into ValueError
    164       PyObject *type, *value, *traceback;
    165       PyErr_Fetch(&type, &value, &traceback);
    166       Py_XDECREF(type);
    167       type = PyExc_ValueError;
    168       Py_XINCREF(type);
    169       PyErr_Restore(type, value, traceback);
    170     }
     159    PyErr_SetString (PyExc_ValueError,
     160        "error when setting filter to C-weighting");
    171161    return NULL;
    172162  }
    … …  
    185175  err = aubio_filter_set_a_weighting (self->o, samplerate);
    186176  if (err > 0) {
    187     if (PyErr_Occurred() == NULL) {
    188       PyErr_SetString (PyExc_ValueError,
    189           "error when setting filter to A-weighting");
    190     } else {
    191       // change the RuntimeError into ValueError
    192       PyObject *type, *value, *traceback;
    193       PyErr_Fetch(&type, &value, &traceback);
    194       Py_XDECREF(type);
    195       type = PyExc_ValueError;
    196       Py_XINCREF(type);
    197       PyErr_Restore(type, value, traceback);
    198     }
     177    PyErr_SetString (PyExc_ValueError,
     178        "error when setting filter to A-weighting");
    199179    return NULL;
    200180  }
    … …  
    213193  err = aubio_filter_set_biquad (self->o, b0, b1, b2, a1, a2);
    214194  if (err > 0) {
    215     if (PyErr_Occurred() == NULL) {
    216       PyErr_SetString (PyExc_ValueError,
    217           "error when setting filter with biquad coefficients");
    218     } else {
    219       // change the RuntimeError into ValueError
    220       PyObject *type, *value, *traceback;
    221       PyErr_Fetch(&type, &value, &traceback);
    222       Py_XDECREF(type);
    223       type = PyExc_ValueError;
    224       Py_XINCREF(type);
    225       PyErr_Restore(type, value, traceback);
    226     }
     195    PyErr_SetString (PyExc_ValueError,
     196        "error when setting filter with biquad coefficients");
    227197    return NULL;
    228198  }

  • TabularUnified python/ext/py-filterbank.c

    r1ec59e4 r7abefed  
    327327      PyObject *type, *value, *traceback;
    328328      PyErr_Fetch(&type, &value, &traceback);
    329       Py_XDECREF(type);
    330       type = PyExc_ValueError;
    331       Py_XINCREF(type);
    332       PyErr_Restore(type, value, traceback);
     329      PyErr_Restore(PyExc_ValueError, value, traceback);
    333330    }
    334331    return NULL;
    … …  
    355352      PyObject *type, *value, *traceback;
    356353      PyErr_Fetch(&type, &value, &traceback);
    357       Py_XDECREF(type);
    358       type = PyExc_ValueError;
    359       Py_XINCREF(type);
    360       PyErr_Restore(type, value, traceback);
     354      PyErr_Restore(PyExc_ValueError, value, traceback);
    361355    }
    362356    return NULL;
    … …  
    387381      PyObject *type, *value, *traceback;
    388382      PyErr_Fetch(&type, &value, &traceback);
    389       Py_XDECREF(type);
    390       type = PyExc_ValueError;
    391       Py_XINCREF(type);
    392       PyErr_Restore(type, value, traceback);
     383      PyErr_Restore(PyExc_ValueError, value, traceback);
    393384    }
    394385    return NULL;
    … …  
    419410      PyObject *type, *value, *traceback;
    420411      PyErr_Fetch(&type, &value, &traceback);
    421       Py_XDECREF(type);
    422       type = PyExc_ValueError;
    423       Py_XINCREF(type);
    424       PyErr_Restore(type, value, traceback);
     412      PyErr_Restore(PyExc_ValueError, value, traceback);
    425413    }
    426414    return NULL;
    … …  
    476464      PyObject *type, *value, *traceback;
    477465      PyErr_Fetch(&type, &value, &traceback);
    478       Py_XDECREF(type);
    479       type = PyExc_ValueError;
    480       Py_XINCREF(type);
    481       PyErr_Restore(type, value, traceback);
     466      PyErr_Restore(PyExc_ValueError, value, traceback);
    482467    }
    483468    return NULL;
    … …  
    509494      PyObject *type, *value, *traceback;
    510495      PyErr_Fetch(&type, &value, &traceback);
    511       Py_XDECREF(type);
    512       type = PyExc_ValueError;
    513       Py_XINCREF(type);
    514       PyErr_Restore(type, value, traceback);
     496      PyErr_Restore(PyExc_ValueError, value, traceback);
    515497    }
    516498    return NULL;

  • TabularUnified python/ext/py-sink.c

    r1ec59e4 r7abefed  
    8282"\n"
    8383"By default, the sink will be closed before being deleted.\n"
    84 "Explicitly closing a sink can be useful to control the number\n"
     84"Explicitely closing a sink can be useful to control the number\n"
    8585"of files simultaneously opened.\n"
    8686"";

  • TabularUnified python/lib/gen_code.py

    r1ec59e4 r7abefed  
    510510      PyObject *type, *value, *traceback;
    511511      PyErr_Fetch(&type, &value, &traceback);
    512       Py_XDECREF(type);
    513       type = PyExc_ValueError;
    514       Py_XINCREF(type);
    515       PyErr_Restore(type, value, traceback);
     512      PyErr_Restore(PyExc_ValueError, value, traceback);
    516513    }}
    517514    return NULL;

  • TabularUnified python/tests/test_hztomel.py

    r1ec59e4 r7abefed  
    55from numpy.testing import assert_equal, assert_almost_equal
    66from _tools import assert_warns
    7 from utils import is32bit
    87import numpy as np
    98import aubio
    … …  
    1110from aubio import hztomel, meltohz
    1211from aubio import hztomel_htk, meltohz_htk
     12
    1313
    1414class aubio_hztomel_test_case(TestCase):
    … …  
    1818        assert_almost_equal(hztomel(400. / 3.), 2., decimal=5)
    1919        assert_almost_equal(hztomel(1000. / 3), 5.)
    20         # on 32bit, some of these tests fails unless compiling with -ffloat-store
    21         try:
    22             assert_equal(hztomel(200.), 3.)
    23         except AssertionError:
    24             if not is32bit(): raise
    25             assert_almost_equal(hztomel(200.), 3., decimal=5)
     20        assert_equal(hztomel(200.), 3.)
    2621        assert_almost_equal(hztomel(1000.), 15)
    27         assert_almost_equal(hztomel(6400), 42, decimal=5)
    28         assert_almost_equal(hztomel(40960), 69, decimal=5)
     22        assert_almost_equal(hztomel(6400), 42)
     23        assert_almost_equal(hztomel(40960), 69)
    2924
    3025        for m in np.linspace(0, 1000, 100):
    … …  
    3429        assert_equal(meltohz(0.), 0.)
    3530        assert_almost_equal(meltohz(2), 400. / 3., decimal=4)
    36         try:
    37             assert_equal(meltohz(3.), 200.)
    38         except AssertionError:
    39             if not is32bit(): raise
    40             assert_almost_equal(meltohz(3.), 200., decimal=5)
     31        assert_equal(meltohz(3.), 200.)
    4132        assert_almost_equal(meltohz(5), 1000. / 3., decimal=4)
    4233        assert_almost_equal(meltohz(15), 1000., decimal=4)

  • TabularUnified python/tests/test_phasevoc.py

    r1ec59e4 r7abefed  
    22
    33from numpy.testing import TestCase, assert_equal, assert_array_less
    4 from _tools import parametrize, skipTest
     4from _tools import parametrize
    55from aubio import fvec, cvec, pvoc, float_type
    66import numpy as np
    … …  
    5252                assert_equal (s.phas[s.phas < 0], -np.pi)
    5353                assert_equal (np.abs(s.phas[np.abs(s.phas) != np.pi]), 0)
    54                 skipTest('pvoc(fvec(%d)).phas != +0, ' % win_s \
     54                self.skipTest('pvoc(fvec(%d)).phas != +0, ' % win_s \
    5555                        + 'This is expected when using fftw3 on powerpc.')
    5656            assert_equal ( r, 0.)

  • TabularUnified python/tests/utils.py

    r1ec59e4 r7abefed  
    44import re
    55import glob
    6 import struct
    76import numpy as np
    87from tempfile import mkstemp
    98
    109DEFAULT_SOUND = '22050Hz_5s_brownnoise.wav'
    11 
    12 def is32bit():
    13     return struct.calcsize("P") * 8 == 32
    1410
    1511def array_from_text_file(filename, dtype = 'float'):

  • TabularUnified scripts/get_waf.sh

    r1ec59e4 r7abefed  
    44#set -x
    55
    6 WAFVERSION=2.0.17
     6WAFVERSION=2.0.14
    77WAFTARBALL=waf-$WAFVERSION.tar.bz2
    88WAFURL=https://waf.io/$WAFTARBALL
Note: See TracChangeset for help on using the changeset viewer.