diff framework/TransformUserConfigurator.cpp @ 232:025065fd5b49

Merge from debug-output branch

--- a/framework/TransformUserConfigurator.cpp	Thu Apr 14 15:21:41 2011 +0100
+++ b/framework/TransformUserConfigurator.cpp	Tue Jun 14 14:49:22 2011 +0100
@@ -37,12 +37,12 @@
 {
     if (plugin && plugin->getType() == "Feature Extraction Plugin") {
 	Vamp::Plugin *vp = static_cast<Vamp::Plugin *>(plugin);
-	std::cerr << "TransformUserConfigurator::getChannelRange: is a VP" << std::endl;
+	DEBUG << "TransformUserConfigurator::getChannelRange: is a VP" << endl;
         minChannels = vp->getMinChannelCount();
         maxChannels = vp->getMaxChannelCount();
         return true;
     } else {
-	std::cerr << "TransformUserConfigurator::getChannelRange: is not a VP" << std::endl;
+	DEBUG << "TransformUserConfigurator::getChannelRange: is not a VP" << endl;
         return TransformFactory::getInstance()->
             getTransformChannelRange(identifier, minChannels, maxChannels);
     }
@@ -81,7 +81,7 @@
 	std::vector<Vamp::Plugin::OutputDescriptor> od =
 	    vp->getOutputDescriptors();
 
-	std::cerr << "configure: looking for output: " << output.toStdString() << std::endl;
+	std::cerr << "configure: looking for output: " << output << std::endl;
 
 	if (od.size() > 1) {
 	    for (size_t i = 0; i < od.size(); ++i) {
@@ -119,7 +119,7 @@
             static_cast<RealTimePluginInstance *>(plugin);
 
         if (effect && source) {
-	    std::cerr << "Setting auditioning effect" << std::endl;
+	    DEBUG << "Setting auditioning effect" << endl;
             source->setAuditioningEffect(rtp);
         }
     }
@@ -173,12 +173,12 @@
     if (selectedInput != "") {
 	if (modelMap.contains(selectedInput)) {
 	    inputModel = modelMap.value(selectedInput);
-	    std::cerr << "Found selected input \"" << selectedInput.toStdString() << "\" in model map, result is " << inputModel << std::endl;
+	    std::cerr << "Found selected input \"" << selectedInput << "\" in model map, result is " << inputModel << std::endl;
 	} else {
-	    std::cerr << "Failed to find selected input \"" << selectedInput.toStdString() << "\" in model map" << std::endl;
+	    std::cerr << "Failed to find selected input \"" << selectedInput << "\" in model map" << std::endl;
 	}
     } else {
-	std::cerr << "Selected input empty: \"" << selectedInput.toStdString() << "\"" << std::endl;
+	std::cerr << "Selected input empty: \"" << selectedInput << "\"" << std::endl;
     }
         
     // Write parameters back to transform object