Changeset 4084cd8 for src

Timestamp:

Oct 15, 2013, 7:06:15 PM (11 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, pitchshift, sampler, timestretch, yinfft+

Children:

0c77921

Parents:

2c2fe44 (diff), ef47246 (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 with develop

Location:

src

Files:

• aubio.h (modified) (1 diff)
• io/audio_unit.c (added)
• io/audio_unit.h (added)
• wscript_build (modified) (2 diffs)

src/aubio.h

@@ -185 +185 @@
 #include "io/source.h"
 #include "io/sink.h"
+#include "io/audio_unit.h"
 #include "synth/sampler.h"
 

src/wscript_build

@@ -12 +12 @@
 # build libaubio
 from waflib import Options
-if Options.platform == 'ios': build_lib_func = ctx.stlib
-else: build_lib_func = ctx.shlib
+if Options.platform == 'ios':
+    build_lib_func = ctx.stlib
+else:
+    build_lib_func = ctx.shlib
+
 build_lib_func(
     includes = ['.'],
@@ -25 +28 @@
 # install headers, except _priv.h ones
 ctx.install_files('${PREFIX}/include/aubio/',
-
     ctx.path.ant_glob('**/*.h', excl = ['**_priv.h', 'config.h']),
     relative_trick=True)