Changeset 5cf415f for src

Timestamp:

Aug 9, 2005, 8:35:14 PM (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:

b1f723d

Parents:

a29ad46

Message:

protected onset enumerators, factorise python check_modes

Location:

src

Files:

• onsetdetection.c (modified) (8 diffs)
• onsetdetection.h (modified) (1 diff)

src/onsetdetection.c

@@ -208 +208 @@
         switch(type) {
                 /* for both energy and hfc, only fftgrain->norm is required */
-                case energy: 
-                        break;
-                case hfc:
+                case aubio_onset_energy: 
+                        break;
+                case aubio_onset_hfc:
                         break;
                 /* the other approaches will need some more memory spaces */
-                case complexdomain:
+                case aubio_onset_complex:
                         o->oldmag = new_fvec(rsize,channels);
                         /** bug: must be complex array */
@@ -221 +221 @@
                         o->theta2 = new_fvec(rsize,channels);
                         break;
-                case phase:
+                case aubio_onset_phase:
                         o->dev1  = new_fvec(rsize,channels);
                         o->theta1 = new_fvec(rsize,channels);
@@ -228 +228 @@
                         o->threshold = 0.1;
                         break;
-                case specdiff:
+                case aubio_onset_specdiff:
                         o->oldmag = new_fvec(rsize,channels);
                         o->dev1   = new_fvec(rsize,channels);
@@ -234 +234 @@
                         o->threshold = 0.1;
                         break;
-                case kl:
+                case aubio_onset_kl:
                         o->oldmag = new_fvec(rsize,channels);
                         break;
-                case mkl:
+                case aubio_onset_mkl:
                         o->oldmag = new_fvec(rsize,channels);
                         break;
@@ -249 +249 @@
 
         switch(type) {
-                case energy:
+                case aubio_onset_energy:
                         o->funcpointer = aubio_onsetdetection_energy;
                         break;
-                case hfc:
+                case aubio_onset_hfc:
                         o->funcpointer = aubio_onsetdetection_hfc;
                         break;
-                case complexdomain:
+                case aubio_onset_complex:
                         o->funcpointer = aubio_onsetdetection_complex;
                         break;
-                case phase:
+                case aubio_onset_phase:
                         o->funcpointer = aubio_onsetdetection_phase;
                         break;
-                case specdiff:
+                case aubio_onset_specdiff:
                         o->funcpointer = aubio_onsetdetection_specdiff;
                         break;
-                case kl:
+                case aubio_onset_kl:
                         o->funcpointer = aubio_onsetdetection_kl;
                         break;
-                case mkl:
+                case aubio_onset_mkl:
                         o->funcpointer = aubio_onsetdetection_mkl;
                         break;
@@ -281 +281 @@
         switch(o->type) {
                 /* for both energy and hfc, only fftgrain->norm is required */
-                case energy: 
-                        break;
-                case hfc:
+                case aubio_onset_energy: 
+                        break;
+                case aubio_onset_hfc:
                         break;
                 /* the other approaches will need some more memory spaces */
-                case complexdomain:
+                case aubio_onset_complex:
                         AUBIO_FREE(o->meas);
                         del_fvec(o->oldmag);
@@ -293 +293 @@
                         del_fvec(o->theta2);
                         break;
-                case phase:
+                case aubio_onset_phase:
                         del_fvec(o->dev1);
                         del_fvec(o->theta1);
@@ -299 +299 @@
                         del_aubio_hist(o->histog);
                         break;
-                case specdiff:
+                case aubio_onset_specdiff:
                         del_fvec(o->oldmag);
                         del_fvec(o->dev1);

src/onsetdetection.h

@@ -50 +50 @@
 /** onsetdetection types */
 typedef enum {
-        energy,         /**< energy based */          
-        specdiff,       /**< spectral diff */         
-        hfc,            /**< high frequency content */
-        complexdomain,  /**< complex domain */        
-        phase,          /**< phase fast */            
-        kl,             /**< Kullback Liebler (Hainsworth et al.,  Onset detection in musical audio signals) */
-        mkl             /**< modified Kullback Liebler (Hainsworth et al.,  Onset detection in musical audio signals) */
+        aubio_onset_energy,         /**< energy based */          
+        aubio_onset_specdiff,       /**< spectral diff */         
+        aubio_onset_hfc,            /**< high frequency content */
+        aubio_onset_complex,        /**< complex domain */        
+        aubio_onset_phase,          /**< phase fast */            
+        aubio_onset_kl,             /**< Kullback Liebler (Hainsworth et al.,  Onset detection in musical audio signals) */
+        aubio_onset_mkl             /**< modified Kullback Liebler (Hainsworth et al.,  Onset detection in musical audio signals) */
 } aubio_onsetdetection_type;