From: Paul Brossier <piem@piem.org>
Date: Sat, 15 Sep 2018 16:30:42 +0000 (+0200)
Subject: Merge branch 'master' into feature/constantq
X-Git-Url: https://git.aubio.org/?a=commitdiff_plain;h=6203a70e9fa0bc01bbc5d2bac4dd9a8db25d90d2;p=aubio.git

Merge branch 'master' into feature/constantq
---

6203a70e9fa0bc01bbc5d2bac4dd9a8db25d90d2
diff --cc python/lib/gen_code.py
index e998e6c6,7527fe9b..211d575f
--- a/python/lib/gen_code.py
+++ b/python/lib/gen_code.py
@@@ -84,7 -83,7 +84,8 @@@ objoutsize = 
          'tempo': '1',
          'filterbank': 'self->n_filters',
          'tss': 'self->buf_size',
+         'dct': 'self->size',
 +        'constantq': 'aubio_constantq_get_numbins (self->o)',
          }
  
  objinputsize = {
diff --cc src/aubio.h
index 86883000,73deb24c..6e1cff84
--- a/src/aubio.h
+++ b/src/aubio.h
@@@ -182,8 -182,8 +182,9 @@@ extern "C
  #include "temporal/a_weighting.h"
  #include "temporal/c_weighting.h"
  #include "spectral/fft.h"
+ #include "spectral/dct.h"
  #include "spectral/phasevoc.h"
 +#include "spectral/constantq.h"
  #include "spectral/filterbank.h"
  #include "spectral/filterbank_mel.h"
  #include "spectral/mfcc.h"