Changeset 21234ee for examples/aubioonset.c

Timestamp:

Dec 18, 2013, 8:07:27 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:

6465d7f

Parents:

1573b16 (diff), c3c6305 (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' of aubio.org:/git/aubio/aubio into develop

File:

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

examples/aubioonset.c

@@ -29 +29 @@
 fvec_t *onset;
 smpl_t is_onset;
-uint_t is_silence = 0.;
 
 void
@@ -35 +34 @@
   fvec_zeros(obuf);
   aubio_onset_do (o, ibuf, onset);
-  if (silence_threshold != -90.)
-    is_silence = aubio_silence_detection(ibuf, silence_threshold);
-  is_onset = fvec_read_sample(onset, 0);
-  if ( is_onset && !is_silence ) {
+  is_onset = fvec_get_sample(onset, 0);
+  if ( is_onset ) {
     aubio_wavetable_play ( wavetable );
   } else {
@@ -52 +49 @@
 process_print (void)
 {
-  if ( is_onset && !is_silence ) {
+  if ( is_onset ) {
     outmsg ("%f\n", aubio_onset_get_last_s (o) );
   }
@@ -64 +61 @@
   verbmsg ("buffer_size: %d, ", buffer_size);
   verbmsg ("hop_size: %d, ", hop_size);
-  verbmsg ("threshold: %f, ", silence_threshold);
+  verbmsg ("silence: %f, ", silence_threshold);
   verbmsg ("threshold: %f\n", onset_threshold);
 
   o = new_aubio_onset (onset_method, buffer_size, hop_size, samplerate);
-  if (onset_threshold != 0.) aubio_onset_set_threshold (o, onset_threshold);
+  if (onset_threshold != 0.)
+    aubio_onset_set_threshold (o, onset_threshold);
+  if (silence_threshold != -90.)
+    aubio_onset_set_silence (o, silence_threshold);
+
   onset = new_fvec (1);