Changes in / [fa5d8ad:8ba8bbe]

Files:

• .travis.yml (modified) (3 diffs)
• python/demos/demo_pitchshift.py (added)
• python/lib/gen_code.py (modified) (5 diffs)
• python/lib/moresetuptools.py (modified) (2 diffs)
• python/tests/test_pitchshift.py (added)
• src/aubio.h (modified) (1 diff)
• src/effects/pitchshift.c (added)
• src/effects/pitchshift.h (added)
• src/wscript_build (modified) (1 diff)
• tests/src/effects/test-pitchshift.c (added)
• wscript (modified) (2 diffs)

.travis.yml

@@ -54 +54 @@
       os: osx
       compiler: clang
-      env: ARCH=x86_64 WAFOPTS=--enable-fat
+      env: ARCH=x86_64 WAFOPTS="--enable-fat --disable-sndfile --disable-samplerate --disable-rubberband"
     - language: C
       os: osx
       compiler: clang
-      env: ARCH=i386 WAFOPTS=--enable-fat
+      env: ARCH=i386 WAFOPTS="--enable-fat --disable-sndfile --disable-samplerate --disable-rubberband"
 
 addons:
@@ -69 +69 @@
     - libasound2-dev
     - libfftw3-dev
+    - librubberband-dev
     - sox
 
@@ -75 +76 @@
      if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
        brew update
-       brew install sox
+       brew install sox libsamplerate libsndfile rubberband
        export PATH="$HOME/Library/Python/2.7/bin/:$PATH"
      fi;

python/lib/gen_code.py

@@ -20 +20 @@
     'method': '"default"',
     'uri': '"none"',
+    'pitchscale': '1.',
     }
 
@@ -83 +84 @@
         'filterbank': 'self->n_filters',
         'tss': 'self->buf_size',
+        'pitchshift': 'self->hop_size',
         }
 
@@ -95 +97 @@
         'wavetable': 'self->hop_size',
         'tss': 'self->buf_size / 2 + 1',
+        'pitchshift': 'self->hop_size',
         }
 
@@ -266 +269 @@
         if p['type'] == 'char_t*':
             return self.check_valid_char(p)
+        if p['type'] == 'smpl_t':
+            return self.check_valid_smpl(p)
         else:
             print ("ERROR, no idea how to check %s for validity" % p['type'])
@@ -286 +291 @@
     self->{name} = {defval};
     if ({name} != NULL) {{
+        self->{name} = {name};
+    }}
+""".format(defval = aubiodefvalue[name], name = name)
+
+    def check_valid_smpl(self, p):
+        name = p['name']
+        return """
+    self->{name} = {defval};
+    if ({name} != 0.) {{
         self->{name} = {name};
     }}

python/lib/moresetuptools.py

@@ -74 +74 @@
                 'jack',
                 'sndfile', 'samplerate',
+                'rubberband',
                 #'fftw3f',
                ]
@@ -88 +89 @@
     if 'samplerate' in ext.libraries:
         ext.define_macros += [('HAVE_SAMPLERATE', 1)]
+    if 'rubberband' in ext.libraries:
+        ext.define_macros += [('HAVE_RUBBERBAND', 1)]
     if 'fftw3f' in ext.libraries:
         ext.define_macros += [('HAVE_FFTW3F', 1)]

src/aubio.h

@@ -208 +208 @@
 #include "pitch/pitchspecacf.h"
 #include "tempo/beattracking.h"
+#include "effects/pitchshift.h"
 #include "utils/scale.h"
 #include "utils/hist.h"

src/wscript_build

@@ -6 +6 @@
 uselib += ['SAMPLERATE']
 uselib += ['SNDFILE']
+uselib += ['RUBBERBAND']
 uselib += ['AVCODEC']
 uselib += ['AVFORMAT']

wscript

@@ -69 +69 @@
             help_str = 'compile with samplerate (auto)',
             help_disable_str = 'disable samplerate')
+    add_option_enable_disable(ctx, 'rubberband', default = None,
+            help_str = 'compile with rubberband (auto)',
+            help_disable_str = 'disable rubberband')
     add_option_enable_disable(ctx, 'memcpy', default = True,
             help_str = 'use memcpy hacks (default)',
@@ -260 +263 @@
                 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):