Changeset 0e0a049

Timestamp:

Oct 25, 2009, 9:33:24 PM (15 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:

b616ffe

Parents:

a17e8c9

Message:

examples/: simplify, use fvec_ funcs

Location:

examples

Files:

• aubiomfcc.c (modified) (1 diff)
• aubioonset.c (modified) (1 diff)
• aubiopitch.c (modified) (1 diff)
• aubiotrack.c (modified) (1 diff)

examples/aubiomfcc.c

@@ -71 +71 @@
         outmsg("%f\t",frames*overlap_size/(float)samplerate);
         for (coef_cnt = 0; coef_cnt < n_coefs; coef_cnt++) {
-            outmsg("%f ",mfcc_out->data[0][coef_cnt]);
+            outmsg("%f ", fvec_read_sample (mfcc_out, 0, coef_cnt) );
         }
         outmsg("\n");

examples/aubioonset.c

@@ -41 +41 @@
       aubio_onset_do (o, ibuf, onset);
       if (fvec_read_sample(onset, 0, 0)) {
-        for (pos = 0; pos < overlap_size; pos++){
-          obuf->data[0][pos] = woodblock->data[0][pos];
-        }
+        fvec_copy (woodblock, obuf);
       } else {
-        for (pos = 0; pos < overlap_size; pos++) {
-          obuf->data[0][pos] = 0.;
-        }
+        fvec_zeros (obuf);
       }
       /* end of block loop */

examples/aubiopitch.c

@@ -42 +42 @@
       if (fvec_read_sample(pitch, 0, 0)) {
         for (pos = 0; pos < overlap_size; pos++){
-          obuf->data[0][pos] = woodblock->data[0][pos];
+          // TODO, play sine at this freq
         }
       } else {
-        for (pos = 0; pos < overlap_size; pos++) {
-          obuf->data[0][pos] = 0.;
-        }
+        fvec_zeros (obuf);
       }
       /* end of block loop */

examples/aubiotrack.c

@@ -42 +42 @@
       /* block loop */
       aubio_tempo_do (bt,ibuf,tempo_out);
-      if (tempo_out->data[0][0]>0) 
-        istactus = tempo_out->data[0][0];
-      else 
-        istactus = 0;
-      if (tempo_out->data[0][1]>0) 
-        isonset = tempo_out->data[0][0];
-      else 
-        isonset = 0;
-      if (istactus) {
-              for (pos = 0; pos < overlap_size; pos++)
-                      obuf->data[0][pos] = woodblock->data[0][pos];
+      istactus = fvec_read_sample (tempo_out, 0, 0);
+      isonset = fvec_read_sample (tempo_out, 0, 1);
+      if (istactus > 0.) {
+        fvec_copy (woodblock, obuf);
       } else {
-              for (pos = 0; pos < overlap_size; pos++)
-                      obuf->data[0][pos] = 0.;
+        fvec_zeros (obuf);
       }
       /* end of block loop */