Changeset 25c9f9a

Timestamp:

Feb 10, 2013, 2:10:12 AM (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:

927f630

Parents:

b554e41

Message:

move new python module to the top

Location:

python

Files:

• README.md (moved) (moved from interfaces/python/README.md)
• a_weighting_test_simple.expected (moved) (moved from interfaces/python/a_weighting_test_simple.expected)
• aubio-types.h (moved) (moved from interfaces/python/aubio-types.h)
• aubio/__init__.py (moved) (moved from interfaces/python/aubio/__init__.py)
• aubioinput.py (moved) (moved from interfaces/python/aubioinput.py)
• aubiomodule.c (moved) (moved from interfaces/python/aubiomodule.c)
• aubioproxy.c (moved) (moved from interfaces/python/aubioproxy.c)
• aubiowraphell.h (moved) (moved from interfaces/python/aubiowraphell.h)
• build_linux (moved) (moved from interfaces/python/build_linux)
• build_osx (moved) (moved from interfaces/python/build_osx)
• c_weighting_test_simple.expected (moved) (moved from interfaces/python/c_weighting_test_simple.expected)
• demo_beats_and_tempo.py (moved) (moved from interfaces/python/demo_beats_and_tempo.py)
• demo_filterbank_slaney.py (moved) (moved from interfaces/python/demo_filterbank_slaney.py)
• demo_filterbank_triangle_bands.py (moved) (moved from interfaces/python/demo_filterbank_triangle_bands.py)
• demo_onset_sinusoid.py (moved) (moved from interfaces/python/demo_onset_sinusoid.py)
• demo_pitch_sinusoid.py (moved) (moved from interfaces/python/demo_pitch_sinusoid.py)
• demo_simple_robot_voice.py (moved) (moved from interfaces/python/demo_simple_robot_voice.py)
• demo_sink.py (moved) (moved from interfaces/python/demo_sink.py)
• demo_source.py (moved) (moved from interfaces/python/demo_source.py)
• demo_spectrogram.py (moved) (moved from interfaces/python/demo_spectrogram.py)
• demo_tss.py (moved) (moved from interfaces/python/demo_tss.py)
• gen_pyobject.py (moved) (moved from interfaces/python/gen_pyobject.py)
• generator.py (moved) (moved from interfaces/python/generator.py) (1 diff)
• py-cvec.c (moved) (moved from interfaces/python/py-cvec.c)
• py-fft.c (moved) (moved from interfaces/python/py-fft.c)
• py-filter.c (moved) (moved from interfaces/python/py-filter.c)
• py-filterbank.c (moved) (moved from interfaces/python/py-filterbank.c)
• py-phasevoc.c (moved) (moved from interfaces/python/py-phasevoc.c)
• run_all_tests (moved) (moved from interfaces/python/run_all_tests)
• setup.py (moved) (moved from interfaces/python/setup.py) (1 diff)
• test_aubio.py (moved) (moved from interfaces/python/test_aubio.py)
• test_cvec.py (moved) (moved from interfaces/python/test_cvec.py)
• test_fft.py (moved) (moved from interfaces/python/test_fft.py)
• test_filter.py (moved) (moved from interfaces/python/test_filter.py)
• test_filterbank.py (moved) (moved from interfaces/python/test_filterbank.py)
• test_filterbank_mel.py (moved) (moved from interfaces/python/test_filterbank_mel.py)
• test_fvec.py (moved) (moved from interfaces/python/test_fvec.py)
• test_onset.py (moved) (moved from interfaces/python/test_onset.py)
• test_peakpicker.py (moved) (moved from interfaces/python/test_peakpicker.py)
• test_phasevoc.py (moved) (moved from interfaces/python/test_phasevoc.py)
• test_pitch.py (moved) (moved from interfaces/python/test_pitch.py)
• test_source.py (moved) (moved from interfaces/python/test_source.py)
• test_specdesc.py (moved) (moved from interfaces/python/test_specdesc.py)

python/generator.py

@@ -8 +8 @@
 def get_cpp_objects():
 
-  cpp_output = [l.strip() for l in os.popen('cpp -DAUBIO_UNSTABLE=1 -I../../build/src ../../src/aubio.h').readlines()]
+  cpp_output = [l.strip() for l in os.popen('cpp -DAUBIO_UNSTABLE=1 -I../build/src ../src/aubio.h').readlines()]
 
   cpp_output = filter(lambda y: len(y) > 1, cpp_output)

python/setup.py

@@ -6 +6 @@
 import numpy
 
-library_dirs = ['../../build/src', '../../src/.libs']
-include_dirs = ['../../build/src', '../../src', '.' ]
+library_dirs = ['../build/src', '../src/.libs']
+include_dirs = ['../build/src', '../src', '.' ]
 library_dirs = filter (lambda x: os.path.isdir(x), library_dirs)
 include_dirs = filter (lambda x: os.path.isdir(x), include_dirs)