Mercurial > hg > svcore
comparison transform/ModelTransformerFactory.cpp @ 1057:5c5d4863b428 tonioni
Merge from cxx11 branch
author | Chris Cannam |
---|---|
date | Mon, 23 Mar 2015 11:26:28 +0000 |
parents | c7e9afcbf070 |
children | 6ea7761a418b |
comparison
equal
deleted
inserted
replaced
1056:c4898e57eea5 | 1057:5c5d4863b428 |
---|---|
53 ModelTransformer::Input | 53 ModelTransformer::Input |
54 ModelTransformerFactory::getConfigurationForTransform(Transform &transform, | 54 ModelTransformerFactory::getConfigurationForTransform(Transform &transform, |
55 const std::vector<Model *> &candidateInputModels, | 55 const std::vector<Model *> &candidateInputModels, |
56 Model *defaultInputModel, | 56 Model *defaultInputModel, |
57 AudioPlaySource *source, | 57 AudioPlaySource *source, |
58 int startFrame, | 58 sv_frame_t startFrame, |
59 int duration, | 59 sv_frame_t duration, |
60 UserConfigurator *configurator) | 60 UserConfigurator *configurator) |
61 { | 61 { |
62 ModelTransformer::Input input(0); | 62 ModelTransformer::Input input(0); |
63 | 63 |
64 if (candidateInputModels.empty()) return input; | 64 if (candidateInputModels.empty()) return input; |
97 | 97 |
98 cerr << "getConfigurationForTransform: instantiating Vamp plugin" << endl; | 98 cerr << "getConfigurationForTransform: instantiating Vamp plugin" << endl; |
99 | 99 |
100 Vamp::Plugin *vp = | 100 Vamp::Plugin *vp = |
101 FeatureExtractionPluginFactory::instanceFor(id)->instantiatePlugin | 101 FeatureExtractionPluginFactory::instanceFor(id)->instantiatePlugin |
102 (id, inputModel->getSampleRate()); | 102 (id, float(inputModel->getSampleRate())); |
103 | 103 |
104 plugin = vp; | 104 plugin = vp; |
105 | 105 |
106 } else if (RealTimePluginFactory::instanceFor(id)) { | 106 } else if (RealTimePluginFactory::instanceFor(id)) { |
107 | 107 |
108 RealTimePluginFactory *factory = RealTimePluginFactory::instanceFor(id); | 108 RealTimePluginFactory *factory = RealTimePluginFactory::instanceFor(id); |
109 | 109 |
110 int sampleRate = inputModel->getSampleRate(); | 110 sv_samplerate_t sampleRate = inputModel->getSampleRate(); |
111 int blockSize = 1024; | 111 int blockSize = 1024; |
112 int channels = 1; | 112 int channels = 1; |
113 if (source) { | 113 if (source) { |
114 sampleRate = source->getTargetSampleRate(); | 114 sampleRate = source->getTargetSampleRate(); |
115 blockSize = source->getTargetBlockSize(); | 115 blockSize = source->getTargetBlockSize(); |