diff framework/TransformUserConfigurator.cpp @ 441:aa6fb3516e28 tonioni

Merge from cxx11 branch
author Chris Cannam
date Mon, 23 Mar 2015 11:26:28 +0000
parents 167fe01d5631
children 7a3fa603190e
line wrap: on
line diff
--- a/framework/TransformUserConfigurator.cpp	Mon Mar 23 10:04:57 2015 +0000
+++ b/framework/TransformUserConfigurator.cpp	Mon Mar 23 11:26:28 2015 +0000
@@ -46,8 +46,8 @@
     if (plugin && plugin->getType() == "Feature Extraction Plugin") {
 	Vamp::Plugin *vp = static_cast<Vamp::Plugin *>(plugin);
 	SVDEBUG << "TransformUserConfigurator::getChannelRange: is a VP" << endl;
-        minChannels = vp->getMinChannelCount();
-        maxChannels = vp->getMaxChannelCount();
+        minChannels = int(vp->getMinChannelCount());
+        maxChannels = int(vp->getMaxChannelCount());
         return true;
     } else {
 	SVDEBUG << "TransformUserConfigurator::getChannelRange: is not a VP" << endl;
@@ -62,8 +62,8 @@
 				     Vamp::PluginBase *plugin,
                                      Model *&inputModel,
 				     AudioPlaySource *source,
-				     int startFrame,
-				     int duration,
+				     sv_frame_t startFrame,
+				     sv_frame_t duration,
 				     const QMap<QString, Model *> &modelMap,
 				     QStringList candidateModelNames,
 				     QString defaultModelName)