Mercurial > hg > svcore
comparison transform/FeatureExtractionModelTransformer.h @ 936:0c1d6de8f44b
Merge from branch warnfix_no_size_t
| author | Chris Cannam |
|---|---|
| date | Wed, 18 Jun 2014 13:51:16 +0100 |
| parents | 06579b8ffb7b |
| children | b14064bd1f97 |
comparison
equal
deleted
inserted
replaced
| 917:49618f39ff09 | 936:0c1d6de8f44b |
|---|---|
| 64 typedef std::map<int, std::map<int, SparseTimeValueModel *> > AdditionalModelMap; | 64 typedef std::map<int, std::map<int, SparseTimeValueModel *> > AdditionalModelMap; |
| 65 AdditionalModelMap m_additionalModels; | 65 AdditionalModelMap m_additionalModels; |
| 66 SparseTimeValueModel *getAdditionalModel(int transformNo, int binNo); | 66 SparseTimeValueModel *getAdditionalModel(int transformNo, int binNo); |
| 67 | 67 |
| 68 void addFeature(int n, | 68 void addFeature(int n, |
| 69 size_t blockFrame, | 69 int blockFrame, |
| 70 const Vamp::Plugin::Feature &feature); | 70 const Vamp::Plugin::Feature &feature); |
| 71 | 71 |
| 72 void setCompletion(int, int); | 72 void setCompletion(int, int); |
| 73 | 73 |
| 74 void getFrames(int channelCount, long startFrame, long size, | 74 void getFrames(int channelCount, long startFrame, long size, |