Changeset c1656cf for examples

Timestamp:

Oct 25, 2007, 4:02:06 AM (16 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:

7873363

Parents:

14aebce (diff), 97525e4 (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 from main branch

Location:

examples/tests

Files:

• test-beattracking.c (modified) (2 diffs)
• test-tempo.c (modified) (2 diffs)

examples/tests/test-beattracking.c

@@ -13 +13 @@
         uint_t i = 0;
 
-        smpl_t curtempo;
+        smpl_t curtempo, curtempoconf;
 
         while (i < 10) {
@@ -19 +19 @@
           curtempo = aubio_beattracking_get_bpm(tempo);
           if (curtempo != 0.) {
+            fprintf(stdout,"%f\n",curtempo);
+            return 1;
+          }
+          curtempoconf = aubio_beattracking_get_confidence(tempo);
+          if (curtempoconf != 0.) {
             fprintf(stdout,"%f\n",curtempo);
             return 1;

examples/tests/test-tempo.c

@@ -10 +10 @@
         uint_t i = 0;
 
-        smpl_t curtempo;
+        smpl_t curtempo, curtempoconf;
 
         while (i < 1000) {
@@ -17 +17 @@
           if (curtempo != 0.) {
             fprintf(stdout,"%f\n",curtempo);
+            return 1;
+          }
+          curtempoconf = aubio_beattracking_get_confidence(o);
+          if (curtempoconf != 0.) {
+            fprintf(stdout,"%f\n",curtempo);
+            return 1;
           }
           i++;