Changeset fe163ad for examples

Timestamp:

Oct 15, 2009, 6:54:23 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:

515c7b2

Parents:

cd77c15

Message:

src/pitch: use a string to set pitch method, add a new function to set pitch unit, keep pitch enums private, update pitch methods where they are used

Location:

examples

Files:

• aubionotes.c (modified) (1 diff)
• aubioonset.c (modified) (1 diff)
• utils.c (modified) (5 diffs)
• utils.h (modified) (1 diff)

examples/aubionotes.c

@@ -40 +40 @@
       aubio_pvoc_do (pv,ibuf, fftgrain);
       aubio_onsetdetection_do(o,fftgrain, onset);
-      if (usedoubled) {
-        aubio_onsetdetection_do(o2,fftgrain, onset2);
-        onset->data[0][0] *= onset2->data[0][0];
-      }
       isonset = aubio_peakpicker_do(parms, onset);
       

examples/aubioonset.c

@@ -40 +40 @@
       aubio_pvoc_do (pv,ibuf, fftgrain);
       aubio_onsetdetection_do (o,fftgrain, onset);
-      if (usedoubled) {
-        aubio_onsetdetection_do (o2,fftgrain, onset2);
-        onset->data[0][0] *= onset2->data[0][0];
-      }
       isonset = aubio_peakpicker_do(parms, onset);
       if (isonset) {

examples/utils.c

@@ -65 +65 @@
 fvec_t *woodblock;
 aubio_onsetdetection_t *o;
-aubio_onsetdetection_t *o2;
 fvec_t *onset;
 fvec_t *onset2;
@@ -75 +74 @@
 smpl_t pitch = 0.;
 aubio_pitchdetection_t *pitchdet;
-aubio_pitchdetection_type type_pitch = aubio_pitch_yinfft;      // aubio_pitch_mcomb
-aubio_pitchdetection_mode mode_pitch = aubio_pitchm_freq;
+char_t * pitch_unit = "default";
+char_t * pitch_mode = "default";
 uint_t median = 6;
 
@@ -177 +176 @@
         break;
       case 'p':
-        if (strcmp (optarg, "mcomb") == 0)
-          type_pitch = aubio_pitch_mcomb;
-        else if (strcmp (optarg, "yinfft") == 0)
-          type_pitch = aubio_pitch_yin;
-        else if (strcmp (optarg, "yin") == 0)
-          type_pitch = aubio_pitch_yin;
-        else if (strcmp (optarg, "schmitt") == 0)
-          type_pitch = aubio_pitch_schmitt;
-        else if (strcmp (optarg, "fcomb") == 0)
-          type_pitch = aubio_pitch_fcomb;
-        else {
-          errmsg ("unknown pitch type.\n");
-          abort ();
-        }
+        pitch_mode = optarg;
         break;
       case 'a':
@@ -294 +280 @@
 
   if (usepitch) {
-    pitchdet = new_aubio_pitchdetection (buffer_size * 4,
-        overlap_size, channels, samplerate, type_pitch, mode_pitch);
+    pitchdet = new_aubio_pitchdetection (pitch_mode, buffer_size * 4,
+        overlap_size, channels, samplerate);
     aubio_pitchdetection_set_tolerance (pitchdet, 0.7);
     pitch_obuf = new_fvec (1, channels);
@@ -325 +311 @@
     }
     del_fvec (pitch_obuf);
-  }
-  if (usedoubled) {
-    del_aubio_onsetdetection (o2);
-    del_fvec (onset2);
   }
   del_aubio_onsetdetection (o);

examples/utils.h

@@ -108 +108 @@
 extern smpl_t pitch;
 extern aubio_pitchdetection_t *pitchdet;
-extern aubio_pitchdetection_type mode;
 extern uint_t median;