Changeset b201912 for examples/aubioonset.c

Timestamp:

Apr 11, 2017, 1:49:44 AM (7 years ago)

Author:

Paul Brossier <piem@piem.org>

Branches:

sampler

Children:

04d0c89

Parents:

fbafd2c (diff), b762f8d (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' into sampler

Fixed conflicts:

python/lib/gen_external.py
src/io/source_avcodec.c

File:

• examples/aubioonset.c (modified) (3 diffs)

examples/aubioonset.c

@@ -44 +44 @@
     aubio_wavetable_stop ( wavetable );
   }
-  if (mix_input)
+  if (mix_input) {
     aubio_wavetable_do (wavetable, ibuf, obuf);
-  else
+  } else {
     aubio_wavetable_do (wavetable, obuf, obuf);
+  }
 }
 
@@ -62 +63 @@
   examples_common_init(argc,argv);
 
-  verbmsg ("using source: %s at %dHz\n", source_uri, samplerate);
-  verbmsg ("onset method: %s, ", onset_method);
-  verbmsg ("buffer_size: %d, ", buffer_size);
-  verbmsg ("hop_size: %d, ", hop_size);
-  verbmsg ("silence: %f, ", silence_threshold);
-  verbmsg ("threshold: %f\n", onset_threshold);
-
   o = new_aubio_onset (onset_method, buffer_size, hop_size, samplerate);
   if (o == NULL) { ret = 1; goto beach; }
@@ -77 +71 @@
   if (onset_minioi != 0.)
     aubio_onset_set_minioi_s (o, onset_minioi);
+
+  verbmsg ("using source: %s at %dHz\n", source_uri, samplerate);
+  verbmsg ("onset method: %s, ", onset_method);
+  verbmsg ("buffer_size: %d, ", buffer_size);
+  verbmsg ("hop_size: %d, ", hop_size);
+  verbmsg ("silence: %f, ", aubio_onset_get_silence(o));
+  verbmsg ("threshold: %f, ", aubio_onset_get_threshold(o));
+  verbmsg ("awhitening: %f, ", aubio_onset_get_awhitening(o));
+  verbmsg ("compression: %f\n", aubio_onset_get_compression(o));
 
   onset = new_fvec (1);