Mercurial > hg > svapp
comparison framework/TransformUserConfigurator.cpp @ 450:d9d132c0e240 alignment_view
Merge from default branch
author | Chris Cannam |
---|---|
date | Mon, 20 Apr 2015 09:21:32 +0100 |
parents | 167fe01d5631 |
children | 7a3fa603190e |
comparison
equal
deleted
inserted
replaced
430:adfb2948fabf | 450:d9d132c0e240 |
---|---|
44 int &minChannels, int &maxChannels) | 44 int &minChannels, int &maxChannels) |
45 { | 45 { |
46 if (plugin && plugin->getType() == "Feature Extraction Plugin") { | 46 if (plugin && plugin->getType() == "Feature Extraction Plugin") { |
47 Vamp::Plugin *vp = static_cast<Vamp::Plugin *>(plugin); | 47 Vamp::Plugin *vp = static_cast<Vamp::Plugin *>(plugin); |
48 SVDEBUG << "TransformUserConfigurator::getChannelRange: is a VP" << endl; | 48 SVDEBUG << "TransformUserConfigurator::getChannelRange: is a VP" << endl; |
49 minChannels = vp->getMinChannelCount(); | 49 minChannels = int(vp->getMinChannelCount()); |
50 maxChannels = vp->getMaxChannelCount(); | 50 maxChannels = int(vp->getMaxChannelCount()); |
51 return true; | 51 return true; |
52 } else { | 52 } else { |
53 SVDEBUG << "TransformUserConfigurator::getChannelRange: is not a VP" << endl; | 53 SVDEBUG << "TransformUserConfigurator::getChannelRange: is not a VP" << endl; |
54 return TransformFactory::getInstance()-> | 54 return TransformFactory::getInstance()-> |
55 getTransformChannelRange(identifier, minChannels, maxChannels); | 55 getTransformChannelRange(identifier, minChannels, maxChannels); |
60 TransformUserConfigurator::configure(ModelTransformer::Input &input, | 60 TransformUserConfigurator::configure(ModelTransformer::Input &input, |
61 Transform &transform, | 61 Transform &transform, |
62 Vamp::PluginBase *plugin, | 62 Vamp::PluginBase *plugin, |
63 Model *&inputModel, | 63 Model *&inputModel, |
64 AudioPlaySource *source, | 64 AudioPlaySource *source, |
65 int startFrame, | 65 sv_frame_t startFrame, |
66 int duration, | 66 sv_frame_t duration, |
67 const QMap<QString, Model *> &modelMap, | 67 const QMap<QString, Model *> &modelMap, |
68 QStringList candidateModelNames, | 68 QStringList candidateModelNames, |
69 QString defaultModelName) | 69 QString defaultModelName) |
70 { | 70 { |
71 bool ok = false; | 71 bool ok = false; |