shithub: aubio

Info  •  Files  •  Log  •  Branches

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

--- a/examples/Makefile.am

+++ b/examples/Makefile.am

@@ -3,7 +3,7 @@

 endif

 # 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

--- a/examples/utils.c

+++ b/examples/utils.c

@@ -21,7 +21,7 @@

 /* settings */

 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;

 int usejack = 0;

@@ -237,7 +237,8 @@

   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"));

   }