comparison main/MainWindow.cpp @ 107:dd11619b73ba

* Update along with latest Vamp API change.  This has not yet been tested.

         }
     }
 
     for (unsigned int i = 0; i < transforms.size(); ++i) {
 	
-	QString description = transforms[i].description;
-	if (description == "") description = transforms[i].name;
-
-//        std::cerr << "Plugin Description: " << description.toStdString() << std::endl;
+	QString name = transforms[i].name;
+	if (name == "") name = transforms[i].identifier;
+
+//        std::cerr << "Plugin Name: " << name.toStdString() << std::endl;
 
         QString type = transforms[i].type;
 
         QString category = transforms[i].category;
         if (category == "") category = tr("Unclassified");
 
         QString maker = transforms[i].maker;
         if (maker == "") maker = tr("Unknown");
         maker.replace(QRegExp(tr(" [\\(<].*$")), "");
 
-        QString pluginName = description.section(": ", 0, 0);
-        QString output = description.section(": ", 1);
-
-	QAction *action = new QAction(tr("%1...").arg(description), this);
+        QString pluginName = name.section(": ", 0, 0);
+        QString output = name.section(": ", 1);
+
+	QAction *action = new QAction(tr("%1...").arg(name), this);
 	connect(action, SIGNAL(triggered()), this, SLOT(addLayer()));
-	m_transformActions[action] = transforms[i].name;
-        m_transformActionsReverse[transforms[i].name] = action;
+	m_transformActions[action] = transforms[i].identifier;
+        m_transformActionsReverse[transforms[i].identifier] = action;
 	connect(this, SIGNAL(canAddLayer(bool)), action, SLOT(setEnabled(bool)));
 
         QString tip;
         if (output == "") {
             tip = tr("Transform with \"%1\" plugin (from %3)")

         action->setStatusTip(tip);
 
         if (categoryMenus[type].find(category) == categoryMenus[type].end()) {
             std::cerr << "WARNING: MainWindow::setupMenus: Internal error: "
                       << "No category menu for transform \""
-                      << description.toStdString() << "\" (category = \""
+                      << name.toStdString() << "\" (category = \""
                       << category.toStdString() << "\")" << std::endl;
         } else {
             categoryMenus[type][category]->addAction(action);
         }
 
         if (makerMenus[type].find(maker) == makerMenus[type].end()) {
             std::cerr << "WARNING: MainWindow::setupMenus: Internal error: "
                       << "No maker menu for transform \""
-                      << description.toStdString() << "\" (maker = \""
+                      << name.toStdString() << "\" (maker = \""
                       << maker.toStdString() << "\")" << std::endl;
         } else {
             makerMenus[type][maker]->addAction(action);
         }
 
         action = new QAction(tr("%1...").arg(output == "" ? pluginName : output), this);
         connect(action, SIGNAL(triggered()), this, SLOT(addLayer()));
-        m_transformActions[action] = transforms[i].name;
+        m_transformActions[action] = transforms[i].identifier;
         connect(this, SIGNAL(canAddLayer(bool)), action, SLOT(setEnabled(bool)));
         action->setStatusTip(tip);
 
 //        cerr << "Transform: \"" << name.toStdString() << "\": plugin name \"" << pluginName.toStdString() << "\"" << endl;
 

 	m_paneStack->setCurrentLayer(pane, newLayer);
 
 	return;
     }
 
-    TransformName transform = i->second;
+    TransformId transform = i->second;
     TransformFactory *factory = TransformFactory::getInstance();
 
     QString configurationXml;
 
     int channel = -1;

         if (getMainModel() &&
             pane &&
             message.getArgCount() == 1 &&
             message.getArg(0).canConvert(QVariant::String)) {
 
-            TransformName transform = message.getArg(0).toString();
+            TransformId transform = message.getArg(0).toString();
 
             Layer *newLayer = m_document->createDerivedLayer
                 (transform,
                  getMainModel(),
                  TransformFactory::getInstance()->getDefaultContextForTransform