shithub: aubio

Info  •  Files  •  Log  •  Branches

merge in piem@altern.org--aubio-fraise/aubio--mailine--0.3.2--patch7, tests and CFLAGS fixes
merge in piem@altern.org--aubio-fraise/aubio--mailine--0.3.2--patch7, tests and CFLAGS fixes

Patches applied:

 * piem@altern.org--aubio-fraise/aubio--mainline--0.3.2--patch-3
   use top_srcdir for tests includes

 * piem@altern.org--aubio-fraise/aubio--mainline--0.3.2--patch-4
   use default CFLAGS only if not already set

 * piem@altern.org--aubio-fraise/aubio--mainline--0.3.2--patch-5
   no more useless default CFLAGS

 * piem@altern.org--aubio-fraise/aubio--mainline--0.3.2--patch-6
   fix flags for test-phasevoc-jack

 * piem@altern.org--aubio-fraise/aubio--mainline--0.3.2--patch-7
   let tests compile when jack support is disabled

--- a/configure.ac

+++ b/configure.ac

@@ -32,9 +32,6 @@

 fi

 AC_PROG_INSTALL

-dnl Default optimization

-CFLAGS="$CFLAGS -O2"

-

 dnl Enable debugging (no)

 AC_ARG_ENABLE(debug,

   [  --enable-debug[[=value]]  compile with debug [[default=no]]],

--- a/examples/tests/Makefile.am

+++ b/examples/tests/Makefile.am

@@ -1,8 +1,8 @@

 AM_CFLAGS = -I$(top_srcdir)/src

 AM_LDFLAGS = -L$(top_builddir)/src -laubio @FFTWLIB_LIBS@

-test_phasevoc_jack_CFLAGS = -I$(top_builddir)/ext @JACK_CFLAGS@

-test_phasevoc_jack_LDADD  = -laubioext -L$(top_builddir)/ext @JACK_LIBS@ 

+test_phasevoc_jack_CFLAGS = $(AM_CFLAGS) -I$(top_srcdir)/ext @JACK_CFLAGS@

+test_phasevoc_jack_LDADD  = $(AM_LDFLAGS) -laubioext -L$(top_builddir)/ext @JACK_LIBS@ 

 bin_PROGRAMS = \

 	test-fft \

--- a/examples/tests/test-phasevoc-jack.c

+++ b/examples/tests/test-phasevoc-jack.c

@@ -13,7 +13,6 @@

 uint_t hop_s    = 8;  /* hop size                          */

 uint_t channels = 4;  /* number of channels                */

 uint_t pos      = 0;  /* frames%dspblocksize for jack loop */

-uint_t usejack  = 1;

 fvec_t * in;

 cvec_t * fftgrain;

@@ -21,7 +20,9 @@

 aubio_pvoc_t * pv;

+#ifdef JACK_SUPPORT

 aubio_jack_t * jack_setup;

+#endif

 int aubio_process(float **input, float **output, int nframes);

@@ -41,13 +42,13 @@

         aubio_pvoc_rdo(pv,fftgrain,out);

         printf("computed backard\n");

-        if (usejack) {

-                jack_setup  = new_aubio_jack(channels, channels,

-                                (aubio_process_func_t)aubio_process);

-                aubio_jack_activate(jack_setup);

-                sleep(10); //pause(); /* enter main jack loop */

-                aubio_jack_close(jack_setup);

-        }

+#ifdef JACK_SUPPORT

+        jack_setup  = new_aubio_jack(channels, channels,

+                        (aubio_process_func_t)aubio_process);

+        aubio_jack_activate(jack_setup);

+        sleep(10); //pause(); /* enter main jack loop */

+        aubio_jack_close(jack_setup);

+#endif

         del_aubio_pvoc(pv);

         del_cvec(fftgrain);