Changeset a559796

Timestamp:

Feb 23, 2014, 3:14:47 AM (10 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:

af97786

Parents:

9f68f11

Message:

src/tempo/tempo.c: novelty function default to specflux

Files:

• examples/utils.c (modified) (1 diff)
• src/tempo/tempo.c (modified) (2 diffs)

examples/utils.c

@@ -49 +49 @@
 smpl_t pitch_tolerance = 0.0; // will be set if != 0.
 // tempo stuff
-char_t * tempo_method = "specflux";
+char_t * tempo_method = "default";
 // more general stuff
 smpl_t silence_threshold = -90.;

src/tempo/tempo.c

@@ -158 +158 @@
 
 /* Allocate memory for an tempo detection */
-aubio_tempo_t * new_aubio_tempo (char_t * onset_mode, 
+aubio_tempo_t * new_aubio_tempo (char_t * tempo_mode,
     uint_t buf_size, uint_t hop_size, uint_t samplerate)
 {
   aubio_tempo_t * o = AUBIO_NEW(aubio_tempo_t);
+  char_t specdesc_func[20];
   o->samplerate = samplerate;
   /* length of observations, worth about 6 seconds */
@@ -179 +180 @@
   o->pp       = new_aubio_peakpicker();
   aubio_peakpicker_set_threshold (o->pp, o->threshold);
-  o->od       = new_aubio_specdesc(onset_mode,buf_size);
+  if ( strcmp(tempo_mode, "default") == 0 ) {
+    strcpy(specdesc_func, "specflux");
+  } else {
+    strcpy(specdesc_func, tempo_mode);
+  }
+  o->od       = new_aubio_specdesc(specdesc_func,buf_size);
   o->of       = new_fvec(1);
   o->bt       = new_aubio_beattracking(o->winlen, o->hop_size, o->samplerate);