Mercurial > hg > svcore
comparison transform/ModelTransformerFactory.cpp @ 1050:5ad98be7f635 cxx11
Merge
author | Chris Cannam |
---|---|
date | Tue, 10 Mar 2015 20:03:08 +0000 |
parents | c7e9afcbf070 |
children | 6ea7761a418b |
comparison
equal
deleted
inserted
replaced
1049:10055a284716 | 1050:5ad98be7f635 |
---|---|
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; |