Mercurial > hg > silvet
comparison src/Silvet.h @ 112:2169e7a448c5 bqvec-openmp
Merge from default branch
| author | Chris Cannam |
|---|---|
| date | Wed, 07 May 2014 09:01:32 +0100 |
| parents | e282930cfca7 |
| children | 450f9987f041 |
comparison
equal
deleted
inserted
replaced
| 111:9b299b087dd4 | 112:2169e7a448c5 |
|---|---|
| 71 | 71 |
| 72 protected: | 72 protected: |
| 73 Resampler *m_resampler; | 73 Resampler *m_resampler; |
| 74 CQInterpolated *m_cq; | 74 CQInterpolated *m_cq; |
| 75 | 75 |
| 76 bool m_hqMode; | |
| 77 | |
| 76 typedef vector<vector<double> > Grid; | 78 typedef vector<vector<double> > Grid; |
| 77 | 79 |
| 78 vector<MedianFilter<double> *> m_postFilter; | 80 vector<MedianFilter<double> *> m_postFilter; |
| 79 vector<map<int, double> > m_pianoRoll; | 81 vector<map<int, double> > m_pianoRoll; |
| 80 | 82 |