ref: e9eaaf47ae12533a8bbef0934dcf3a9ffabab56b
parent: 86053617e29e886672287d728d982a1778f073e5
parent: 94b16497bb59e55cfe47baa4152f1733eebbdfbb
author: Paul Brossier <piem@piem.org>
date: Wed Feb 3 17:54:24 EST 2016
Merge branch 'develop' into awhitening
--- a/Makefile
+++ b/Makefile
@@ -7,7 +7,7 @@
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-*
+ @mv .waf*/waflib . && rm -fr .waf*
@sed '/^#==>$$/,$$d' waf > waf2 && mv waf2 waf
@chmod +x waf
--- a/README.md
+++ b/README.md
@@ -68,7 +68,7 @@
The latest version of the documentation can be found at:
- http://aubio.org/documentation
+ https://aubio.org/documentation
Installation and Build Instructions
-----------------------------------
@@ -75,7 +75,7 @@
A number of distributions already include aubio. Check your favorite package
management system, or have a look at the [download
-page](http://aubio.org/download).
+page](https://aubio.org/download).
aubio uses [waf](https://waf.io/) to configure, compile, and test the source:
@@ -107,7 +107,7 @@
in:
- Paul Brossier, _[Automatic annotation of musical audio for interactive
- systems](http://aubio.org/phd)_, PhD thesis, Centre for Digital music,
+ systems](https://aubio.org/phd)_, PhD thesis, Centre for Digital music,
Queen Mary University of London, London, UK, 2006.
Additional results obtained with this software were discussed in the following
@@ -114,12 +114,12 @@
papers:
- P. M. Brossier and J. P. Bello and M. D. Plumbley, [Real-time temporal
- segmentation of note objects in music signals](http://aubio.org/articles/brossier04fastnotes.pdf),
+ segmentation of note objects in music signals](https://aubio.org/articles/brossier04fastnotes.pdf),
in _Proceedings of the International Computer Music Conference_, 2004, Miami,
Florida, ICMA
- P. M. Brossier and J. P. Bello and M. D. Plumbley, [Fast labelling of note
- objects in music signals] (http://aubio.org/articles/brossier04fastnotes.pdf),
+ objects in music signals] (https://aubio.org/articles/brossier04fastnotes.pdf),
in _Proceedings of the International Symposium on Music Information Retrieval_,
2004, Barcelona, Spain
@@ -127,7 +127,7 @@
Contact Info and Mailing List
-----------------------------
-The home page of this project can be found at: http://aubio.org/
+The home page of this project can be found at: https://aubio.org/
Questions, comments, suggestions, and contributions are welcome. Use the
mailing list: <aubio-user@aubio.org>.
--- a/python/demos/demo_pysoundcard_play.py
+++ b/python/demos/demo_pysoundcard_play.py
@@ -10,7 +10,7 @@
f = source(source_path, hop_size = hop_size)
samplerate = f.samplerate
- s = Stream(sample_rate = samplerate, block_length = hop_size)
+ s = Stream(samplerate = samplerate, blocksize = hop_size)
s.start()
read = 0
while 1:
--- a/python/demos/demo_pysoundcard_record.py
+++ b/python/demos/demo_pysoundcard_record.py
@@ -8,17 +8,22 @@
hop_size = 256
duration = 5 # in seconds
- s = Stream(block_length = hop_size)
- g = sink(sink_path, samplerate = s.sample_rate)
+ s = Stream(blocksize = hop_size, channels = 1)
+ g = sink(sink_path, samplerate = int(s.samplerate))
+ print s.channels
s.start()
total_frames = 0
- while total_frames < duration * s.sample_rate:
- vec = s.read(hop_size)
- # mix down to mono
- mono_vec = vec.sum(-1) / float(s.input_channels)
- g(mono_vec, hop_size)
- total_frames += hop_size
+ try:
+ while total_frames < duration * s.samplerate:
+ vec = s.read(hop_size)
+ # mix down to mono
+ mono_vec = vec.sum(-1) / float(s.channels[0])
+ g(mono_vec, hop_size)
+ total_frames += hop_size
+ except KeyboardInterrupt, e:
+ print "stopped after", "%.2f seconds" % (total_frames / s.samplerate)
+ pass
s.stop()
if __name__ == '__main__':
--- a/src/musicutils.h
+++ b/src/musicutils.h
@@ -56,8 +56,8 @@
implementations of a phase vocoder: the tricks of the trade. In Proceedings of
the International Conference on Digital Audio Effects (DAFx-00), pages 37–44,
Uni- versity of Verona, Italy, 2000.
- (<a href="http://profs.sci.univr.it/%7Edafx/Final-Papers/ps/Bernardini.ps.gz">
- ps.gz</a>)
+ (<a href="http://www.cs.princeton.edu/courses/archive/spr09/cos325/Bernardini.pdf">
+ pdf</a>)
*/
uint_t fvec_set_window (fvec_t * window, char_t * window_type);
--- a/wscript
+++ b/wscript
@@ -137,6 +137,7 @@
DEVROOT = "/Applications/Xcode.app/Contents"
DEVROOT += "/Developer/Platforms/iPhoneOS.platform/Developer"
SDKROOT = "%(DEVROOT)s/SDKs/iPhoneOS.sdk" % locals()
+ ctx.env.CFLAGS += [ '-fembed-bitcode' ]
ctx.env.CFLAGS += [ '-arch', 'arm64' ]
ctx.env.CFLAGS += [ '-arch', 'armv7' ]
ctx.env.CFLAGS += [ '-arch', 'armv7s' ]
--
⑨