Changeset aa17581 for src

Timestamp:

Aug 22, 2005, 9:52:17 PM (20 years ago)

Author:

Paul Brossier <piem@altern.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:

c29dae2

Parents:

f97445c

Message:

added midi and hertz output modes

File:

• src/pitchdetection.c (modified) (5 diffs)

src/pitchdetection.c

@@ -28 +28 @@
 #include "pitchdetection.h"
 
+smpl_t freqconvpass(smpl_t f);
+smpl_t freqconvpass(smpl_t f){
+        return f;
+}
+
 typedef smpl_t (*aubio_pitchdetection_func_t)(aubio_pitchdetection_t *p, 
                 fvec_t * ibuf);
+typedef smpl_t (*aubio_pitchdetection_conv_t)(smpl_t value);
 void aubio_pitchdetection_slideblock(aubio_pitchdetection_t *p, fvec_t *ibuf);
 
@@ -48 +54 @@
         fvec_t * yin;
         aubio_pitchdetection_func_t callback;
+        aubio_pitchdetection_conv_t freqconv;
 };
 
@@ -60 +67 @@
         p->srate = samplerate;
         p->type = type;
+        p->mode = mode;
         p->bufsize = bufsize;
         switch(p->type) {
@@ -86 +94 @@
                         break;
         }
+        switch(p->mode) {
+                case aubio_pitchm_freq:
+                        p->freqconv = freqconvpass;
+                        break;
+                case aubio_pitchm_midi:
+                        p->freqconv = aubio_freqtomidi;
+                        break;
+                case aubio_pitchm_cent:
+                        /** bug: not implemented */
+                        p->freqconv = freqconvpass;
+                        break;
+                case aubio_pitchm_bin:
+                        /** bug: not implemented */
+                        p->freqconv = freqconvpass;
+                        break;
+                default:
+                        break;
+        }
         return p;
 }
@@ -132 +158 @@
 
 smpl_t aubio_pitchdetection(aubio_pitchdetection_t *p, fvec_t * ibuf) {
-        return p->callback(p,ibuf);
+        return p->freqconv(p->callback(p,ibuf));
 }