Changeset f382ac6

Timestamp:

May 23, 2005, 6:32:42 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:

0c20582

Parents:

ee0cc27b

Message:

start fixing woodblock filepaty
start fixing woodblock filepaty

Files:

• examples/utils.c (modified) (3 diffs)
• ext/sndfileio.c (modified) (1 diff)

examples/utils.c

@@ -201 +201 @@
 
 
-  aubio_file_t * onsetfile = new_file_ro(onset_filename);
+  aubio_file_t * onsetfile;
   /* parse command line arguments */
   parse_args(argc, argv);
+
+  woodblock = new_fvec(buffer_size,1);
+  if (output_filename || usejack) {
+          (onsetfile = new_file_ro(onset_filename)) ||
+                  (onsetfile = new_file_ro("sounds/woodblock.aiff")) ||
+                  (onsetfile = new_file_ro("../sounds/woodblock.aiff"));
+          /* read the output sound once */
+          file_read(onsetfile, overlap_size, woodblock);
+  }
 
   if(!usejack)
@@ -218 +227 @@
   ibuf      = new_fvec(overlap_size, channels);
   obuf      = new_fvec(overlap_size, channels);
-  woodblock = new_fvec(buffer_size,1);
   fftgrain  = new_cvec(buffer_size, channels);
 
@@ -230 +238 @@
   }
   }
-  /* read the output sound once */
-  file_read(onsetfile, overlap_size, woodblock);
   /* phase vocoder */
   pv = new_aubio_pvoc(buffer_size, overlap_size, channels);

ext/sndfileio.c

@@ -45 +45 @@
 
         if (! (f->handle = sf_open (outputname, SFM_READ, &sfinfo))) {
-                AUBIO_ERR("Not able to open input file %s.\n", outputname);
+                AUBIO_ERR("Unable to open input file %s.\n", outputname);
                 AUBIO_ERR("%s\n",sf_strerror (NULL)); /* libsndfile err msg */
-                AUBIO_QUIT(AUBIO_FAIL);
+                return NULL;
         }       
 
         if (sfinfo.channels > MAX_CHANNELS) { 
                 AUBIO_ERR("Not able to process more than %d channels\n", MAX_CHANNELS);
-                AUBIO_QUIT(AUBIO_FAIL);
+                return NULL;
         }