From: Paul Brossier Date: Sun, 25 Oct 2009 20:45:12 +0000 (+0100) Subject: interfaces/cpp: remove, will create a separate project later if needed X-Git-Tag: 0.4.0-beta1~591 X-Git-Url: https://git.aubio.org/?a=commitdiff_plain;h=e460e60fc86f388cb1673c6f7aaf7bab49d75f1c;p=aubio.git interfaces/cpp: remove, will create a separate project later if needed --- diff --git a/Makefile.am b/Makefile.am index db7792d5..2c5125d6 100644 --- a/Makefile.am +++ b/Makefile.am @@ -13,7 +13,7 @@ endif endif -SUBDIRS = src interfaces/cpp examples sounds plugins $(PYTHONDIR) $(SWIGDIR) $(JAVADIR) $(DOC) tests +SUBDIRS = src examples sounds plugins $(PYTHONDIR) $(SWIGDIR) $(JAVADIR) $(DOC) tests EXTRA_DIST = bootstrap VERSION docs: diff --git a/configure.ac b/configure.ac index 0afd04ba..4eccfc87 100644 --- a/configure.ac +++ b/configure.ac @@ -31,7 +31,6 @@ AM_PROG_CC_C_O dnl compiling with per-target flag if test "$ac_cv_prog_cc" = "no" ; then AC_MSG_ERROR([*** No C compiler found !]) fi -AC_PROG_CXX AC_PROG_INSTALL AUBIO_CFLAGS= @@ -260,14 +259,12 @@ AC_OUTPUT([ examples/Makefile tests/Makefile tests/src/Makefile - tests/cpp/Makefile sounds/Makefile swig/Makefile python/Makefile python/aubio/Makefile interfaces/java/Makefile interfaces/java/aubio/Makefile - interfaces/cpp/Makefile plugins/Makefile plugins/audacity/Makefile plugins/audacity/plug-ins/Makefile diff --git a/interfaces/cpp/Makefile.am b/interfaces/cpp/Makefile.am deleted file mode 100644 index 1cf7e751..00000000 --- a/interfaces/cpp/Makefile.am +++ /dev/null @@ -1,7 +0,0 @@ -pkginclude_HEADERS = aubiocpp.h - -lib_LTLIBRARIES = libaubiocpp.la -libaubiocpp_la_SOURCES = aubiocpp.cpp -AM_CPPFLAGS = -I$(top_srcdir)/src -I$(top_builddir)/src @AUBIO_CFLAGS@ @FFTWLIB_CFLAGS@ @SAMPLERATE_CFLAGS@ -libaubiocpp_la_LIBADD = -laubio -L${top_builddir}/src @FFTWLIB_LIBS@ @SAMPLERATE_LIBS@ @LTLIBOBJS@ -libaubiocpp_la_LDFLAGS = -version-info @SHARED_VERSION_INFO@ diff --git a/interfaces/cpp/aubiocpp.cpp b/interfaces/cpp/aubiocpp.cpp deleted file mode 100644 index 8f664911..00000000 --- a/interfaces/cpp/aubiocpp.cpp +++ /dev/null @@ -1,28 +0,0 @@ -#include "aubio.h" -#include "aubiocpp.h" - -namespace aubio { - - fvec::fvec(uint_t length, uint_t channels) { - self = new_fvec(length, channels); - } - - fvec::~fvec() { - del_fvec(self); - } - - smpl_t* fvec::operator[]( uint_t channel ) { - return fvec_get_channel(self, channel); - } - - cvec::cvec(uint_t length, uint_t channels) { - self = new_cvec(length, channels); - norm = cvec_get_norm(self); - phas = cvec_get_phas(self); - } - - cvec::~cvec() { - del_cvec(self); - } - -} diff --git a/interfaces/cpp/aubiocpp.h b/interfaces/cpp/aubiocpp.h deleted file mode 100644 index d2c08484..00000000 --- a/interfaces/cpp/aubiocpp.h +++ /dev/null @@ -1,31 +0,0 @@ -#include "aubio.h" - -namespace aubio { - - class fvec { - - private: - fvec_t * self; - - public: - fvec(uint_t length, uint_t channels); - ~fvec(); - smpl_t* operator[]( uint_t channel ); - - }; - - class cvec { - - private: - cvec_t * self; - - public: - smpl_t ** norm; - smpl_t ** phas; - - cvec(uint_t length, uint_t channels); - ~cvec(); - - }; - -} diff --git a/interfaces/cpp/wscript_build b/interfaces/cpp/wscript_build deleted file mode 100644 index 48fcc6ff..00000000 --- a/interfaces/cpp/wscript_build +++ /dev/null @@ -1,11 +0,0 @@ -# build libaubiocpp -libaubiocpp = bld.new_task_gen( - features = 'cxx cshlib', - includes = ['.', '../../src'], - source = bld.path.ant_glob('*.cpp'), - target = 'aubiocpp', - uselib_local = ['aubio'], - vnum = bld.env['LIB_VERSION']) - -# install header -bld.install_files('${PREFIX}/include/aubio/', 'aubiocpp.h') diff --git a/tests/Makefile.am b/tests/Makefile.am index 284d5ce3..82556c34 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -1,3 +1,3 @@ if COMPILE_TESTS -SUBDIRS = src cpp +SUBDIRS = src endif diff --git a/tests/cpp/Makefile.am b/tests/cpp/Makefile.am deleted file mode 100644 index c0172157..00000000 --- a/tests/cpp/Makefile.am +++ /dev/null @@ -1,15 +0,0 @@ -AM_CXXFLAGS = -I$(top_srcdir)/cpp -I$(top_srcdir)/src -AM_LDFLAGS = -L$(top_builddir)/cpp -laubiocpp -L$(top_builddir)/src -laubio @FFTWLIB_LIBS@ - -bin_PROGRAMS = \ - test-fvec \ - test-cvec - -test_fvec_SOURCES = test-fvec.cpp -test_cvec_SOURCES = test-cvec.cpp - -run-tests: $(bin_PROGRAMS) - @for i in $(bin_PROGRAMS); do echo $$i; ((time ./$$i 2>&1 > /dev/null) 2>&1; echo $$?); done - -run-valgrind-tests: $(bin_PROGRAMS) - @for i in $(bin_PROGRAMS); do echo $$i; valgrind .libs/lt-$$i 2>&1 | grep ERROR\ SUMMARY -A4; echo $$?; done diff --git a/tests/cpp/test-cvec.cpp b/tests/cpp/test-cvec.cpp deleted file mode 100644 index 32a27f50..00000000 --- a/tests/cpp/test-cvec.cpp +++ /dev/null @@ -1,21 +0,0 @@ -#include -#include - -using namespace std; -using namespace aubio; - -int main(){ - /* allocate some memory */ - uint_t win_s = 1024; /* window size */ - uint_t channels = 1; /* number of channel */ - cvec c = cvec(win_s, channels); /* input buffer */ - cout << c.norm[0][0] << endl; - c.norm[0][0] = 2.; - cout << c.norm[0][0] << endl; - cout << c.phas[0][0] << endl; - c.phas[0][0] = 2.; - cout << c.phas[0][0] << endl; - return 0; -} - - diff --git a/tests/cpp/test-fvec.cpp b/tests/cpp/test-fvec.cpp deleted file mode 100644 index 865c4728..00000000 --- a/tests/cpp/test-fvec.cpp +++ /dev/null @@ -1,17 +0,0 @@ -#include -#include - -using namespace std; -using namespace aubio; - -int main(){ - /* allocate some memory */ - uint_t win_s = 1024; /* window size */ - uint_t channels = 1; /* number of channel */ - fvec f = fvec(win_s, channels); /* input buffer */ - cout << f[0][0] << endl; - f[0][0] = 2.; - cout << f[0][0] << endl; - return 0; -} - diff --git a/wscript b/wscript index a63dc609..8fa2ccff 100644 --- a/wscript +++ b/wscript @@ -136,7 +136,7 @@ def build(bld): bld.env['LIB_VERSION'] = LIB_VERSION # add sub directories - bld.add_subdirs('src examples interfaces/cpp') + bld.add_subdirs('src examples') if bld.env['SWIG']: if bld.env['PYTHON']: bld.add_subdirs('python/aubio python')