src/mathutils.c: use a string for window type, making enum private

diff --git a/src/mathutils.c b/src/mathutils.c
index 4efcaedbb6fcc3d37b3ec631f5b69d3524315793..3178df0b4c1590f3ee611541e4d84c183d6578be 100644 (file)
--- a/src/mathutils.c
+++ b/src/mathutils.c
@@ -25,13 +25,55 @@
 #include "mathutils.h"
 #include "config.h"
 
+
+/** Window types */
+typedef enum
+{
+  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_win_default = aubio_win_hanningz,
+} aubio_window_type;
+
 fvec_t *
-new_aubio_window (uint_t size, aubio_window_type wintype)
+new_aubio_window (char_t * window_type, uint_t size)
 {
   // create fvec of size x 1 channel
   fvec_t * win = new_fvec( size, 1);
   smpl_t * w = win->data[0];
   uint_t i;
+  aubio_window_type wintype;
+  if (strcmp (window_type, "rectangle") == 0)
+      wintype = aubio_win_rectangle;
+  else if (strcmp (window_type, "hamming") == 0)
+      wintype = aubio_win_hamming;
+  else if (strcmp (window_type, "hanning") == 0)
+      wintype = aubio_win_hanning;
+  else if (strcmp (window_type, "hanningz") == 0)
+      wintype = aubio_win_hanningz;
+  else if (strcmp (window_type, "blackman") == 0)
+      wintype = aubio_win_blackman;
+  else if (strcmp (window_type, "blackman_harris") == 0)
+      wintype = aubio_win_blackman_harris;
+  else if (strcmp (window_type, "gaussian") == 0)
+      wintype = aubio_win_gaussian;
+  else if (strcmp (window_type, "welch") == 0)
+      wintype = aubio_win_welch;
+  else if (strcmp (window_type, "parzen") == 0)
+      wintype = aubio_win_parzen;
+  else if (strcmp (window_type, "default") == 0)
+      wintype = aubio_win_default;
+  else {
+      AUBIO_ERR ("unknown window type %s, using default.\n", window_type);
+      wintype = aubio_win_default;
+      return NULL;
+  }
   switch(wintype) {
     case aubio_win_rectangle:
       for (i=0;i<size;i++)

diff --git a/src/mathutils.h b/src/mathutils.h
index de970493e2191c5591ca136a4a812233773a863c..be1b465f528b4ccf5af869f4fe1b2d725cb7e91d 100644 (file)
--- a/src/mathutils.h
+++ b/src/mathutils.h
@@ -29,7 +29,7 @@
 extern "C" {
 #endif
 
-/** Window types 
+/** create window 
  
   References:
     
@@ -43,21 +43,7 @@ Uni- versity of Verona, Italy, 2000.
   ps.gz</a>)
 
 */
-typedef enum
-{
-  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;
-
-/** create window */
-fvec_t *new_aubio_window (uint_t size, aubio_window_type wintype);
+fvec_t *new_aubio_window (char_t * window_type, uint_t size);
 
 /** compute the principal argument
 

diff --git a/src/pitch/pitchfcomb.c b/src/pitch/pitchfcomb.c
index 49733ddb8cd3d4db84252a4e4e51617b1dcbcd21..68fa89adc5d1717349070a40c259ac85324db3c1 100644 (file)
--- a/src/pitch/pitchfcomb.c
+++ b/src/pitch/pitchfcomb.c
@@ -51,7 +51,7 @@ aubio_pitchfcomb_t * new_aubio_pitchfcomb (uint_t bufsize, uint_t hopsize, uint_
   p->fftOut       = new_cvec(bufsize,1);
   p->fftLastPhase = new_fvec(bufsize, channels);
   p->fft = new_aubio_fft(bufsize, 1);
-  p->win = new_aubio_window(bufsize, aubio_win_hanning);
+  p->win = new_aubio_window("hanning", bufsize);
   return p;
 }
 

diff --git a/src/pitch/pitchyinfft.c b/src/pitch/pitchyinfft.c
index 04209871df1984b4e66d18b95f8157f258f82605..a4ab40658c7bd4e90bc96cde71081c20fa64b0cd 100644 (file)
--- a/src/pitch/pitchyinfft.c
+++ b/src/pitch/pitchyinfft.c
@@ -56,7 +56,7 @@ aubio_pitchyinfft_t * new_aubio_pitchyinfft (uint_t bufsize)
   p->res    = new_cvec(bufsize,1);
   p->yinfft = new_fvec(bufsize/2+1,1);
   p->tol    = 0.85;
-  p->win    = new_aubio_window(bufsize, aubio_win_hanningz);
+  p->win    = new_aubio_window("hanningz", bufsize);
   p->weight      = new_fvec(bufsize/2+1,1);
   {
     uint_t i = 0, j = 1;

diff --git a/src/spectral/phasevoc.c b/src/spectral/phasevoc.c
index 7c5b9c54b9551144ee8167ed0711a6149f8bbfa1..4373e6e4cb7b2f0d5bef54a45b3afd6cbaa340c0 100644 (file)
--- a/src/spectral/phasevoc.c
+++ b/src/spectral/phasevoc.c
@@ -95,7 +95,7 @@ aubio_pvoc_t * new_aubio_pvoc (uint_t win_s, uint_t hop_s, uint_t channels) {
   /* new input output */
   pv->dataold  = new_fvec  (win_s-hop_s, channels);
   pv->synthold = new_fvec (win_s-hop_s, channels);
-  pv->w        = new_aubio_window (win_s, aubio_win_hanningz);
+  pv->w        = new_aubio_window ("hanningz", win_s);
 
   pv->channels = channels;
   pv->hop_s    = hop_s;

diff --git a/tests/src/test-hist.c b/tests/src/test-hist.c
index 562e98d8d488864be3a183fe7bd82f189ab9c6b0..5df3c2a8e3e0f1fc547ef5690dc6f87513f94fcf 100644 (file)
--- a/tests/src/test-hist.c
+++ b/tests/src/test-hist.c
@@ -6,7 +6,7 @@ int main( )
   uint_t length;
   for (length = 1; length < 10; length ++ ) {
     aubio_hist_t *o = new_aubio_hist(0, 1, length, 5);
-    fvec_t *t = new_aubio_window(length,aubio_win_hanning);
+    fvec_t *t = new_aubio_window("hanning", length);
     aubio_hist_do(o,t);
     fvec_print(t);
     aubio_hist_do_notnull(o,t);
@@ -14,7 +14,7 @@ int main( )
     aubio_hist_dyn_notnull(o,t);
     fvec_print(t);
     del_fvec(t);
-    t = new_aubio_window(length,aubio_win_hanningz);
+    t = new_aubio_window("hanningz", length);
     aubio_hist_do(o,t);
     fvec_print(t);
     aubio_hist_do_notnull(o,t);

diff --git a/tests/src/test-window.c b/tests/src/test-window.c
index 23df3c2a46800d14301fbcdb253ad3d30f617571..a7d087cf0072e273995dbbd0bd441cadc5d13632 100644 (file)
--- a/tests/src/test-window.c
+++ b/tests/src/test-window.c
@@ -6,30 +6,33 @@ int main( )
   uint_t length;
   for (length = 2; length <= 5; length++)
   {
-    fvec_t *t = new_aubio_window(length,aubio_win_rectangle);
+    fvec_t *t = new_aubio_window("rectangle", length);
     del_fvec(t);
-    t = new_aubio_window(length,aubio_win_hamming);
+    t = new_aubio_window("hamming", length);
     fvec_print(t);
     del_fvec(t);
-    t = new_aubio_window(length,aubio_win_hanning);
+    t = new_aubio_window("hanning", length);
     fvec_print(t);
     del_fvec(t);
-    t = new_aubio_window(length,aubio_win_hanningz);
+    t = new_aubio_window("hanningz", length);
     fvec_print(t);
     del_fvec(t);
-    t = new_aubio_window(length,aubio_win_blackman);
+    t = new_aubio_window("blackman", length);
     fvec_print(t);
     del_fvec(t);
-    t = new_aubio_window(length,aubio_win_blackman_harris);
+    t = new_aubio_window("blackman_harris", length);
     fvec_print(t);
     del_fvec(t);
-    t = new_aubio_window(length,aubio_win_gaussian);
+    t = new_aubio_window("gaussian", length);
     fvec_print(t);
     del_fvec(t);
-    t = new_aubio_window(length,aubio_win_welch);
+    t = new_aubio_window("welch", length);
     fvec_print(t);
     del_fvec(t);
-    t = new_aubio_window(length,aubio_win_parzen);
+    t = new_aubio_window("parzen", length);
+    fvec_print(t);
+    del_fvec(t);
+    t = new_aubio_window("default", length);
     fvec_print(t);
     del_fvec(t);
   }