Changeset 3ec9d9c

Timestamp:

Aug 23, 2005, 12:53:38 AM (19 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:

4cc9fe5

Parents:

79c2e52

Message:

wrapper functions to add pitchm_bin output

File:

• src/pitchdetection.c (modified) (4 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);
+typedef smpl_t (*aubio_pitchdetection_conv_t)(smpl_t value,uint_t srate,uint_t bufsize);
 void aubio_pitchdetection_slideblock(aubio_pitchdetection_t *p, fvec_t *ibuf);
 
@@ -57 +52 @@
 };
 
+/* convenience wrapper function for frequency unit conversions 
+ * should probably be rewritten with #defines */
+smpl_t freqconvbin(smpl_t f,uint_t srate,uint_t bufsize);
+smpl_t freqconvbin(smpl_t f,uint_t srate,uint_t bufsize){
+        return aubio_freqtobin(f,srate,bufsize);
+}
+
+smpl_t freqconvmidi(smpl_t f,uint_t srate,uint_t bufsize);
+smpl_t freqconvmidi(smpl_t f,uint_t srate,uint_t bufsize){
+        return aubio_freqtomidi(f);
+}
+
+smpl_t freqconvpass(smpl_t f,uint_t srate,uint_t bufsize);
+smpl_t freqconvpass(smpl_t f,uint_t srate,uint_t bufsize){
+        return f;
+}
+
 aubio_pitchdetection_t * new_aubio_pitchdetection(uint_t bufsize, 
                 uint_t hopsize, 
@@ -99 +111 @@
                         break;
                 case aubio_pitchm_midi:
-                        p->freqconv = aubio_freqtomidi;
+                        p->freqconv = freqconvmidi;
                         break;
                 case aubio_pitchm_cent:
                         /** bug: not implemented */
-                        p->freqconv = freqconvpass;
+                        p->freqconv = freqconvmidi;
                         break;
                 case aubio_pitchm_bin:
-                        /** bug: not implemented */
-                        p->freqconv = freqconvpass;
+                        p->freqconv = freqconvbin;
                         break;
                 default:
@@ -158 +169 @@
 
 smpl_t aubio_pitchdetection(aubio_pitchdetection_t *p, fvec_t * ibuf) {
-        return p->freqconv(p->callback(p,ibuf));
+        return p->freqconv(p->callback(p,ibuf),p->srate,p->bufsize);
 }