Changeset 34e505f

Timestamp:

Oct 25, 2015, 11:32:21 AM (8 years ago)

Author:

Paul Brossier <piem@piem.org>

Branches:

feature/autosink, feature/cnn, feature/cnn_org, feature/constantq, feature/crepe, feature/crepe_org, feature/pitchshift, feature/pydocstrings, feature/timestretch, fix/ffmpeg5, master, sampler

Children:

8605361

Parents:

3d30b90 (diff), 094a8be (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'develop' into awhitening

Files:

• Makefile (modified) (1 diff)
• src/pitch/pitch.c (modified) (1 diff)
• wscript (modified) (1 diff)

Makefile

@@ -5 +5 @@
 
 getwaf:
-        curl https://waf.io/waf-1.8.12 > waf
+        curl https://waf.io/waf-1.8.14 > waf
         @[ -d wafilb ] || rm -fr waflib
         @chmod +x waf && ./waf --help > /dev/null

src/pitch/pitch.c

@@ -241 +241 @@
 {
   uint_t overlap_size = p->buf->length - ibuf->length;
-#if !HAVE_MEMCPY_HACKS
+#if 1 //!HAVE_MEMCPY_HACKS
   uint_t j;
   for (j = 0; j < overlap_size; j++) {

wscript

@@ -131 +131 @@
         MINSDKVER="6.1"
         ctx.env.CFLAGS += ['-std=c99']
-        if (ctx.options.enable_audio_unit != False):
+        if (ctx.options.enable_apple_audio != False):
             ctx.define('HAVE_AUDIO_UNIT', 1)
             #ctx.env.FRAMEWORK += ['CoreFoundation', 'AudioToolbox']