Changeset 97514e2

Timestamp:

Jul 17, 2012, 11:00:34 PM (12 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:

7d50c5a

Parents:

a81c8cd (diff), b0f2cc5 (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' of 192.168.1.41:projects/aubio/aubio into develop

Files:

• interfaces/python/build_linux (modified) (1 diff)
• interfaces/python/generator.py (modified) (3 diffs)
• src/temporal/resampler.h (modified) (1 diff)

interfaces/python/build_linux

@@ -1 +1 @@
 #! /bin/sh
 
+set -e
+set -x
+
 python setup.py clean build
-export PYTHONPATH=./build/lib.linux-x86_64-2.6/
+export PYTHONPATH=./build/lib.linux-x86_64-2.7/
 export LD_LIBRARY_PATH=../../build/src/
 ./run_all_tests --verbose

interfaces/python/generator.py

@@ -3 +3 @@
 """ This file generates a c file from a list of cpp prototypes. """
 
-import os, sys
+import os, sys, shutil
 from gen_pyobject import write_msg, gen_new_init, gen_do, gen_members, gen_methods, gen_finish
 
@@ -29 +29 @@
 
 def generate_object_files():
+  if os.path.isdir('generated'): shutil.rmtree('generated')
+  os.mkdir('generated')
 
   generated_objects = []
@@ -110 +112 @@
 
       # generate this_object
-      if not os.path.isdir('generated'): os.mkdir('generated')
       short_name = object_name[len('aubio_'):]
       if short_name in skip_objects:

src/temporal/resampler.h

@@ -41 +41 @@
 
   \param ratio output_sample_rate / input_sample_rate 
-  \param type libsamplerate resampling type
+  \param type libsamplerate resampling type, see http://www.mega-nerd.com/SRC/api_misc.html#Converters
 
 */