Changeset 6b233fc

Timestamp:

Aug 14, 2005, 8:44:58 PM (19 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:

92e4028

Parents:

45345ee

Message:

added dummy assignment to make egcs happy, use in woodblock path

Location:

examples

Files:

• Makefile.am (modified) (1 diff)
• utils.c (modified) (2 diffs)

examples/Makefile.am

@@ -4 +4 @@
 
 # global flags
-AM_CFLAGS = -I$(srcdir)/../src -I$(srcdir)/../ext @LADCCA_CFLAGS@
+AM_CFLAGS = -DAUBIO_PREFIX=\"$(prefix)\" -I$(srcdir)/../src -I$(srcdir)/../ext @LADCCA_CFLAGS@
 AM_LDFLAGS = -L../src -L../ext @LADCCA_LIBS@ -laubioext -laubio
 #AM_SOURCES = utils.c

examples/utils.c

@@ -22 +22 @@
 const char * output_filename = NULL;
 const char * input_filename  = NULL;
-const char * onset_filename  = "/usr/share/sounds/aubio/woodblock.aiff";
+const char * onset_filename  = AUBIO_PREFIX "/share/sounds/" PACKAGE "/woodblock.aiff";
 int frames = 0;
 int verbose = 0;
@@ -238 +238 @@
   woodblock = new_fvec(buffer_size,1);
   if (output_filename || usejack) {
-          (onsetfile = new_aubio_sndfile_ro(onset_filename)) ||
+          /* dummy assignement to keep egcs happy */
+          isonset = (onsetfile = new_aubio_sndfile_ro(onset_filename)) ||
                   (onsetfile = new_aubio_sndfile_ro("sounds/woodblock.aiff")) ||
                   (onsetfile = new_aubio_sndfile_ro("../sounds/woodblock.aiff"));