comparison transform/TransformFactory.cpp @ 108:58f21cf235c7

* Further fixes for Vamp API change, and update to support API versioning
* Add plugin, output and parameter descriptions to GUI
* Avoid squished panner in heads-up-display on pane when time-value or note
  layer is on top

 		    .arg(pluginId).arg(outputs[j].identifier.c_str());
 
 	    QString userName;
             QString friendlyName;
             QString units = outputs[j].unit.c_str();
+            QString description = plugin->getDescription().c_str();
+            QString maker = plugin->getMaker().c_str();
+            if (maker == "") maker = tr("<unknown maker>");
+
+            if (description == "") {
+                if (outputs.size() == 1) {
+                    description = tr("Extract features using \"%1\" plugin (from %2)")
+                        .arg(pluginName).arg(maker);
+                } else {
+                    description = tr("Extract features using \"%1\" output of \"%2\" plugin (from %3)")
+                        .arg(outputs[j].name.c_str()).arg(pluginName).arg(maker);
+                }
+            } else {
+                if (outputs.size() == 1) {
+                    description = tr("%1 using \"%2\" plugin (from %3)")
+                        .arg(description).arg(pluginName).arg(maker);
+                } else {
+                    description = tr("%1 using \"%2\" output of \"%3\" plugin (from %4)")
+                        .arg(description).arg(outputs[j].name.c_str()).arg(pluginName).arg(maker);
+                }
+            }                    
 
 	    if (outputs.size() == 1) {
 		userName = pluginName;
                 friendlyName = pluginName;
 	    } else {

                 TransformDesc(tr("Analysis"),
                               category,
                               transformId,
                               userName,
                               friendlyName,
-                              plugin->getMaker().c_str(),
+                              description,
+                              maker,
                               units,
                               configurable);
 	}
     }
 }

 //        std::cout << "TransformFactory::populateRealTimePlugins: plugin " << pluginId.toStdString() << " has " << descriptor->controlOutputPortCount << " control output ports, " << descriptor->audioOutputPortCount << " audio outputs, " << descriptor->audioInputPortCount << " audio inputs" << std::endl;
 	
 	QString pluginName = descriptor->name.c_str();
         QString category = factory->getPluginCategory(pluginId);
         bool configurable = (descriptor->parameterCount > 0);
+        QString maker = descriptor->maker.c_str();
+        if (maker == "") maker = tr("<unknown maker>");
 
         if (descriptor->audioInputPortCount > 0) {
 
             for (size_t j = 0; j < descriptor->controlOutputPortCount; ++j) {
 
                 QString transformId = QString("%1:%2").arg(pluginId).arg(j);
                 QString userName;
                 QString units;
+                QString portName;
 
                 if (j < descriptor->controlOutputPortNames.size() &&
                     descriptor->controlOutputPortNames[j] != "") {
 
-                    QString portName = descriptor->controlOutputPortNames[j].c_str();
+                    portName = descriptor->controlOutputPortNames[j].c_str();
 
                     userName = tr("%1: %2")
                         .arg(pluginName)
                         .arg(portName);
 

                 } else {
 
                     userName = pluginName;
                 }
 
+                QString description;
+
+                if (portName != "") {
+                    description = tr("Extract \"%1\" data output from \"%2\" effect plugin (from %3)")
+                        .arg(portName)
+                        .arg(pluginName)
+                        .arg(maker);
+                } else {
+                    description = tr("Extract data output %1 from \"%2\" effect plugin (from %3)")
+                        .arg(j + 1)
+                        .arg(pluginName)
+                        .arg(maker);
+                }
 
                 transforms[transformId] = 
                     TransformDesc(tr("Effects Data"),
                                   category,
                                   transformId,
                                   userName,
                                   userName,
-                                  descriptor->maker.c_str(),
+                                  description,
+                                  maker,
                                   units,
                                   configurable);
             }
         }
 

 
             if (descriptor->audioOutputPortCount > 0) {
 
                 QString transformId = QString("%1:A").arg(pluginId);
                 QString type = tr("Effects");
+
+                QString description = tr("Transform audio signal with \"%1\" effect plugin (from %2)")
+                    .arg(pluginName)
+                    .arg(maker);
+
                 if (descriptor->audioInputPortCount == 0) {
                     type = tr("Generators");
+                    QString description = tr("Generate audio signal using \"%1\" plugin (from %2)")
+                        .arg(pluginName)
+                        .arg(maker);
                 }
 
                 transforms[transformId] =
                     TransformDesc(type,
                                   category,
                                   transformId,
                                   pluginName,
                                   pluginName,
-                                  descriptor->maker.c_str(),
+                                  description,
+                                  maker,
                                   "",
                                   configurable);
             }
         }
     }

     }
 
     QString id = identifier.section(':', 0, 2);
     QString output = identifier.section(':', 3);
     QString outputLabel = "";
+    QString outputDescription = "";
     
     bool ok = false;
     configurationXml = m_lastConfigurations[identifier];
 
 //    std::cerr << "last configuration: " << configurationXml.toStdString() << std::endl;

                 vp->getOutputDescriptors();
             if (od.size() > 1) {
                 for (size_t i = 0; i < od.size(); ++i) {
                     if (od[i].identifier == output.toStdString()) {
                         outputLabel = od[i].name.c_str();
+                        outputDescription = od[i].description.c_str();
                         break;
                     }
                 }
             }
         }

         if (targetChannels > 0) {
             dialog->setChannelArrangement(sourceChannels, targetChannels,
                                           defaultChannel);
         }
         
-        dialog->setOutputLabel(outputLabel);
+        dialog->setOutputLabel(outputLabel, outputDescription);
         
         dialog->setShowProcessingOptions(true, frequency);
 
         if (dialog->exec() == QDialog::Accepted) {
             ok = true;