diff widgets/PluginParameterDialog.cpp @ 946:36cddc3de023 alignment_view

Merge from default branch
author Chris Cannam
date Mon, 20 Apr 2015 09:19:52 +0100
parents 4a578a360011
children a34a2a25907c
line wrap: on
line diff
--- a/widgets/PluginParameterDialog.cpp	Thu Jan 15 16:00:53 2015 +0000
+++ b/widgets/PluginParameterDialog.cpp	Mon Apr 20 09:19:52 2015 +0100
@@ -386,10 +386,10 @@
         int size = 1024;
         int increment = 1024;
         if (fePlugin) {
-            size = fePlugin->getPreferredBlockSize();
+            size = int(fePlugin->getPreferredBlockSize());
             cerr << "Feature extraction plugin \"" << fePlugin->getName() << "\" reports preferred block size as " << size << endl;
             if (size == 0) size = 1024;
-            increment = fePlugin->getPreferredStepSize();
+            increment = int(fePlugin->getPreferredStepSize());
             if (increment == 0) {
                 if (fePlugin->getInputDomain() == Vamp::Plugin::TimeDomain) {
                     increment = size;