From: Paul Brossier <piem@piem.org>
Date: Wed, 5 Dec 2018 21:34:39 +0000 (+0100)
Subject: Merge branch 'master' into feature/pitchshift
X-Git-Url: https://git.aubio.org/?a=commitdiff_plain;h=633400de7313737941a2d3d3e61ba37d8e7e02ea;p=aubio.git

Merge branch 'master' into feature/pitchshift
---

633400de7313737941a2d3d3e61ba37d8e7e02ea
diff --cc .travis.yml
index faf1cb4b,b799ce2f..7fb573d4
--- a/.travis.yml
+++ b/.travis.yml
@@@ -49,7 -33,7 +33,7 @@@ matrix
      - language: C
        os: osx
        compiler: clang
-       env: ARCH=i386 HAVE_DOUBLE=1
 -      env: WAFOPTS="--enable-fat --disable-avcodec --disable-sndfile"
++      env: WAFOPTS="--enable-fat --disable-avcodec --disable-sndfile --disable-samplerate --disable-rubberband"
      - language: C
        os: osx
        compiler: clang
@@@ -68,8 -60,15 +60,18 @@@ addons
      - libjack-dev
      - libasound2-dev
      - libfftw3-dev
 +    - librubberband-dev
      - sox
+     - lcov
+   homebrew:
+     packages:
+     - sox
+     - ffmpeg
+     - libsndfile
++    - libsamplerate
++    - rubberband
+     - lcov
+     #update: true
  
  before_install:
     - |
diff --cc python/lib/gen_code.py
index 872e1e81,a29a23fb..1eae3936
--- a/python/lib/gen_code.py
+++ b/python/lib/gen_code.py
@@@ -83,7 -83,7 +84,8 @@@ objoutsize = 
          'tempo': '1',
          'filterbank': 'self->n_filters',
          'tss': 'self->buf_size',
 +        'pitchshift': 'self->hop_size',
+         'dct': 'self->size',
          }
  
  objinputsize = {
diff --cc python/lib/moresetuptools.py
index 7ded26bf,3fd4e74a..bfad1287
--- a/python/lib/moresetuptools.py
+++ b/python/lib/moresetuptools.py
@@@ -69,14 -73,19 +73,21 @@@ def add_local_macros(ext, usedouble = F
                           'HAVE_MEMCPY_HACKS']:
          ext.define_macros += [(define_macro, 1)]
  
+ def add_external_deps(ext, usedouble = False):
      # loof for additional packages
      print("Info: looking for *optional* additional packages")
-     packages = ['libavcodec', 'libavformat', 'libavutil', 'libavresample',
+     packages = ['libavcodec', 'libavformat', 'libavutil',
+                 'libswresample', 'libavresample',
 +                'jack',
-                 'sndfile', 'samplerate',
+                 'sndfile',
 +                'rubberband',
                  #'fftw3f',
                 ]
+     # samplerate only works with float
+     if usedouble is False:
+         packages += ['samplerate']
+     else:
+         print("Info: not adding libsamplerate in double precision mode")
      add_packages(packages, ext=ext)
      if 'avcodec' in ext.libraries \
              and 'avformat' in ext.libraries \
diff --cc src/wscript_build
index f159cf3b,895c191f..36521340
--- a/src/wscript_build
+++ b/src/wscript_build
@@@ -3,11 -3,12 +3,13 @@@
  uselib = []
  uselib += ['M']
  uselib += ['FFTW3', 'FFTW3F']
+ uselib += ['INTEL_IPP']
  uselib += ['SAMPLERATE']
  uselib += ['SNDFILE']
 +uselib += ['RUBBERBAND']
  uselib += ['AVCODEC']
  uselib += ['AVFORMAT']
+ uselib += ['SWRESAMPLE']
  uselib += ['AVRESAMPLE']
  uselib += ['AVUTIL']
  uselib += ['BLAS']
diff --cc wscript
index af932b77,fcf87034..c8e3bf41
--- a/wscript
+++ b/wscript
@@@ -258,17 -367,19 +370,25 @@@ def configure(ctx)
                  mandatory = ctx.options.enable_sndfile)
  
      # check for libsamplerate
+     if (ctx.options.enable_double):
+         if (ctx.options.enable_samplerate):
+             ctx.fatal("Could not compile aubio in double precision mode' \
+                     ' with libsamplerate")
+         else:
+             ctx.options.enable_samplerate = False
+             ctx.msg('Checking if using samplerate',
+                     'no (disabled in double precision mode)', color = 'YELLOW')
      if (ctx.options.enable_samplerate != False):
-         ctx.check_cfg(package = 'samplerate', atleast_version = '0.0.15',
-                 args = '--cflags --libs',
+         ctx.check_cfg(package = 'samplerate',
+                 args = '--cflags --libs samplerate >= 0.0.15',
                  mandatory = ctx.options.enable_samplerate)
  
 +    # check for librubberband
 +    if (ctx.options.enable_rubberband != False):
 +        ctx.check_cfg(package = 'rubberband', atleast_version = '1.3',
 +                args = '--cflags --libs',
 +                mandatory = ctx.options.enable_rubberband)
 +
      # check for jack
      if (ctx.options.enable_jack != False):
          ctx.check_cfg(package = 'jack',