Changeset e43464c

Timestamp:

Jan 7, 2012, 3:53:32 AM (12 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:

466a5da

Parents:

8b3a7e7 (diff), 9430dfd (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of piem.org:/git/aubio/aubio

Files:

• configure.ac (modified) (1 diff)
• examples/sndfileio.c (modified) (2 diffs)
• examples/utils.c (modified) (6 diffs)
• tests/src/Makefile.am (modified) (2 diffs)

configure.ac

@@ -154 +154 @@
 fi
 
-PKG_CHECK_MODULES(SNDFILE,     sndfile >= 1.0.4,       HAVE_SNDFILE=1)
-if test "${HAVE_SNDFILE}" = "1"; then
-  AC_DEFINE(HAVE_SNDFILE,1,[Define to enable libsndfile support])
+AC_ARG_ENABLE(sndfile,
+  AC_HELP_STRING([--enable-sndfile],[compile with sndfile [[default=auto]]]),
+  [with_sndfile=$enableval],
+  with_sndfile="yes")
+if test "$with_sndfile" = "yes"; then
+  PKG_CHECK_MODULES(SNDFILE, sndfile >= 1.0.4, HAVE_SNDFILE=1, HAVE_SNDFILE=0)
+  if test "${HAVE_SNDFILE}" = "1"; then
+    AC_DEFINE(HAVE_SNDFILE,1,[Define to enable libsndfile support])
+  fi
 fi
 

examples/sndfileio.c

@@ -18 +18 @@
 
 */
+
+#ifdef HAVE_SNDFILE
 
 #include <string.h>
@@ -248 +250 @@
 }
 
+#endif /* HAVE_SNDFILE */

examples/utils.c

@@ -19 +19 @@
 */
 
-/** 
+/**
 
   This file includes some tools common to all examples. Code specific to the
@@ -64 +64 @@
 
 
+#ifdef HAVE_SNDFILE
 aubio_sndfile_t *file = NULL;
 aubio_sndfile_t *fileout = NULL;
+#else
+void *file = NULL;
+void *fileout = NULL;
+#endif
 
 fvec_t *ibuf;
@@ -197 +202 @@
 }
 
+#ifdef HAVE_SNDFILE
+
 void
 examples_common_init (int argc, char **argv)
@@ -259 +266 @@
 }
 
+#else /* HAVE_SNDFILE */
+
+void
+examples_common_init (int argc, char **argv)
+{
+  outmsg ("Error, compiled without sndfile, nothing to do for now!\n");
+}
+
+
+#endif /* HAVE_SNDFILE */
+
 
 void
@@ -273 +291 @@
 aubio_jack_t *jack_setup;
 #endif
+
+#if HAVE_SNDFILE
 
 void
@@ -321 +341 @@
 }
 
+#else /* HAVE_SNDFILE */
+
+void
+examples_common_process (aubio_process_func_t process_func,
+    aubio_print_func_t print)
+{
+}
+
+#endif /* HAVE_SNDFILE */
+
 void
 flush_process (aubio_process_func_t process_func, aubio_print_func_t print)

tests/src/Makefile.am

@@ -6 +6 @@
 
 bin_PROGRAMS = \
-        test-fft \
         test-hist \
         test-scale \
@@ -28 +27 @@
         test-pitchmcomb \
         test-pitch \
-        test-beattracking \
         test-onset \
-        test-tempo \
         test-mathutils \
         test-tss