Merge 'origin/master' into sampler

Conflicts:
	.travis.yml
	Makefile
	examples/aubionotes.c
	examples/parse_args.h
	python/demos/demo_timestretch_online.py
	python/lib/moresetuptools.py
	python/tests/test_source.py
	setup.py
	src/io/source.c

diff --cc .travis.yml
index faf1cb4,73aef64..5ce5dcb
--- 1/.travis.yml
--- 2/.travis.yml
+++ b/.travis.yml
@@@ -37,27 -22,50 +22,50 @@@ matrix
      - python: 3.4
        os: linux
        compiler: gcc
-       env: ARCH=x86_64 HAVE_DOUBLE=1
-     - python: 3.4
+       env: HAVE_AUBIO_DOUBLE=1 CFLAGS="-O3" WAFOPTS="--enable-fftw3"
+     - python: 2.7
        os: linux
        compiler: gcc
-       env: ARCH=i386 HAVE_DOUBLE=1
+       env: CFLAGS="`dpkg-buildflags --get CFLAGS`" LDFLAGS="`dpkg-buildflags --get LDFLAGS`"
      - language: C
        os: osx
+       osx_image: xcode8
        compiler: clang
-       env: ARCH=x86_64 HAVE_DOUBLE=1
+       env: CFLAGS="-Os" HAVE_AUBIO_DOUBLE=1 WAFOPTS="--disable-accelerate"
      - language: C
        os: osx
+       osx_image: xcode8
        compiler: clang
-       env: ARCH=i386 HAVE_DOUBLE=1
+       env: WAFOPTS="--enable-fat --disable-avcodec --disable-sndfile"
      - language: C
        os: osx
+       osx_image: xcode8
        compiler: clang
-       env: ARCH=x86_64 WAFOPTS="--enable-fat --disable-sndfile --disable-samplerate --disable-rubberband"
 -      env: WAFOPTS="--with-target-platform=ios --disable-avcodec --disable-sndfile" AUBIO_NOTESTS=1
++      env: WAFOPTS="--with-target-platform=ios --disable-avcodec --disable-sndfile --disable-samplerate --disable-rubberband" AUBIO_NOTESTS=1
      - language: C
        os: osx
+       osx_image: xcode8
        compiler: clang
-       env: ARCH=i386 WAFOPTS="--enable-fat --disable-sndfile --disable-samplerate --disable-rubberband"
 -      env: WAFOPTS="--with-target-platform=iosimulator --disable-avcodec --disable-sndfile" AUBIO_NOTESTS=1
++      env: WAFOPTS="--enable-fat --disable-avcodec --disable-sndfile --disable-samplerate --disable-rubberband" AUBIO_NOTESTS=1
+     - language: C
+       os: osx
+       osx_image: xcode8.2
+       compiler: clang
+       env: WAFOPTS="--enable-fat --disable-avcodec --disable-sndfile"
+     - language: C
+       os: osx
+       osx_image: xcode8.2
+       compiler: clang
+       env: WAFOPTS="--with-target-platform=ios --disable-avcodec --disable-sndfile" AUBIO_NOTESTS=1
+     - language: C
+       os: osx
+       osx_image: xcode8.2
+       compiler: clang
+       env: WAFOPTS="--with-target-platform=iosimulator --disable-avcodec --disable-sndfile" AUBIO_NOTESTS=1
+ 
+ # use trusty
+ dist: trusty
+ sudo: required
  
  addons:
    apt:
@@@ -75,7 -86,9 +87,11 @@@ before_install
     - |
       if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
         brew update
-        brew install sox libsamplerate libsndfile rubberband
+        brew install sox
+        brew install ffmpeg
+        brew install libsndfile
++       brew install libsamplerate
++       brew install rubberband
         export PATH="$HOME/Library/Python/2.7/bin/:$PATH"
       fi;
  

diff --cc python/lib/gen_external.py
Simple merge

diff --cc python/lib/moresetuptools.py
index 898e091,7b0aa1b..221f78a
--- 1/python/lib/moresetuptools.py
--- 2/python/lib/moresetuptools.py
+++ b/python/lib/moresetuptools.py
@@@ -73,10 -114,15 +114,16 @@@ def add_external_deps(ext, usedouble = 
      print("Info: looking for *optional* additional packages")
      packages = ['libavcodec', 'libavformat', 'libavutil', 'libavresample',
                  'jack',
-                 'sndfile', 'samplerate',
 -                'jack',
+                 'sndfile',
++                'samplerate',
 +                '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/aubio.h
Simple merge

diff --cc src/synth/sampler.c
index cbce71b,050f008..b6aa5f9
--- 1/src/synth/sampler.c
--- 2/src/synth/sampler.c
+++ b/src/synth/sampler.c
@@@ -18,9 -18,7 +18,8 @@@
  
  */
  
 +#include <assert.h>
  
- #include "config.h"
  #include "aubio_priv.h"
  #include "fvec.h"
  #include "fmat.h"

diff --cc src/wscript_build
Simple merge

diff --cc wscript
Simple merge