Changeset b4b0324

Timestamp:

Aug 9, 2005, 10:58:47 AM (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:

32669d9

Parents:

876c5e7

Message:

protect window types with aubio_win_

Files:

• examples/tests/test-fft.c (modified) (1 diff)
• src/mathutils.c (modified) (3 diffs)
• src/mathutils.h (modified) (1 diff)
• src/phasevoc.c (modified) (1 diff)
• swig/aubio.i (modified) (1 diff)

examples/tests/test-fft.c

@@ -20 +20 @@
                 spec[i] = AUBIO_ARRAY(fft_data_t,win_s);
         /* initialize the window (see mathutils.c) */
-        window(w,win_s,hanningz);
+        window(w,win_s,aubio_win_hanningz);
   
         /* fill input with some data */

src/mathutils.c

@@ -24 +24 @@
 #include "mathutils.h"
 
-void window(smpl_t *w, uint_t size, window_type_t wintype) {
+void window(smpl_t *w, uint_t size, aubio_window_type_t wintype) {
   uint_t i;
   switch(wintype) {
-    case rectangle:
+    case aubio_win_rectangle:
       for (i=0;i<size;i++)
         w[i] = 0.5; 
       break;
-    case hamming:
+    case aubio_win_hamming:
       for (i=0;i<size;i++)
         w[i] = 0.54 - 0.46 * COS(TWO_PI * i / (size));
       break;
-    case hanning:
+    case aubio_win_hanning:
       for (i=0;i<size;i++)
         w[i] = 0.5 - (0.5 * COS(TWO_PI * i / (size)));
       break;
-    case hanningz:
+    case aubio_win_hanningz:
       for (i=0;i<size;i++)
         w[i] = 0.5 * (1.0 - COS(TWO_PI * i / (size)));
       break;
-    case blackman:
+    case aubio_win_blackman:
       for (i=0;i<size;i++)
         w[i] = 0.42
@@ -49 +49 @@
           +     0.08 * COS(2.0*TWO_PI*i/(size-1.0));
       break;
-    case blackman_harris:
+    case aubio_win_blackman_harris:
       for (i=0;i<size;i++)
         w[i] = 0.35875 
@@ -56 +56 @@
           - 0.01168 * COS(3.0*TWO_PI*i/(size-1.0));
       break;
-    case gaussian:
+    case aubio_win_gaussian:
       for (i=0;i<size;i++)
         w[i] = EXP(- 1.0 / SQR(size) * SQR(2.0*i-size));
       break;
-    case welch:
+    case aubio_win_welch:
       for (i=0;i<size;i++)
         w[i] = 1.0 - SQR((2*i-size)/(size+1.0));
       break;
-    case parzen:
+    case aubio_win_parzen:
       for (i=0;i<size;i++)
         w[i] = 1.0 - fabsf((2*i-size)/(size+1.0));

src/mathutils.h

@@ -95 +95 @@
 
 typedef enum {
-        rectangle,          
-        hamming,
-        hanning,
-        hanningz,
-        blackman,
-        blackman_harris,
-        gaussian,
-        welch,
-        parzen
-} window_type_t;
+        aubio_win_rectangle,          
+        aubio_win_hamming,
+        aubio_win_hanning,
+        aubio_win_hanningz,
+        aubio_win_blackman,
+        aubio_win_blackman_harris,
+        aubio_win_gaussian,
+        aubio_win_welch,
+        aubio_win_parzen
+} aubio_window_type_t;
 
 /** create window */
-void window(smpl_t *w, uint_t size, window_type_t wintype);
+void window(smpl_t *w, uint_t size, aubio_window_type_t wintype);
 
 /** principal argument

src/phasevoc.c

@@ -114 +114 @@
         pv->synthold = new_fvec (win_s-hop_s, channels);
         pv->w        = AUBIO_ARRAY(smpl_t,win_s);
-        window(pv->w,win_s,hanningz);
+        window(pv->w,win_s,aubio_win_hanningz);
 
         pv->channels = channels;

swig/aubio.i

@@ -89 +89 @@
 /* mathutils */
 typedef enum {
-        rectangle,
-        hamming,
-        hanning,
-        hanningz,
-        blackman,
-        blackman_harris,
-        gaussian,
-        welch,
-        parzen
-} window_type_t;
-
-void window(smpl_t *w, uint_t size, window_type_t wintype);
+        aubio_win_rectangle,
+        aubio_win_hamming,
+        aubio_win_hanning,
+        aubio_win_hanningz,
+        aubio_win_blackman,
+        aubio_win_blackman_harris,
+        aubio_win_gaussian,
+        aubio_win_welch,
+        aubio_win_parzen
+} aubio_window_type_t;
+
+void window(smpl_t *w, uint_t size, aubio_window_type_t wintype);
 smpl_t unwrap2pi (smpl_t phase);
 smpl_t vec_mean(fvec_t *s);