shithub: aubio

Info  •  Files  •  Log  •  Branches

Merge branch 'develop' into awhitening

--- a/Makefile

+++ b/Makefile

@@ -4,7 +4,7 @@

 	@[ -f waf ] || make getwaf

 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

 	@mv .waf*/waflib . && rm -fr .waf-*

--- a/src/pitch/pitch.c

+++ b/src/pitch/pitch.c

@@ -240,7 +240,7 @@

 aubio_pitch_slideblock (aubio_pitch_t * p, fvec_t * ibuf)

 {

   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++) {

     p->buf->data[j] = p->buf->data[j + ibuf->length];

--- a/wscript

+++ b/wscript

@@ -130,7 +130,7 @@

     if target_platform in [ 'ios', 'iosimulator' ]:

         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']

         if target_platform == 'ios':

-- 

⑨