Changeset 407bba9


Ignore:
Timestamp:
Oct 17, 2009, 2:38:47 PM (11 years ago)
Author:
Paul Brossier <piem@piem.org>
Branches:
feature/autosink, feature/constantq, feature/pitchshift, feature/pydocstrings, feature/timestretch, master, pitchshift, sampler, timestretch, yinfft+
Children:
74516f7
Parents:
858cfa7
Message:

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

Files:
7 edited

Legend:

Unmodified
Added
Removed
  • src/mathutils.c

    r858cfa7 r407bba9  
    2626#include "config.h"
    2727
     28
     29/** Window types */
     30typedef enum
     31{
     32  aubio_win_rectangle,
     33  aubio_win_hamming,
     34  aubio_win_hanning,
     35  aubio_win_hanningz,
     36  aubio_win_blackman,
     37  aubio_win_blackman_harris,
     38  aubio_win_gaussian,
     39  aubio_win_welch,
     40  aubio_win_parzen,
     41  aubio_win_default = aubio_win_hanningz,
     42} aubio_window_type;
     43
    2844fvec_t *
    29 new_aubio_window (uint_t size, aubio_window_type wintype)
     45new_aubio_window (char_t * window_type, uint_t size)
    3046{
    3147  // create fvec of size x 1 channel
     
    3349  smpl_t * w = win->data[0];
    3450  uint_t i;
     51  aubio_window_type wintype;
     52  if (strcmp (window_type, "rectangle") == 0)
     53      wintype = aubio_win_rectangle;
     54  else if (strcmp (window_type, "hamming") == 0)
     55      wintype = aubio_win_hamming;
     56  else if (strcmp (window_type, "hanning") == 0)
     57      wintype = aubio_win_hanning;
     58  else if (strcmp (window_type, "hanningz") == 0)
     59      wintype = aubio_win_hanningz;
     60  else if (strcmp (window_type, "blackman") == 0)
     61      wintype = aubio_win_blackman;
     62  else if (strcmp (window_type, "blackman_harris") == 0)
     63      wintype = aubio_win_blackman_harris;
     64  else if (strcmp (window_type, "gaussian") == 0)
     65      wintype = aubio_win_gaussian;
     66  else if (strcmp (window_type, "welch") == 0)
     67      wintype = aubio_win_welch;
     68  else if (strcmp (window_type, "parzen") == 0)
     69      wintype = aubio_win_parzen;
     70  else if (strcmp (window_type, "default") == 0)
     71      wintype = aubio_win_default;
     72  else {
     73      AUBIO_ERR ("unknown window type %s, using default.\n", window_type);
     74      wintype = aubio_win_default;
     75      return NULL;
     76  }
    3577  switch(wintype) {
    3678    case aubio_win_rectangle:
  • src/mathutils.h

    r858cfa7 r407bba9  
    3030#endif
    3131
    32 /** Window types
     32/** create window
    3333 
    3434  References:
     
    4444
    4545*/
    46 typedef enum
    47 {
    48   aubio_win_rectangle,
    49   aubio_win_hamming,
    50   aubio_win_hanning,
    51   aubio_win_hanningz,
    52   aubio_win_blackman,
    53   aubio_win_blackman_harris,
    54   aubio_win_gaussian,
    55   aubio_win_welch,
    56   aubio_win_parzen
    57 } aubio_window_type;
    58 
    59 /** create window */
    60 fvec_t *new_aubio_window (uint_t size, aubio_window_type wintype);
     46fvec_t *new_aubio_window (char_t * window_type, uint_t size);
    6147
    6248/** compute the principal argument
  • src/pitch/pitchfcomb.c

    r858cfa7 r407bba9  
    5252  p->fftLastPhase = new_fvec(bufsize, channels);
    5353  p->fft = new_aubio_fft(bufsize, 1);
    54   p->win = new_aubio_window(bufsize, aubio_win_hanning);
     54  p->win = new_aubio_window("hanning", bufsize);
    5555  return p;
    5656}
  • src/pitch/pitchyinfft.c

    r858cfa7 r407bba9  
    5757  p->yinfft = new_fvec(bufsize/2+1,1);
    5858  p->tol    = 0.85;
    59   p->win    = new_aubio_window(bufsize, aubio_win_hanningz);
     59  p->win    = new_aubio_window("hanningz", bufsize);
    6060  p->weight      = new_fvec(bufsize/2+1,1);
    6161  {
  • src/spectral/phasevoc.c

    r858cfa7 r407bba9  
    9696  pv->dataold  = new_fvec  (win_s-hop_s, channels);
    9797  pv->synthold = new_fvec (win_s-hop_s, channels);
    98   pv->w        = new_aubio_window (win_s, aubio_win_hanningz);
     98  pv->w        = new_aubio_window ("hanningz", win_s);
    9999
    100100  pv->channels = channels;
  • tests/src/test-hist.c

    r858cfa7 r407bba9  
    77  for (length = 1; length < 10; length ++ ) {
    88    aubio_hist_t *o = new_aubio_hist(0, 1, length, 5);
    9     fvec_t *t = new_aubio_window(length,aubio_win_hanning);
     9    fvec_t *t = new_aubio_window("hanning", length);
    1010    aubio_hist_do(o,t);
    1111    fvec_print(t);
     
    1515    fvec_print(t);
    1616    del_fvec(t);
    17     t = new_aubio_window(length,aubio_win_hanningz);
     17    t = new_aubio_window("hanningz", length);
    1818    aubio_hist_do(o,t);
    1919    fvec_print(t);
  • tests/src/test-window.c

    r858cfa7 r407bba9  
    77  for (length = 2; length <= 5; length++)
    88  {
    9     fvec_t *t = new_aubio_window(length,aubio_win_rectangle);
     9    fvec_t *t = new_aubio_window("rectangle", length);
    1010    del_fvec(t);
    11     t = new_aubio_window(length,aubio_win_hamming);
     11    t = new_aubio_window("hamming", length);
    1212    fvec_print(t);
    1313    del_fvec(t);
    14     t = new_aubio_window(length,aubio_win_hanning);
     14    t = new_aubio_window("hanning", length);
    1515    fvec_print(t);
    1616    del_fvec(t);
    17     t = new_aubio_window(length,aubio_win_hanningz);
     17    t = new_aubio_window("hanningz", length);
    1818    fvec_print(t);
    1919    del_fvec(t);
    20     t = new_aubio_window(length,aubio_win_blackman);
     20    t = new_aubio_window("blackman", length);
    2121    fvec_print(t);
    2222    del_fvec(t);
    23     t = new_aubio_window(length,aubio_win_blackman_harris);
     23    t = new_aubio_window("blackman_harris", length);
    2424    fvec_print(t);
    2525    del_fvec(t);
    26     t = new_aubio_window(length,aubio_win_gaussian);
     26    t = new_aubio_window("gaussian", length);
    2727    fvec_print(t);
    2828    del_fvec(t);
    29     t = new_aubio_window(length,aubio_win_welch);
     29    t = new_aubio_window("welch", length);
    3030    fvec_print(t);
    3131    del_fvec(t);
    32     t = new_aubio_window(length,aubio_win_parzen);
     32    t = new_aubio_window("parzen", length);
     33    fvec_print(t);
     34    del_fvec(t);
     35    t = new_aubio_window("default", length);
    3336    fvec_print(t);
    3437    del_fvec(t);
Note: See TracChangeset for help on using the changeset viewer.