shithub: aubio

Info  •  Files  •  Log  •  Branches

Merge branch 'develop' of 192.168.1.41:projects/aubio/aubio into develop

--- a/interfaces/python/build_linux

+++ b/interfaces/python/build_linux

@@ -1,6 +1,9 @@

 #! /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

--- a/interfaces/python/generator.py

+++ b/interfaces/python/generator.py

@@ -2,7 +2,7 @@

 """ 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

 def get_cpp_objects():

@@ -28,6 +28,8 @@

   return cpp_output, cpp_objects

 def generate_object_files():

+  if os.path.isdir('generated'): shutil.rmtree('generated')

+  os.mkdir('generated')

   generated_objects = []

   cpp_output, cpp_objects = get_cpp_objects()

@@ -109,7 +111,6 @@

       # generate this_object

-      if not os.path.isdir('generated'): os.mkdir('generated')

       short_name = object_name[len('aubio_'):]

       if short_name in skip_objects:

               write_msg("-- INFO: skipping object", short_name )

--- a/src/temporal/resampler.h

+++ b/src/temporal/resampler.h

@@ -40,7 +40,7 @@

 /** create resampler object 

   \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

 */

 aubio_resampler_t *new_aubio_resampler (smpl_t ratio, uint_t type);