Changeset 740f06b for examples

Timestamp:

Oct 17, 2009, 12:43:00 AM (15 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:

858cfa7

Parents:

6107f4c

Message:

ext/, examples/, swig/, python/, tests/: remove libaubioext, make libsamplerate optional

Location:

examples

Files:

• Makefile.am (modified) (2 diffs)
• jackio.c (moved) (moved from ext/jackio.c)
• jackio.h (moved) (moved from ext/jackio.h)
• sndfileio.c (moved) (moved from ext/sndfileio.c)
• sndfileio.h (moved) (moved from ext/sndfileio.h)
• utils.h (modified) (1 diff)
• wscript_build (modified) (1 diff)

examples/Makefile.am

@@ -1 +1 @@
 # global flags
-AM_CFLAGS = -DAUBIO_PREFIX=\"$(prefix)\" -I$(top_srcdir)/src -I$(top_srcdir)/ext @AUBIO_CFLAGS@ @LASH_CFLAGS@ @FFTWLIB_CFLAGS@
-AM_LDFLAGS = -L$(top_builddir)/src -L$(top_builddir)/ext -laubioext -laubio @LASH_LIBS@
+AM_CFLAGS = -DAUBIO_PREFIX=\"$(prefix)\" -I$(top_srcdir)/src @AUBIO_CFLAGS@ @LASH_CFLAGS@ @SNDFILE_CFLAGS@ @JACK_CFLAGS@
+AM_LDFLAGS = -L$(top_builddir)/src -laubio @LASH_LIBS@
 
 # add your programs to this list
@@ -13 +13 @@
         aubioquiet
 
-EXTRA_DIST = utils.h
+EXTRA_DIST = utils.h sndfileio.h jackio.h
 
 # optionally add sources file for these programs
-aubioonset_SOURCES = aubioonset.c utils.c
-aubionotes_SOURCES = aubionotes.c utils.c
-aubiotrack_SOURCES = aubiotrack.c utils.c
-aubioquiet_SOURCES = aubioquiet.c utils.c
-aubiomfcc_SOURCES = aubiomfcc.c utils.c
+COMMON_SOURCE_FILES = sndfileio.c jackio.c utils.c
+aubioonset_SOURCES = aubioonset.c $(COMMON_SOURCE_FILES)
+aubionotes_SOURCES = aubionotes.c $(COMMON_SOURCE_FILES)
+aubiotrack_SOURCES = aubiotrack.c $(COMMON_SOURCE_FILES)
+aubioquiet_SOURCES = aubioquiet.c $(COMMON_SOURCE_FILES)
+aubiomfcc_SOURCES = aubiomfcc.c $(COMMON_SOURCE_FILES)
 
-aubioonset_LDADD = @JACK_LIBS@
-aubionotes_LDADD = @JACK_LIBS@
-aubiotrack_LDADD = @JACK_LIBS@
-aubioquiet_LDADD = @JACK_LIBS@
-aubiomfcc_LDADD = @JACK_LIBS@
+aubioonset_LDADD = @SNDFILE_LIBS@ @JACK_LIBS@
+aubionotes_LDADD = @SNDFILE_LIBS@ @JACK_LIBS@
+aubiotrack_LDADD = @SNDFILE_LIBS@ @JACK_LIBS@
+aubioquiet_LDADD = @SNDFILE_LIBS@ @JACK_LIBS@
+aubiomfcc_LDADD = @SNDFILE_LIBS@ @JACK_LIBS@

examples/utils.h

@@ -27 +27 @@
 #include <string.h>             /* for strcmp */
 #include <aubio.h>
-#include <aubioext.h>
+#include "sndfileio.h"
+#ifdef HAVE_JACK
+#include "jackio.h"
+#endif /* HAVE_JACK */
 
 #ifdef HAVE_C99_VARARGS_MACROS

examples/wscript_build

@@ -4 +4 @@
 defines += ['PACKAGE="' + bld.env['PACKAGE'] + '"']
 
+extra_source = ['utils.c', 'sndfileio.c', 'jackio.c']
+
 bld.new_task_gen(features = 'cc',
-    includes = '../src ../ext',
-    source = 'utils.c',
+    includes = '../src',
+    source = extra_source, 
     uselib = ['LASH'],
     defines = defines, 
-    target = 'utils')
+    target = 'utils_io')
 
 # loop over all *.c filenames in examples to build them all
 for target_name in bld.path.ant_glob('*.c').split():
   # ignore utils.c
-  if target_name in ['utils.c']: continue 
+  if target_name in extra_source: continue 
   bld.new_task_gen(features = 'cc cprogram', 
-      add_objects = 'utils',
-      includes = '../src ../ext',
+      add_objects = 'utils_io',
+      includes = '../src',
       defines = defines, 
-      uselib = ['LASH'],
-      uselib_local = ['aubio', 'aubioext'],
+      uselib = ['LASH', 'JACK', 'SNDFILE'],
+      uselib_local = ['aubio'],
       source = target_name,
       # program name is filename.c without the .c