Mercurial > hg > svgui
comparison widgets/PluginParameterDialog.cpp @ 944:78c152e4db95
Merge from branch tonioni
author | Chris Cannam |
---|---|
date | Mon, 20 Apr 2015 09:12:17 +0100 |
parents | 4a578a360011 |
children | a34a2a25907c |
comparison
equal
deleted
inserted
replaced
896:78e041e45ff0 | 944:78c152e4db95 |
---|---|
384 if (!fePlugin) fePlugin = dynamic_cast<Vamp::PluginHostAdapter *>(m_plugin); | 384 if (!fePlugin) fePlugin = dynamic_cast<Vamp::PluginHostAdapter *>(m_plugin); |
385 if (!fePlugin) fePlugin = dynamic_cast<Vamp::HostExt::PluginWrapper *>(m_plugin); | 385 if (!fePlugin) fePlugin = dynamic_cast<Vamp::HostExt::PluginWrapper *>(m_plugin); |
386 int size = 1024; | 386 int size = 1024; |
387 int increment = 1024; | 387 int increment = 1024; |
388 if (fePlugin) { | 388 if (fePlugin) { |
389 size = fePlugin->getPreferredBlockSize(); | 389 size = int(fePlugin->getPreferredBlockSize()); |
390 cerr << "Feature extraction plugin \"" << fePlugin->getName() << "\" reports preferred block size as " << size << endl; | 390 cerr << "Feature extraction plugin \"" << fePlugin->getName() << "\" reports preferred block size as " << size << endl; |
391 if (size == 0) size = 1024; | 391 if (size == 0) size = 1024; |
392 increment = fePlugin->getPreferredStepSize(); | 392 increment = int(fePlugin->getPreferredStepSize()); |
393 if (increment == 0) { | 393 if (increment == 0) { |
394 if (fePlugin->getInputDomain() == Vamp::Plugin::TimeDomain) { | 394 if (fePlugin->getInputDomain() == Vamp::Plugin::TimeDomain) { |
395 increment = size; | 395 increment = size; |
396 } else { | 396 } else { |
397 increment = size/2; | 397 increment = size/2; |