Changeset 299dbfd

Timestamp:

Aug 13, 2015, 3:31:06 PM (9 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:

be6e8e6

Parents:

9f060d1 (diff), 7b2d740 (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:

• src/temporal/resampler.c (modified) (1 diff)
• wscript (modified) (3 diffs)

src/temporal/resampler.c

@@ -77 +77 @@
 struct _aubio_resampler_t
 {
+  void *dummy;
 };
 

wscript

@@ -179 +179 @@
         if (ctx.options.enable_fftw3f != False):
             ctx.check_cfg(package = 'fftw3f', atleast_version = '3.0.0',
-                    args = '--cflags --libs', mandatory = False)
+                    args = '--cflags --libs',
+                    mandatory = ctx.options.enable_fftw3f)
             if (ctx.options.enable_double == True):
-                ctx.msg('Warning', 'fftw3f enabled, but compiling in double precision!')
+                ctx.msg('Warning',
+                        'fftw3f enabled, but compiling in double precision!')
         else:
-            # fftw3f not enabled, take most sensible one according to enable_double
+            # fftw3f disabled, take most sensible one according to
+            # enable_double
             if (ctx.options.enable_double == True):
                 ctx.check_cfg(package = 'fftw3', atleast_version = '3.0.0',
-                        args = '--cflags --libs', mandatory = False)
+                        args = '--cflags --libs', mandatory =
+                        ctx.options.enable_fftw3)
             else:
                 ctx.check_cfg(package = 'fftw3f', atleast_version = '3.0.0',
-                        args = '--cflags --libs', mandatory = False)
+                        args = '--cflags --libs',
+                        mandatory = ctx.options.enable_fftw3)
         ctx.define('HAVE_FFTW3', 1)
 
@@ -205 +210 @@
     if (ctx.options.enable_sndfile != False):
         ctx.check_cfg(package = 'sndfile', atleast_version = '1.0.4',
-                args = '--cflags --libs', mandatory = False)
+                args = '--cflags --libs',
+                mandatory = ctx.options.enable_sndfile)
 
     # check for libsamplerate
     if (ctx.options.enable_samplerate != False):
         ctx.check_cfg(package = 'samplerate', atleast_version = '0.0.15',
-                args = '--cflags --libs', mandatory = False)
+                args = '--cflags --libs',
+                mandatory = ctx.options.enable_samplerate)
 
     # check for jack
     if (ctx.options.enable_jack != False):
         ctx.check_cfg(package = 'jack',
-                args = '--cflags --libs', mandatory = False)
+                args = '--cflags --libs',
+                mandatory = ctx.options.enable_jack)
 
     # check for libav
     if (ctx.options.enable_avcodec != False):
         ctx.check_cfg(package = 'libavcodec', atleast_version = '54.35.0',
-                args = '--cflags --libs', uselib_store = 'AVCODEC', mandatory = False)
+                args = '--cflags --libs', uselib_store = 'AVCODEC',
+                mandatory = ctx.options.enable_avcodec)
         ctx.check_cfg(package = 'libavformat', atleast_version = '52.3.0',
-                args = '--cflags --libs', uselib_store = 'AVFORMAT', mandatory = False)
+                args = '--cflags --libs', uselib_store = 'AVFORMAT',
+                mandatory = ctx.options.enable_avcodec)
         ctx.check_cfg(package = 'libavutil', atleast_version = '52.3.0',
-                args = '--cflags --libs', uselib_store = 'AVUTIL', mandatory = False)
+                args = '--cflags --libs', uselib_store = 'AVUTIL',
+                mandatory = ctx.options.enable_avcodec)
         ctx.check_cfg(package = 'libavresample', atleast_version = '1.0.1',
-                args = '--cflags --libs', uselib_store = 'AVRESAMPLE', mandatory = False)
+                args = '--cflags --libs', uselib_store = 'AVRESAMPLE',
+                mandatory = ctx.options.enable_avcodec)
         if all ( 'HAVE_' + i in ctx.env.define_key
                 for i in ['AVCODEC', 'AVFORMAT', 'AVUTIL', 'AVRESAMPLE'] ):
@@ -322 +334 @@
     ctx.excl += ' **/python.old/*'
     ctx.excl += ' **/python/tests/sounds'
+    ctx.excl += ' **/**.asc'