Changeset 8659f2c

Timestamp:

Jul 27, 2006, 1:34:25 AM (18 years ago)

Author:

Paul Brossier <piem@altern.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:

e41af98

Parents:

da5edf3

Message:

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

Files:

• configure.ac (modified) (1 diff)
• examples/tests/Makefile.am (modified) (1 diff)
• examples/tests/test-phasevoc-jack.c (modified) (3 diffs)

configure.ac

@@ -32 +32 @@
 fi
 AC_PROG_INSTALL
-
-dnl Default optimization
-CFLAGS="$CFLAGS -O2"
 
 dnl Enable debugging (no)

examples/tests/Makefile.am

@@ -2 +2 @@
 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 = \

examples/tests/test-phasevoc-jack.c

@@ -14 +14 @@
 uint_t channels = 4;  /* number of channels                */
 uint_t pos      = 0;  /* frames%dspblocksize for jack loop */
-uint_t usejack  = 1;
 
 fvec_t * in;
@@ -22 +21 @@
 aubio_pvoc_t * pv;
 
+#ifdef JACK_SUPPORT
 aubio_jack_t * jack_setup;
+#endif
 
 int aubio_process(float **input, float **output, int nframes);
@@ -42 +43 @@
         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);