Changeset 33cd81f for src

Timestamp:

Mar 3, 2013, 4:50:04 AM (12 years ago)

Author:

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

a64ef1d

Parents:

9e56228

Message:

src/musicutils.h: add fvec_set_window

Location:

src

Files:

• mathutils.c (modified) (3 diffs)
• musicutils.h (modified) (1 diff)

src/mathutils.c

@@ -44 +44 @@
 
 fvec_t *
-new_aubio_window (char_t * window_type, uint_t size)
-{
-  fvec_t * win = new_fvec (size);
+new_aubio_window (char_t * window_type, uint_t length)
+{
+  fvec_t * win = new_fvec (length);
+  fvec_set_window (win, window_type);
+  return win;
+}
+
+uint_t fvec_set_window (fvec_t *win, char_t *window_type) {
   smpl_t * w = win->data;
-  uint_t i;
+  uint_t i, size = win->length;
   aubio_window_type wintype;
-  if (strcmp (window_type, "rectangle") == 0)
+  if (window_type == NULL) {
+      AUBIO_ERR ("window type can not be null.\n");
+      return 1;
+  } else if (strcmp (window_type, "rectangle") == 0)
       wintype = aubio_win_rectangle;
   else if (strcmp (window_type, "hamming") == 0)
@@ -71 +79 @@
       wintype = aubio_win_default;
   else {
-      AUBIO_ERR ("unknown window type %s, using default.\n", window_type);
-      wintype = aubio_win_default;
+      AUBIO_ERR ("unknown window type `%s`.\n", window_type);
+      return 1;
   }
   switch(wintype) {
@@ -127 +135 @@
       break;
   }
-  return win;
+  return 0;
 }
 

src/musicutils.h

@@ -45 +45 @@
 */
 fvec_t *new_aubio_window (char_t * window_type, uint_t size);
+
+/** set elements of a vector to window coefficients
+
+ */
+uint_t fvec_set_window (fvec_t * window, char_t * window_type);
 
 /** compute the principal argument