From 25c9f9ac65ef6d0c66a90795f9b1fd6835e28d2c Mon Sep 17 00:00:00 2001
From: Paul Brossier <piem@piem.org>
Date: Sat, 9 Feb 2013 20:10:12 -0500
Subject: [PATCH] move new python module to the top

---
 {interfaces/python => python}/README.md                         | 0
 {interfaces/python => python}/a_weighting_test_simple.expected  | 0
 {interfaces/python => python}/aubio-types.h                     | 0
 {interfaces/python => python}/aubio/__init__.py                 | 0
 {interfaces/python => python}/aubioinput.py                     | 0
 {interfaces/python => python}/aubiomodule.c                     | 0
 {interfaces/python => python}/aubioproxy.c                      | 0
 {interfaces/python => python}/aubiowraphell.h                   | 0
 {interfaces/python => python}/build_linux                       | 0
 {interfaces/python => python}/build_osx                         | 0
 {interfaces/python => python}/c_weighting_test_simple.expected  | 0
 {interfaces/python => python}/demo_beats_and_tempo.py           | 0
 {interfaces/python => python}/demo_filterbank_slaney.py         | 0
 {interfaces/python => python}/demo_filterbank_triangle_bands.py | 0
 {interfaces/python => python}/demo_onset_sinusoid.py            | 0
 {interfaces/python => python}/demo_pitch_sinusoid.py            | 0
 {interfaces/python => python}/demo_simple_robot_voice.py        | 0
 {interfaces/python => python}/demo_sink.py                      | 0
 {interfaces/python => python}/demo_source.py                    | 0
 {interfaces/python => python}/demo_spectrogram.py               | 0
 {interfaces/python => python}/demo_tss.py                       | 0
 {interfaces/python => python}/gen_pyobject.py                   | 0
 {interfaces/python => python}/generator.py                      | 2 +-
 {interfaces/python => python}/py-cvec.c                         | 0
 {interfaces/python => python}/py-fft.c                          | 0
 {interfaces/python => python}/py-filter.c                       | 0
 {interfaces/python => python}/py-filterbank.c                   | 0
 {interfaces/python => python}/py-phasevoc.c                     | 0
 {interfaces/python => python}/run_all_tests                     | 0
 {interfaces/python => python}/setup.py                          | 4 ++--
 {interfaces/python => python}/test_aubio.py                     | 0
 {interfaces/python => python}/test_cvec.py                      | 0
 {interfaces/python => python}/test_fft.py                       | 0
 {interfaces/python => python}/test_filter.py                    | 0
 {interfaces/python => python}/test_filterbank.py                | 0
 {interfaces/python => python}/test_filterbank_mel.py            | 0
 {interfaces/python => python}/test_fvec.py                      | 0
 {interfaces/python => python}/test_onset.py                     | 0
 {interfaces/python => python}/test_peakpicker.py                | 0
 {interfaces/python => python}/test_phasevoc.py                  | 0
 {interfaces/python => python}/test_pitch.py                     | 0
 {interfaces/python => python}/test_source.py                    | 0
 {interfaces/python => python}/test_specdesc.py                  | 0
 43 files changed, 3 insertions(+), 3 deletions(-)
 rename {interfaces/python => python}/README.md (100%)
 rename {interfaces/python => python}/a_weighting_test_simple.expected (100%)
 rename {interfaces/python => python}/aubio-types.h (100%)
 rename {interfaces/python => python}/aubio/__init__.py (100%)
 rename {interfaces/python => python}/aubioinput.py (100%)
 rename {interfaces/python => python}/aubiomodule.c (100%)
 rename {interfaces/python => python}/aubioproxy.c (100%)
 rename {interfaces/python => python}/aubiowraphell.h (100%)
 rename {interfaces/python => python}/build_linux (100%)
 rename {interfaces/python => python}/build_osx (100%)
 rename {interfaces/python => python}/c_weighting_test_simple.expected (100%)
 rename {interfaces/python => python}/demo_beats_and_tempo.py (100%)
 rename {interfaces/python => python}/demo_filterbank_slaney.py (100%)
 rename {interfaces/python => python}/demo_filterbank_triangle_bands.py (100%)
 rename {interfaces/python => python}/demo_onset_sinusoid.py (100%)
 rename {interfaces/python => python}/demo_pitch_sinusoid.py (100%)
 rename {interfaces/python => python}/demo_simple_robot_voice.py (100%)
 rename {interfaces/python => python}/demo_sink.py (100%)
 rename {interfaces/python => python}/demo_source.py (100%)
 rename {interfaces/python => python}/demo_spectrogram.py (100%)
 rename {interfaces/python => python}/demo_tss.py (100%)
 rename {interfaces/python => python}/gen_pyobject.py (100%)
 rename {interfaces/python => python}/generator.py (99%)
 rename {interfaces/python => python}/py-cvec.c (100%)
 rename {interfaces/python => python}/py-fft.c (100%)
 rename {interfaces/python => python}/py-filter.c (100%)
 rename {interfaces/python => python}/py-filterbank.c (100%)
 rename {interfaces/python => python}/py-phasevoc.c (100%)
 rename {interfaces/python => python}/run_all_tests (100%)
 rename {interfaces/python => python}/setup.py (91%)
 rename {interfaces/python => python}/test_aubio.py (100%)
 rename {interfaces/python => python}/test_cvec.py (100%)
 rename {interfaces/python => python}/test_fft.py (100%)
 rename {interfaces/python => python}/test_filter.py (100%)
 rename {interfaces/python => python}/test_filterbank.py (100%)
 rename {interfaces/python => python}/test_filterbank_mel.py (100%)
 rename {interfaces/python => python}/test_fvec.py (100%)
 rename {interfaces/python => python}/test_onset.py (100%)
 rename {interfaces/python => python}/test_peakpicker.py (100%)
 rename {interfaces/python => python}/test_phasevoc.py (100%)
 rename {interfaces/python => python}/test_pitch.py (100%)
 rename {interfaces/python => python}/test_source.py (100%)
 rename {interfaces/python => python}/test_specdesc.py (100%)

diff --git a/interfaces/python/README.md b/python/README.md
similarity index 100%
rename from interfaces/python/README.md
rename to python/README.md
diff --git a/interfaces/python/a_weighting_test_simple.expected b/python/a_weighting_test_simple.expected
similarity index 100%
rename from interfaces/python/a_weighting_test_simple.expected
rename to python/a_weighting_test_simple.expected
diff --git a/interfaces/python/aubio-types.h b/python/aubio-types.h
similarity index 100%
rename from interfaces/python/aubio-types.h
rename to python/aubio-types.h
diff --git a/interfaces/python/aubio/__init__.py b/python/aubio/__init__.py
similarity index 100%
rename from interfaces/python/aubio/__init__.py
rename to python/aubio/__init__.py
diff --git a/interfaces/python/aubioinput.py b/python/aubioinput.py
similarity index 100%
rename from interfaces/python/aubioinput.py
rename to python/aubioinput.py
diff --git a/interfaces/python/aubiomodule.c b/python/aubiomodule.c
similarity index 100%
rename from interfaces/python/aubiomodule.c
rename to python/aubiomodule.c
diff --git a/interfaces/python/aubioproxy.c b/python/aubioproxy.c
similarity index 100%
rename from interfaces/python/aubioproxy.c
rename to python/aubioproxy.c
diff --git a/interfaces/python/aubiowraphell.h b/python/aubiowraphell.h
similarity index 100%
rename from interfaces/python/aubiowraphell.h
rename to python/aubiowraphell.h
diff --git a/interfaces/python/build_linux b/python/build_linux
similarity index 100%
rename from interfaces/python/build_linux
rename to python/build_linux
diff --git a/interfaces/python/build_osx b/python/build_osx
similarity index 100%
rename from interfaces/python/build_osx
rename to python/build_osx
diff --git a/interfaces/python/c_weighting_test_simple.expected b/python/c_weighting_test_simple.expected
similarity index 100%
rename from interfaces/python/c_weighting_test_simple.expected
rename to python/c_weighting_test_simple.expected
diff --git a/interfaces/python/demo_beats_and_tempo.py b/python/demo_beats_and_tempo.py
similarity index 100%
rename from interfaces/python/demo_beats_and_tempo.py
rename to python/demo_beats_and_tempo.py
diff --git a/interfaces/python/demo_filterbank_slaney.py b/python/demo_filterbank_slaney.py
similarity index 100%
rename from interfaces/python/demo_filterbank_slaney.py
rename to python/demo_filterbank_slaney.py
diff --git a/interfaces/python/demo_filterbank_triangle_bands.py b/python/demo_filterbank_triangle_bands.py
similarity index 100%
rename from interfaces/python/demo_filterbank_triangle_bands.py
rename to python/demo_filterbank_triangle_bands.py
diff --git a/interfaces/python/demo_onset_sinusoid.py b/python/demo_onset_sinusoid.py
similarity index 100%
rename from interfaces/python/demo_onset_sinusoid.py
rename to python/demo_onset_sinusoid.py
diff --git a/interfaces/python/demo_pitch_sinusoid.py b/python/demo_pitch_sinusoid.py
similarity index 100%
rename from interfaces/python/demo_pitch_sinusoid.py
rename to python/demo_pitch_sinusoid.py
diff --git a/interfaces/python/demo_simple_robot_voice.py b/python/demo_simple_robot_voice.py
similarity index 100%
rename from interfaces/python/demo_simple_robot_voice.py
rename to python/demo_simple_robot_voice.py
diff --git a/interfaces/python/demo_sink.py b/python/demo_sink.py
similarity index 100%
rename from interfaces/python/demo_sink.py
rename to python/demo_sink.py
diff --git a/interfaces/python/demo_source.py b/python/demo_source.py
similarity index 100%
rename from interfaces/python/demo_source.py
rename to python/demo_source.py
diff --git a/interfaces/python/demo_spectrogram.py b/python/demo_spectrogram.py
similarity index 100%
rename from interfaces/python/demo_spectrogram.py
rename to python/demo_spectrogram.py
diff --git a/interfaces/python/demo_tss.py b/python/demo_tss.py
similarity index 100%
rename from interfaces/python/demo_tss.py
rename to python/demo_tss.py
diff --git a/interfaces/python/gen_pyobject.py b/python/gen_pyobject.py
similarity index 100%
rename from interfaces/python/gen_pyobject.py
rename to python/gen_pyobject.py
diff --git a/interfaces/python/generator.py b/python/generator.py
similarity index 99%
rename from interfaces/python/generator.py
rename to python/generator.py
index 0bbd20e4..6e904a1e 100755
--- a/interfaces/python/generator.py
+++ b/python/generator.py
@@ -7,7 +7,7 @@ from gen_pyobject import write_msg, gen_new_init, gen_do, gen_members, gen_metho
 
 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)
   cpp_output = filter(lambda y: not y.startswith('#'), cpp_output)
diff --git a/interfaces/python/py-cvec.c b/python/py-cvec.c
similarity index 100%
rename from interfaces/python/py-cvec.c
rename to python/py-cvec.c
diff --git a/interfaces/python/py-fft.c b/python/py-fft.c
similarity index 100%
rename from interfaces/python/py-fft.c
rename to python/py-fft.c
diff --git a/interfaces/python/py-filter.c b/python/py-filter.c
similarity index 100%
rename from interfaces/python/py-filter.c
rename to python/py-filter.c
diff --git a/interfaces/python/py-filterbank.c b/python/py-filterbank.c
similarity index 100%
rename from interfaces/python/py-filterbank.c
rename to python/py-filterbank.c
diff --git a/interfaces/python/py-phasevoc.c b/python/py-phasevoc.c
similarity index 100%
rename from interfaces/python/py-phasevoc.c
rename to python/py-phasevoc.c
diff --git a/interfaces/python/run_all_tests b/python/run_all_tests
similarity index 100%
rename from interfaces/python/run_all_tests
rename to python/run_all_tests
diff --git a/interfaces/python/setup.py b/python/setup.py
similarity index 91%
rename from interfaces/python/setup.py
rename to python/setup.py
index ef05441d..f6f88a1e 100755
--- a/interfaces/python/setup.py
+++ b/python/setup.py
@@ -5,8 +5,8 @@ from generator import generate_object_files
 import os.path
 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)
 
diff --git a/interfaces/python/test_aubio.py b/python/test_aubio.py
similarity index 100%
rename from interfaces/python/test_aubio.py
rename to python/test_aubio.py
diff --git a/interfaces/python/test_cvec.py b/python/test_cvec.py
similarity index 100%
rename from interfaces/python/test_cvec.py
rename to python/test_cvec.py
diff --git a/interfaces/python/test_fft.py b/python/test_fft.py
similarity index 100%
rename from interfaces/python/test_fft.py
rename to python/test_fft.py
diff --git a/interfaces/python/test_filter.py b/python/test_filter.py
similarity index 100%
rename from interfaces/python/test_filter.py
rename to python/test_filter.py
diff --git a/interfaces/python/test_filterbank.py b/python/test_filterbank.py
similarity index 100%
rename from interfaces/python/test_filterbank.py
rename to python/test_filterbank.py
diff --git a/interfaces/python/test_filterbank_mel.py b/python/test_filterbank_mel.py
similarity index 100%
rename from interfaces/python/test_filterbank_mel.py
rename to python/test_filterbank_mel.py
diff --git a/interfaces/python/test_fvec.py b/python/test_fvec.py
similarity index 100%
rename from interfaces/python/test_fvec.py
rename to python/test_fvec.py
diff --git a/interfaces/python/test_onset.py b/python/test_onset.py
similarity index 100%
rename from interfaces/python/test_onset.py
rename to python/test_onset.py
diff --git a/interfaces/python/test_peakpicker.py b/python/test_peakpicker.py
similarity index 100%
rename from interfaces/python/test_peakpicker.py
rename to python/test_peakpicker.py
diff --git a/interfaces/python/test_phasevoc.py b/python/test_phasevoc.py
similarity index 100%
rename from interfaces/python/test_phasevoc.py
rename to python/test_phasevoc.py
diff --git a/interfaces/python/test_pitch.py b/python/test_pitch.py
similarity index 100%
rename from interfaces/python/test_pitch.py
rename to python/test_pitch.py
diff --git a/interfaces/python/test_source.py b/python/test_source.py
similarity index 100%
rename from interfaces/python/test_source.py
rename to python/test_source.py
diff --git a/interfaces/python/test_specdesc.py b/python/test_specdesc.py
similarity index 100%
rename from interfaces/python/test_specdesc.py
rename to python/test_specdesc.py
-- 
2.11.0