annotate transform/TransformFactory.cpp @ 477:e0784311a103

* Start thread to populate uninstalled transforms only on request (so runner doesn't have to have it)
author Chris Cannam
date Tue, 11 Nov 2008 09:41:45 +0000
parents a70dcfed59c1
children f933062a7f80
rev   line source
Chris@330 1 /* -*- c-basic-offset: 4 indent-tabs-mode: nil -*- vi:set ts=8 sts=4 sw=4: */
Chris@330 2
Chris@330 3 /*
Chris@330 4 Sonic Visualiser
Chris@330 5 An audio file viewer and annotation editor.
Chris@330 6 Centre for Digital Music, Queen Mary, University of London.
Chris@330 7 This file copyright 2006 Chris Cannam and QMUL.
Chris@330 8
Chris@330 9 This program is free software; you can redistribute it and/or
Chris@330 10 modify it under the terms of the GNU General Public License as
Chris@330 11 published by the Free Software Foundation; either version 2 of the
Chris@330 12 License, or (at your option) any later version. See the file
Chris@330 13 COPYING included with this distribution for more information.
Chris@330 14 */
Chris@330 15
Chris@330 16 #include "TransformFactory.h"
Chris@330 17
Chris@330 18 #include "plugin/FeatureExtractionPluginFactory.h"
Chris@330 19 #include "plugin/RealTimePluginFactory.h"
Chris@332 20 #include "plugin/RealTimePluginInstance.h"
Chris@330 21 #include "plugin/PluginXml.h"
Chris@330 22
Chris@475 23 #include <vamp-hostsdk/Plugin.h>
Chris@475 24 #include <vamp-hostsdk/PluginHostAdapter.h>
Chris@475 25 #include <vamp-hostsdk/PluginWrapper.h>
Chris@330 26
Chris@457 27 #include "rdf/PluginRDFIndexer.h"
Chris@457 28 #include "rdf/PluginRDFDescription.h"
Chris@457 29
Chris@446 30 #include "base/XmlExportable.h"
Chris@446 31
Chris@330 32 #include <iostream>
Chris@330 33 #include <set>
Chris@330 34
Chris@330 35 #include <QRegExp>
Chris@350 36 #include <QTextStream>
Chris@330 37
Chris@460 38 #include "base/Thread.h"
Chris@460 39
Chris@443 40 using std::cerr;
Chris@443 41 using std::endl;
Chris@443 42
Chris@330 43 TransformFactory *
Chris@330 44 TransformFactory::m_instance = new TransformFactory;
Chris@330 45
Chris@330 46 TransformFactory *
Chris@330 47 TransformFactory::getInstance()
Chris@330 48 {
Chris@330 49 return m_instance;
Chris@330 50 }
Chris@330 51
Chris@457 52 TransformFactory::TransformFactory() :
Chris@457 53 m_transformsPopulated(false),
Chris@477 54 m_uninstalledTransformsPopulated(false),
Chris@477 55 m_thread(0)
Chris@457 56 {
Chris@457 57 }
Chris@457 58
Chris@330 59 TransformFactory::~TransformFactory()
Chris@330 60 {
Chris@330 61 }
Chris@330 62
Chris@477 63 void
Chris@477 64 TransformFactory::startPopulationThread()
Chris@477 65 {
Chris@477 66 MutexLocker locker(&m_uninstalledTransformsMutex,
Chris@477 67 "TransformFactory::startPopulationThread");
Chris@477 68
Chris@477 69 if (m_thread) return;
Chris@477 70
Chris@477 71 m_thread = new UninstalledTransformsPopulateThread(this);
Chris@477 72 m_thread->start();
Chris@477 73 }
Chris@477 74
Chris@330 75 TransformList
Chris@350 76 TransformFactory::getAllTransformDescriptions()
Chris@330 77 {
Chris@460 78 populateTransforms();
Chris@330 79
Chris@330 80 std::set<TransformDescription> dset;
Chris@330 81 for (TransformDescriptionMap::const_iterator i = m_transforms.begin();
Chris@330 82 i != m_transforms.end(); ++i) {
Chris@443 83 // cerr << "inserting transform into set: id = " << i->second.identifier.toStdString() << endl;
Chris@330 84 dset.insert(i->second);
Chris@330 85 }
Chris@330 86
Chris@330 87 TransformList list;
Chris@330 88 for (std::set<TransformDescription>::const_iterator i = dset.begin();
Chris@330 89 i != dset.end(); ++i) {
Chris@443 90 // cerr << "inserting transform into list: id = " << i->identifier.toStdString() << endl;
Chris@330 91 list.push_back(*i);
Chris@330 92 }
Chris@330 93
Chris@330 94 return list;
Chris@330 95 }
Chris@330 96
Chris@350 97 TransformDescription
Chris@350 98 TransformFactory::getTransformDescription(TransformId id)
Chris@350 99 {
Chris@460 100 populateTransforms();
Chris@350 101
Chris@350 102 if (m_transforms.find(id) == m_transforms.end()) {
Chris@350 103 return TransformDescription();
Chris@350 104 }
Chris@350 105
Chris@350 106 return m_transforms[id];
Chris@350 107 }
Chris@350 108
Chris@457 109 TransformList
Chris@457 110 TransformFactory::getUninstalledTransformDescriptions()
Chris@457 111 {
Chris@460 112 populateUninstalledTransforms();
Chris@457 113
Chris@457 114 std::set<TransformDescription> dset;
Chris@457 115 for (TransformDescriptionMap::const_iterator i = m_uninstalledTransforms.begin();
Chris@457 116 i != m_uninstalledTransforms.end(); ++i) {
Chris@457 117 // cerr << "inserting transform into set: id = " << i->second.identifier.toStdString() << endl;
Chris@457 118 dset.insert(i->second);
Chris@457 119 }
Chris@457 120
Chris@457 121 TransformList list;
Chris@457 122 for (std::set<TransformDescription>::const_iterator i = dset.begin();
Chris@457 123 i != dset.end(); ++i) {
Chris@460 124 // cerr << "inserting transform into uninstalled list: id = " << i->identifier.toStdString() << endl;
Chris@457 125 list.push_back(*i);
Chris@457 126 }
Chris@457 127
Chris@457 128 return list;
Chris@457 129 }
Chris@457 130
Chris@457 131 TransformDescription
Chris@457 132 TransformFactory::getUninstalledTransformDescription(TransformId id)
Chris@457 133 {
Chris@460 134 populateUninstalledTransforms();
Chris@457 135
Chris@457 136 if (m_uninstalledTransforms.find(id) == m_uninstalledTransforms.end()) {
Chris@457 137 return TransformDescription();
Chris@457 138 }
Chris@457 139
Chris@457 140 return m_uninstalledTransforms[id];
Chris@457 141 }
Chris@457 142
Chris@457 143 TransformFactory::TransformInstallStatus
Chris@457 144 TransformFactory::getTransformInstallStatus(TransformId id)
Chris@457 145 {
Chris@460 146 populateTransforms();
Chris@457 147
Chris@457 148 if (m_transforms.find(id) != m_transforms.end()) {
Chris@457 149 return TransformInstalled;
Chris@457 150 }
Chris@473 151
Chris@473 152 if (!m_uninstalledTransformsMutex.tryLock()) {
Chris@473 153 // uninstalled transforms are being populated; this may take some time,
Chris@473 154 // and they aren't critical
Chris@473 155 return TransformUnknown;
Chris@473 156 }
Chris@473 157
Chris@473 158 if (!m_uninstalledTransformsPopulated) {
Chris@473 159 m_uninstalledTransformsMutex.unlock();
Chris@473 160 populateUninstalledTransforms();
Chris@473 161 m_uninstalledTransformsMutex.lock();
Chris@473 162 }
Chris@473 163
Chris@457 164 if (m_uninstalledTransforms.find(id) != m_uninstalledTransforms.end()) {
Chris@457 165 return TransformNotInstalled;
Chris@457 166 }
Chris@473 167
Chris@473 168 m_uninstalledTransformsMutex.unlock();
Chris@473 169
Chris@457 170 return TransformUnknown;
Chris@457 171 }
Chris@457 172
Chris@457 173
Chris@330 174 std::vector<QString>
Chris@330 175 TransformFactory::getAllTransformTypes()
Chris@330 176 {
Chris@460 177 populateTransforms();
Chris@330 178
Chris@330 179 std::set<QString> types;
Chris@330 180 for (TransformDescriptionMap::const_iterator i = m_transforms.begin();
Chris@330 181 i != m_transforms.end(); ++i) {
Chris@330 182 types.insert(i->second.type);
Chris@330 183 }
Chris@330 184
Chris@330 185 std::vector<QString> rv;
Chris@330 186 for (std::set<QString>::iterator i = types.begin(); i != types.end(); ++i) {
Chris@330 187 rv.push_back(*i);
Chris@330 188 }
Chris@330 189
Chris@330 190 return rv;
Chris@330 191 }
Chris@330 192
Chris@330 193 std::vector<QString>
Chris@330 194 TransformFactory::getTransformCategories(QString transformType)
Chris@330 195 {
Chris@460 196 populateTransforms();
Chris@330 197
Chris@330 198 std::set<QString> categories;
Chris@330 199 for (TransformDescriptionMap::const_iterator i = m_transforms.begin();
Chris@330 200 i != m_transforms.end(); ++i) {
Chris@330 201 if (i->second.type == transformType) {
Chris@330 202 categories.insert(i->second.category);
Chris@330 203 }
Chris@330 204 }
Chris@330 205
Chris@330 206 bool haveEmpty = false;
Chris@330 207
Chris@330 208 std::vector<QString> rv;
Chris@330 209 for (std::set<QString>::iterator i = categories.begin();
Chris@330 210 i != categories.end(); ++i) {
Chris@330 211 if (*i != "") rv.push_back(*i);
Chris@330 212 else haveEmpty = true;
Chris@330 213 }
Chris@330 214
Chris@330 215 if (haveEmpty) rv.push_back(""); // make sure empty category sorts last
Chris@330 216
Chris@330 217 return rv;
Chris@330 218 }
Chris@330 219
Chris@330 220 std::vector<QString>
Chris@330 221 TransformFactory::getTransformMakers(QString transformType)
Chris@330 222 {
Chris@460 223 populateTransforms();
Chris@330 224
Chris@330 225 std::set<QString> makers;
Chris@330 226 for (TransformDescriptionMap::const_iterator i = m_transforms.begin();
Chris@330 227 i != m_transforms.end(); ++i) {
Chris@330 228 if (i->second.type == transformType) {
Chris@330 229 makers.insert(i->second.maker);
Chris@330 230 }
Chris@330 231 }
Chris@330 232
Chris@330 233 bool haveEmpty = false;
Chris@330 234
Chris@330 235 std::vector<QString> rv;
Chris@330 236 for (std::set<QString>::iterator i = makers.begin();
Chris@330 237 i != makers.end(); ++i) {
Chris@330 238 if (*i != "") rv.push_back(*i);
Chris@330 239 else haveEmpty = true;
Chris@330 240 }
Chris@330 241
Chris@330 242 if (haveEmpty) rv.push_back(""); // make sure empty category sorts last
Chris@330 243
Chris@330 244 return rv;
Chris@330 245 }
Chris@330 246
Chris@330 247 void
Chris@330 248 TransformFactory::populateTransforms()
Chris@330 249 {
Chris@460 250 MutexLocker locker(&m_transformsMutex,
Chris@460 251 "TransformFactory::populateTransforms");
Chris@460 252 if (m_transformsPopulated) {
Chris@460 253 return;
Chris@460 254 }
Chris@460 255
Chris@330 256 TransformDescriptionMap transforms;
Chris@330 257
Chris@330 258 populateFeatureExtractionPlugins(transforms);
Chris@330 259 populateRealTimePlugins(transforms);
Chris@330 260
Chris@330 261 // disambiguate plugins with similar names
Chris@330 262
Chris@330 263 std::map<QString, int> names;
Chris@330 264 std::map<QString, QString> pluginSources;
Chris@330 265 std::map<QString, QString> pluginMakers;
Chris@330 266
Chris@330 267 for (TransformDescriptionMap::iterator i = transforms.begin();
Chris@330 268 i != transforms.end(); ++i) {
Chris@330 269
Chris@330 270 TransformDescription desc = i->second;
Chris@330 271
Chris@330 272 QString td = desc.name;
Chris@330 273 QString tn = td.section(": ", 0, 0);
Chris@330 274 QString pn = desc.identifier.section(":", 1, 1);
Chris@330 275
Chris@330 276 if (pluginSources.find(tn) != pluginSources.end()) {
Chris@330 277 if (pluginSources[tn] != pn && pluginMakers[tn] != desc.maker) {
Chris@330 278 ++names[tn];
Chris@330 279 }
Chris@330 280 } else {
Chris@330 281 ++names[tn];
Chris@330 282 pluginSources[tn] = pn;
Chris@330 283 pluginMakers[tn] = desc.maker;
Chris@330 284 }
Chris@330 285 }
Chris@330 286
Chris@330 287 std::map<QString, int> counts;
Chris@330 288 m_transforms.clear();
Chris@330 289
Chris@330 290 for (TransformDescriptionMap::iterator i = transforms.begin();
Chris@330 291 i != transforms.end(); ++i) {
Chris@330 292
Chris@330 293 TransformDescription desc = i->second;
Chris@330 294 QString identifier = desc.identifier;
Chris@330 295 QString maker = desc.maker;
Chris@330 296
Chris@330 297 QString td = desc.name;
Chris@330 298 QString tn = td.section(": ", 0, 0);
Chris@330 299 QString to = td.section(": ", 1);
Chris@330 300
Chris@330 301 if (names[tn] > 1) {
Chris@330 302 maker.replace(QRegExp(tr(" [\\(<].*$")), "");
Chris@330 303 tn = QString("%1 [%2]").arg(tn).arg(maker);
Chris@330 304 }
Chris@330 305
Chris@330 306 if (to != "") {
Chris@330 307 desc.name = QString("%1: %2").arg(tn).arg(to);
Chris@330 308 } else {
Chris@330 309 desc.name = tn;
Chris@330 310 }
Chris@330 311
Chris@330 312 m_transforms[identifier] = desc;
Chris@330 313 }
Chris@457 314
Chris@457 315 m_transformsPopulated = true;
Chris@330 316 }
Chris@330 317
Chris@330 318 void
Chris@330 319 TransformFactory::populateFeatureExtractionPlugins(TransformDescriptionMap &transforms)
Chris@330 320 {
Chris@330 321 std::vector<QString> plugs =
Chris@330 322 FeatureExtractionPluginFactory::getAllPluginIdentifiers();
Chris@330 323
Chris@330 324 for (size_t i = 0; i < plugs.size(); ++i) {
Chris@330 325
Chris@330 326 QString pluginId = plugs[i];
Chris@330 327
Chris@330 328 FeatureExtractionPluginFactory *factory =
Chris@330 329 FeatureExtractionPluginFactory::instanceFor(pluginId);
Chris@330 330
Chris@330 331 if (!factory) {
Chris@443 332 cerr << "WARNING: TransformFactory::populateTransforms: No feature extraction plugin factory for instance " << pluginId.toLocal8Bit().data() << endl;
Chris@330 333 continue;
Chris@330 334 }
Chris@330 335
Chris@330 336 Vamp::Plugin *plugin =
Chris@350 337 factory->instantiatePlugin(pluginId, 44100);
Chris@330 338
Chris@330 339 if (!plugin) {
Chris@443 340 cerr << "WARNING: TransformFactory::populateTransforms: Failed to instantiate plugin " << pluginId.toLocal8Bit().data() << endl;
Chris@330 341 continue;
Chris@330 342 }
Chris@330 343
Chris@330 344 QString pluginName = plugin->getName().c_str();
Chris@330 345 QString category = factory->getPluginCategory(pluginId);
Chris@330 346
Chris@330 347 Vamp::Plugin::OutputList outputs =
Chris@330 348 plugin->getOutputDescriptors();
Chris@330 349
Chris@330 350 for (size_t j = 0; j < outputs.size(); ++j) {
Chris@330 351
Chris@330 352 QString transformId = QString("%1:%2")
Chris@330 353 .arg(pluginId).arg(outputs[j].identifier.c_str());
Chris@330 354
Chris@330 355 QString userName;
Chris@330 356 QString friendlyName;
Chris@330 357 QString units = outputs[j].unit.c_str();
Chris@330 358 QString description = plugin->getDescription().c_str();
Chris@330 359 QString maker = plugin->getMaker().c_str();
Chris@330 360 if (maker == "") maker = tr("<unknown maker>");
Chris@330 361
Chris@443 362 QString longDescription = description;
Chris@443 363
Chris@443 364 if (longDescription == "") {
Chris@330 365 if (outputs.size() == 1) {
Chris@443 366 longDescription = tr("Extract features using \"%1\" plugin (from %2)")
Chris@330 367 .arg(pluginName).arg(maker);
Chris@330 368 } else {
Chris@443 369 longDescription = tr("Extract features using \"%1\" output of \"%2\" plugin (from %3)")
Chris@330 370 .arg(outputs[j].name.c_str()).arg(pluginName).arg(maker);
Chris@330 371 }
Chris@330 372 } else {
Chris@330 373 if (outputs.size() == 1) {
Chris@443 374 longDescription = tr("%1 using \"%2\" plugin (from %3)")
Chris@443 375 .arg(longDescription).arg(pluginName).arg(maker);
Chris@330 376 } else {
Chris@443 377 longDescription = tr("%1 using \"%2\" output of \"%3\" plugin (from %4)")
Chris@443 378 .arg(longDescription).arg(outputs[j].name.c_str()).arg(pluginName).arg(maker);
Chris@330 379 }
Chris@330 380 }
Chris@330 381
Chris@330 382 if (outputs.size() == 1) {
Chris@330 383 userName = pluginName;
Chris@330 384 friendlyName = pluginName;
Chris@330 385 } else {
Chris@330 386 userName = QString("%1: %2")
Chris@330 387 .arg(pluginName)
Chris@330 388 .arg(outputs[j].name.c_str());
Chris@330 389 friendlyName = outputs[j].name.c_str();
Chris@330 390 }
Chris@330 391
Chris@330 392 bool configurable = (!plugin->getPrograms().empty() ||
Chris@330 393 !plugin->getParameterDescriptors().empty());
Chris@330 394
Chris@443 395 // cerr << "Feature extraction plugin transform: " << transformId.toStdString() << " friendly name: " << friendlyName.toStdString() << endl;
Chris@330 396
Chris@330 397 transforms[transformId] =
Chris@330 398 TransformDescription(tr("Analysis"),
Chris@332 399 category,
Chris@332 400 transformId,
Chris@332 401 userName,
Chris@332 402 friendlyName,
Chris@332 403 description,
Chris@443 404 longDescription,
Chris@332 405 maker,
Chris@332 406 units,
Chris@332 407 configurable);
Chris@330 408 }
Chris@330 409
Chris@330 410 delete plugin;
Chris@330 411 }
Chris@330 412 }
Chris@330 413
Chris@330 414 void
Chris@330 415 TransformFactory::populateRealTimePlugins(TransformDescriptionMap &transforms)
Chris@330 416 {
Chris@330 417 std::vector<QString> plugs =
Chris@330 418 RealTimePluginFactory::getAllPluginIdentifiers();
Chris@330 419
Chris@330 420 static QRegExp unitRE("[\\[\\(]([A-Za-z0-9/]+)[\\)\\]]$");
Chris@330 421
Chris@330 422 for (size_t i = 0; i < plugs.size(); ++i) {
Chris@330 423
Chris@330 424 QString pluginId = plugs[i];
Chris@330 425
Chris@330 426 RealTimePluginFactory *factory =
Chris@330 427 RealTimePluginFactory::instanceFor(pluginId);
Chris@330 428
Chris@330 429 if (!factory) {
Chris@443 430 cerr << "WARNING: TransformFactory::populateTransforms: No real time plugin factory for instance " << pluginId.toLocal8Bit().data() << endl;
Chris@330 431 continue;
Chris@330 432 }
Chris@330 433
Chris@330 434 const RealTimePluginDescriptor *descriptor =
Chris@330 435 factory->getPluginDescriptor(pluginId);
Chris@330 436
Chris@330 437 if (!descriptor) {
Chris@443 438 cerr << "WARNING: TransformFactory::populateTransforms: Failed to query plugin " << pluginId.toLocal8Bit().data() << endl;
Chris@330 439 continue;
Chris@330 440 }
Chris@330 441
Chris@330 442 //!!! if (descriptor->controlOutputPortCount == 0 ||
Chris@330 443 // descriptor->audioInputPortCount == 0) continue;
Chris@330 444
Chris@443 445 // std::cout << "TransformFactory::populateRealTimePlugins: plugin " << pluginId.toStdString() << " has " << descriptor->controlOutputPortCount << " control output ports, " << descriptor->audioOutputPortCount << " audio outputs, " << descriptor->audioInputPortCount << " audio inputs" << endl;
Chris@330 446
Chris@330 447 QString pluginName = descriptor->name.c_str();
Chris@330 448 QString category = factory->getPluginCategory(pluginId);
Chris@330 449 bool configurable = (descriptor->parameterCount > 0);
Chris@330 450 QString maker = descriptor->maker.c_str();
Chris@330 451 if (maker == "") maker = tr("<unknown maker>");
Chris@330 452
Chris@330 453 if (descriptor->audioInputPortCount > 0) {
Chris@330 454
Chris@330 455 for (size_t j = 0; j < descriptor->controlOutputPortCount; ++j) {
Chris@330 456
Chris@330 457 QString transformId = QString("%1:%2").arg(pluginId).arg(j);
Chris@330 458 QString userName;
Chris@330 459 QString units;
Chris@330 460 QString portName;
Chris@330 461
Chris@330 462 if (j < descriptor->controlOutputPortNames.size() &&
Chris@330 463 descriptor->controlOutputPortNames[j] != "") {
Chris@330 464
Chris@330 465 portName = descriptor->controlOutputPortNames[j].c_str();
Chris@330 466
Chris@330 467 userName = tr("%1: %2")
Chris@330 468 .arg(pluginName)
Chris@330 469 .arg(portName);
Chris@330 470
Chris@330 471 if (unitRE.indexIn(portName) >= 0) {
Chris@330 472 units = unitRE.cap(1);
Chris@330 473 }
Chris@330 474
Chris@330 475 } else if (descriptor->controlOutputPortCount > 1) {
Chris@330 476
Chris@330 477 userName = tr("%1: Output %2")
Chris@330 478 .arg(pluginName)
Chris@330 479 .arg(j + 1);
Chris@330 480
Chris@330 481 } else {
Chris@330 482
Chris@330 483 userName = pluginName;
Chris@330 484 }
Chris@330 485
Chris@330 486 QString description;
Chris@330 487
Chris@330 488 if (portName != "") {
Chris@330 489 description = tr("Extract \"%1\" data output from \"%2\" effect plugin (from %3)")
Chris@330 490 .arg(portName)
Chris@330 491 .arg(pluginName)
Chris@330 492 .arg(maker);
Chris@330 493 } else {
Chris@330 494 description = tr("Extract data output %1 from \"%2\" effect plugin (from %3)")
Chris@330 495 .arg(j + 1)
Chris@330 496 .arg(pluginName)
Chris@330 497 .arg(maker);
Chris@330 498 }
Chris@330 499
Chris@330 500 transforms[transformId] =
Chris@330 501 TransformDescription(tr("Effects Data"),
Chris@332 502 category,
Chris@332 503 transformId,
Chris@332 504 userName,
Chris@332 505 userName,
Chris@443 506 "",
Chris@332 507 description,
Chris@332 508 maker,
Chris@332 509 units,
Chris@332 510 configurable);
Chris@330 511 }
Chris@330 512 }
Chris@330 513
Chris@330 514 if (!descriptor->isSynth || descriptor->audioInputPortCount > 0) {
Chris@330 515
Chris@330 516 if (descriptor->audioOutputPortCount > 0) {
Chris@330 517
Chris@330 518 QString transformId = QString("%1:A").arg(pluginId);
Chris@330 519 QString type = tr("Effects");
Chris@330 520
Chris@330 521 QString description = tr("Transform audio signal with \"%1\" effect plugin (from %2)")
Chris@330 522 .arg(pluginName)
Chris@330 523 .arg(maker);
Chris@330 524
Chris@330 525 if (descriptor->audioInputPortCount == 0) {
Chris@330 526 type = tr("Generators");
Chris@330 527 QString description = tr("Generate audio signal using \"%1\" plugin (from %2)")
Chris@330 528 .arg(pluginName)
Chris@330 529 .arg(maker);
Chris@330 530 }
Chris@330 531
Chris@330 532 transforms[transformId] =
Chris@330 533 TransformDescription(type,
Chris@332 534 category,
Chris@332 535 transformId,
Chris@332 536 pluginName,
Chris@332 537 pluginName,
Chris@443 538 "",
Chris@332 539 description,
Chris@332 540 maker,
Chris@332 541 "",
Chris@332 542 configurable);
Chris@330 543 }
Chris@330 544 }
Chris@330 545 }
Chris@330 546 }
Chris@330 547
Chris@457 548 void
Chris@457 549 TransformFactory::populateUninstalledTransforms()
Chris@457 550 {
Chris@460 551 populateTransforms();
Chris@460 552
Chris@460 553 MutexLocker locker(&m_uninstalledTransformsMutex,
Chris@460 554 "TransformFactory::populateUninstalledTransforms");
Chris@460 555 if (m_uninstalledTransformsPopulated) return;
Chris@460 556
Chris@461 557 // ("http://www.vamp-plugins.org/rdf/plugins/vamp-example-plugins");
Chris@461 558
Chris@461 559 PluginRDFIndexer::getInstance()->indexConfiguredURLs();
Chris@457 560
Chris@457 561 //!!! This will be amazingly slow
Chris@457 562
Chris@457 563 QStringList ids = PluginRDFIndexer::getInstance()->getIndexedPluginIds();
Chris@457 564
Chris@457 565 for (QStringList::const_iterator i = ids.begin(); i != ids.end(); ++i) {
Chris@457 566
Chris@457 567 PluginRDFDescription desc(*i);
Chris@457 568
Chris@457 569 QString name = desc.getPluginName();
Chris@457 570 // if (name == "") {
Chris@457 571 // std::cerr << "TransformFactory::populateUninstalledTransforms: "
Chris@457 572 // << "No name available for plugin " << i->toStdString()
Chris@457 573 // << ", skipping" << std::endl;
Chris@457 574 // continue;
Chris@457 575 // }
Chris@457 576
Chris@457 577 QString description = desc.getPluginDescription();
Chris@457 578 QString maker = desc.getPluginMaker();
Chris@462 579 QString infoUrl = desc.getPluginInfoURL();
Chris@457 580
Chris@457 581 QStringList oids = desc.getOutputIds();
Chris@457 582
Chris@457 583 for (QStringList::const_iterator j = oids.begin(); j != oids.end(); ++j) {
Chris@457 584
Chris@457 585 TransformId tid = Transform::getIdentifierForPluginOutput(*i, *j);
Chris@457 586
Chris@457 587 if (m_transforms.find(tid) != m_transforms.end()) {
Chris@457 588 std::cerr << "TransformFactory::populateUninstalledTransforms: "
Chris@468 589 << tid.toStdString() << " is installed; adding info url if appropriate, skipping rest" << std::endl;
Chris@468 590 if (infoUrl != "") {
Chris@468 591 if (m_transforms[tid].infoUrl == "") {
Chris@468 592 m_transforms[tid].infoUrl = infoUrl;
Chris@468 593 }
Chris@468 594 }
Chris@457 595 continue;
Chris@457 596 }
Chris@457 597
Chris@457 598 std::cerr << "TransformFactory::populateUninstalledTransforms: "
Chris@457 599 << "adding " << tid.toStdString() << std::endl;
Chris@457 600
Chris@457 601 QString oname = desc.getOutputName(*j);
Chris@457 602 if (oname == "") oname = *j;
Chris@457 603
Chris@457 604 TransformDescription td;
Chris@457 605 td.type = tr("Analysis"); //!!! should be enum or something
Chris@457 606 td.category = "";
Chris@457 607 td.identifier = tid;
Chris@457 608
Chris@457 609 if (oids.size() == 1) {
Chris@457 610 td.name = name;
Chris@457 611 } else if (name != "") {
Chris@457 612 td.name = tr("%1: %2").arg(name).arg(oname);
Chris@457 613 }
Chris@457 614
Chris@462 615 QString longDescription = description;
Chris@462 616 //!!! basically duplicated from above
Chris@462 617 if (longDescription == "") {
Chris@462 618 if (oids.size() == 1) {
Chris@462 619 longDescription = tr("Extract features using \"%1\" plugin (from %2)")
Chris@462 620 .arg(name).arg(maker);
Chris@462 621 } else {
Chris@462 622 longDescription = tr("Extract features using \"%1\" output of \"%2\" plugin (from %3)")
Chris@462 623 .arg(oname).arg(name).arg(maker);
Chris@462 624 }
Chris@462 625 } else {
Chris@462 626 if (oids.size() == 1) {
Chris@462 627 longDescription = tr("%1 using \"%2\" plugin (from %3)")
Chris@462 628 .arg(longDescription).arg(name).arg(maker);
Chris@462 629 } else {
Chris@462 630 longDescription = tr("%1 using \"%2\" output of \"%3\" plugin (from %4)")
Chris@462 631 .arg(longDescription).arg(oname).arg(name).arg(maker);
Chris@462 632 }
Chris@462 633 }
Chris@462 634
Chris@457 635 td.friendlyName = name; //!!!???
Chris@457 636 td.description = description;
Chris@462 637 td.longDescription = longDescription;
Chris@457 638 td.maker = maker;
Chris@462 639 td.infoUrl = infoUrl;
Chris@457 640 td.units = "";
Chris@457 641 td.configurable = false;
Chris@457 642
Chris@457 643 m_uninstalledTransforms[tid] = td;
Chris@457 644 }
Chris@457 645 }
Chris@457 646
Chris@457 647 m_uninstalledTransformsPopulated = true;
Chris@460 648
Chris@460 649 std::cerr << "populateUninstalledTransforms exiting" << std::endl;
Chris@457 650 }
Chris@350 651
Chris@350 652 Transform
Chris@350 653 TransformFactory::getDefaultTransformFor(TransformId id, size_t rate)
Chris@350 654 {
Chris@350 655 Transform t;
Chris@350 656 t.setIdentifier(id);
Chris@350 657 if (rate != 0) t.setSampleRate(rate);
Chris@350 658
Chris@351 659 Vamp::PluginBase *plugin = instantiateDefaultPluginFor(id, rate);
Chris@350 660
Chris@350 661 if (plugin) {
Chris@366 662 t.setPluginVersion(QString("%1").arg(plugin->getPluginVersion()));
Chris@350 663 setParametersFromPlugin(t, plugin);
Chris@350 664 makeContextConsistentWithPlugin(t, plugin);
Chris@350 665 delete plugin;
Chris@350 666 }
Chris@350 667
Chris@350 668 return t;
Chris@350 669 }
Chris@350 670
Chris@350 671 Vamp::PluginBase *
Chris@351 672 TransformFactory::instantiatePluginFor(const Transform &transform)
Chris@351 673 {
Chris@351 674 Vamp::PluginBase *plugin = instantiateDefaultPluginFor
Chris@351 675 (transform.getIdentifier(), transform.getSampleRate());
Chris@351 676 if (plugin) {
Chris@351 677 setPluginParameters(transform, plugin);
Chris@351 678 }
Chris@351 679 return plugin;
Chris@351 680 }
Chris@351 681
Chris@351 682 Vamp::PluginBase *
Chris@351 683 TransformFactory::instantiateDefaultPluginFor(TransformId identifier, size_t rate)
Chris@350 684 {
Chris@350 685 Transform t;
Chris@350 686 t.setIdentifier(identifier);
Chris@350 687 if (rate == 0) rate = 44100;
Chris@350 688 QString pluginId = t.getPluginIdentifier();
Chris@350 689
Chris@350 690 Vamp::PluginBase *plugin = 0;
Chris@350 691
Chris@350 692 if (t.getType() == Transform::FeatureExtraction) {
Chris@350 693
Chris@350 694 FeatureExtractionPluginFactory *factory =
Chris@350 695 FeatureExtractionPluginFactory::instanceFor(pluginId);
Chris@350 696
Chris@439 697 if (factory) {
Chris@439 698 plugin = factory->instantiatePlugin(pluginId, rate);
Chris@439 699 }
Chris@350 700
Chris@350 701 } else {
Chris@350 702
Chris@350 703 RealTimePluginFactory *factory =
Chris@350 704 RealTimePluginFactory::instanceFor(pluginId);
Chris@439 705
Chris@439 706 if (factory) {
Chris@439 707 plugin = factory->instantiatePlugin(pluginId, 0, 0, rate, 1024, 1);
Chris@439 708 }
Chris@350 709 }
Chris@350 710
Chris@350 711 return plugin;
Chris@350 712 }
Chris@350 713
Chris@350 714 Vamp::Plugin *
Chris@350 715 TransformFactory::downcastVampPlugin(Vamp::PluginBase *plugin)
Chris@350 716 {
Chris@350 717 Vamp::Plugin *vp = dynamic_cast<Vamp::Plugin *>(plugin);
Chris@350 718 if (!vp) {
Chris@443 719 // cerr << "makeConsistentWithPlugin: not a Vamp::Plugin" << endl;
Chris@350 720 vp = dynamic_cast<Vamp::PluginHostAdapter *>(plugin); //!!! why?
Chris@350 721 }
Chris@350 722 if (!vp) {
Chris@443 723 // cerr << "makeConsistentWithPlugin: not a Vamp::PluginHostAdapter" << endl;
Chris@350 724 vp = dynamic_cast<Vamp::HostExt::PluginWrapper *>(plugin); //!!! no, I mean really why?
Chris@350 725 }
Chris@350 726 if (!vp) {
Chris@443 727 // cerr << "makeConsistentWithPlugin: not a Vamp::HostExt::PluginWrapper" << endl;
Chris@350 728 }
Chris@350 729 return vp;
Chris@350 730 }
Chris@350 731
Chris@330 732 bool
Chris@330 733 TransformFactory::haveTransform(TransformId identifier)
Chris@330 734 {
Chris@460 735 populateTransforms();
Chris@330 736 return (m_transforms.find(identifier) != m_transforms.end());
Chris@330 737 }
Chris@330 738
Chris@330 739 QString
Chris@330 740 TransformFactory::getTransformName(TransformId identifier)
Chris@330 741 {
Chris@330 742 if (m_transforms.find(identifier) != m_transforms.end()) {
Chris@330 743 return m_transforms[identifier].name;
Chris@330 744 } else return "";
Chris@330 745 }
Chris@330 746
Chris@330 747 QString
Chris@330 748 TransformFactory::getTransformFriendlyName(TransformId identifier)
Chris@330 749 {
Chris@330 750 if (m_transforms.find(identifier) != m_transforms.end()) {
Chris@330 751 return m_transforms[identifier].friendlyName;
Chris@330 752 } else return "";
Chris@330 753 }
Chris@330 754
Chris@330 755 QString
Chris@330 756 TransformFactory::getTransformUnits(TransformId identifier)
Chris@330 757 {
Chris@330 758 if (m_transforms.find(identifier) != m_transforms.end()) {
Chris@330 759 return m_transforms[identifier].units;
Chris@330 760 } else return "";
Chris@330 761 }
Chris@330 762
Chris@472 763 QString
Chris@472 764 TransformFactory::getTransformInfoUrl(TransformId identifier)
Chris@472 765 {
Chris@472 766 if (m_transforms.find(identifier) != m_transforms.end()) {
Chris@472 767 return m_transforms[identifier].infoUrl;
Chris@472 768 } else return "";
Chris@472 769 }
Chris@472 770
Chris@350 771 Vamp::Plugin::InputDomain
Chris@350 772 TransformFactory::getTransformInputDomain(TransformId identifier)
Chris@350 773 {
Chris@350 774 Transform transform;
Chris@350 775 transform.setIdentifier(identifier);
Chris@350 776
Chris@350 777 if (transform.getType() != Transform::FeatureExtraction) {
Chris@350 778 return Vamp::Plugin::TimeDomain;
Chris@350 779 }
Chris@350 780
Chris@350 781 Vamp::Plugin *plugin =
Chris@351 782 downcastVampPlugin(instantiateDefaultPluginFor(identifier, 0));
Chris@350 783
Chris@350 784 if (plugin) {
Chris@350 785 Vamp::Plugin::InputDomain d = plugin->getInputDomain();
Chris@350 786 delete plugin;
Chris@350 787 return d;
Chris@350 788 }
Chris@350 789
Chris@350 790 return Vamp::Plugin::TimeDomain;
Chris@350 791 }
Chris@350 792
Chris@330 793 bool
Chris@330 794 TransformFactory::isTransformConfigurable(TransformId identifier)
Chris@330 795 {
Chris@330 796 if (m_transforms.find(identifier) != m_transforms.end()) {
Chris@330 797 return m_transforms[identifier].configurable;
Chris@330 798 } else return false;
Chris@330 799 }
Chris@330 800
Chris@330 801 bool
Chris@330 802 TransformFactory::getTransformChannelRange(TransformId identifier,
Chris@330 803 int &min, int &max)
Chris@330 804 {
Chris@330 805 QString id = identifier.section(':', 0, 2);
Chris@330 806
Chris@330 807 if (FeatureExtractionPluginFactory::instanceFor(id)) {
Chris@330 808
Chris@330 809 Vamp::Plugin *plugin =
Chris@330 810 FeatureExtractionPluginFactory::instanceFor(id)->
Chris@350 811 instantiatePlugin(id, 44100);
Chris@330 812 if (!plugin) return false;
Chris@330 813
Chris@330 814 min = plugin->getMinChannelCount();
Chris@330 815 max = plugin->getMaxChannelCount();
Chris@330 816 delete plugin;
Chris@330 817
Chris@330 818 return true;
Chris@330 819
Chris@330 820 } else if (RealTimePluginFactory::instanceFor(id)) {
Chris@330 821
Chris@350 822 // don't need to instantiate
Chris@350 823
Chris@330 824 const RealTimePluginDescriptor *descriptor =
Chris@330 825 RealTimePluginFactory::instanceFor(id)->
Chris@330 826 getPluginDescriptor(id);
Chris@330 827 if (!descriptor) return false;
Chris@330 828
Chris@330 829 min = descriptor->audioInputPortCount;
Chris@330 830 max = descriptor->audioInputPortCount;
Chris@330 831
Chris@330 832 return true;
Chris@330 833 }
Chris@330 834
Chris@330 835 return false;
Chris@330 836 }
Chris@332 837
Chris@332 838 void
Chris@332 839 TransformFactory::setParametersFromPlugin(Transform &transform,
Chris@332 840 Vamp::PluginBase *plugin)
Chris@332 841 {
Chris@332 842 Transform::ParameterMap pmap;
Chris@332 843
Chris@350 844 //!!! record plugin & API version
Chris@350 845
Chris@350 846 //!!! check that this is the right plugin!
Chris@350 847
Chris@332 848 Vamp::PluginBase::ParameterList parameters =
Chris@332 849 plugin->getParameterDescriptors();
Chris@332 850
Chris@332 851 for (Vamp::PluginBase::ParameterList::const_iterator i = parameters.begin();
Chris@332 852 i != parameters.end(); ++i) {
Chris@332 853 pmap[i->identifier.c_str()] = plugin->getParameter(i->identifier);
Chris@332 854 }
Chris@332 855
Chris@332 856 transform.setParameters(pmap);
Chris@332 857
Chris@332 858 if (plugin->getPrograms().empty()) {
Chris@332 859 transform.setProgram("");
Chris@332 860 } else {
Chris@332 861 transform.setProgram(plugin->getCurrentProgram().c_str());
Chris@332 862 }
Chris@332 863
Chris@332 864 RealTimePluginInstance *rtpi =
Chris@332 865 dynamic_cast<RealTimePluginInstance *>(plugin);
Chris@332 866
Chris@332 867 Transform::ConfigurationMap cmap;
Chris@332 868
Chris@332 869 if (rtpi) {
Chris@332 870
Chris@332 871 RealTimePluginInstance::ConfigurationPairMap configurePairs =
Chris@332 872 rtpi->getConfigurePairs();
Chris@332 873
Chris@332 874 for (RealTimePluginInstance::ConfigurationPairMap::const_iterator i
Chris@332 875 = configurePairs.begin(); i != configurePairs.end(); ++i) {
Chris@332 876 cmap[i->first.c_str()] = i->second.c_str();
Chris@332 877 }
Chris@332 878 }
Chris@332 879
Chris@332 880 transform.setConfiguration(cmap);
Chris@332 881 }
Chris@332 882
Chris@332 883 void
Chris@350 884 TransformFactory::setPluginParameters(const Transform &transform,
Chris@350 885 Vamp::PluginBase *plugin)
Chris@350 886 {
Chris@350 887 //!!! check plugin & API version (see e.g. PluginXml::setParameters)
Chris@350 888
Chris@350 889 //!!! check that this is the right plugin!
Chris@350 890
Chris@350 891 RealTimePluginInstance *rtpi =
Chris@350 892 dynamic_cast<RealTimePluginInstance *>(plugin);
Chris@350 893
Chris@350 894 if (rtpi) {
Chris@350 895 const Transform::ConfigurationMap &cmap = transform.getConfiguration();
Chris@350 896 for (Transform::ConfigurationMap::const_iterator i = cmap.begin();
Chris@350 897 i != cmap.end(); ++i) {
Chris@350 898 rtpi->configure(i->first.toStdString(), i->second.toStdString());
Chris@350 899 }
Chris@350 900 }
Chris@350 901
Chris@350 902 if (transform.getProgram() != "") {
Chris@350 903 plugin->selectProgram(transform.getProgram().toStdString());
Chris@350 904 }
Chris@350 905
Chris@350 906 const Transform::ParameterMap &pmap = transform.getParameters();
Chris@350 907
Chris@350 908 Vamp::PluginBase::ParameterList parameters =
Chris@350 909 plugin->getParameterDescriptors();
Chris@350 910
Chris@350 911 for (Vamp::PluginBase::ParameterList::const_iterator i = parameters.begin();
Chris@350 912 i != parameters.end(); ++i) {
Chris@350 913 QString key = i->identifier.c_str();
Chris@350 914 Transform::ParameterMap::const_iterator pmi = pmap.find(key);
Chris@350 915 if (pmi != pmap.end()) {
Chris@350 916 plugin->setParameter(i->identifier, pmi->second);
Chris@350 917 }
Chris@350 918 }
Chris@350 919 }
Chris@350 920
Chris@350 921 void
Chris@332 922 TransformFactory::makeContextConsistentWithPlugin(Transform &transform,
Chris@332 923 Vamp::PluginBase *plugin)
Chris@332 924 {
Chris@350 925 const Vamp::Plugin *vp = downcastVampPlugin(plugin);
Chris@332 926
Chris@332 927 if (!vp) {
Chris@332 928 // time domain input for real-time effects plugin
Chris@332 929 if (!transform.getBlockSize()) {
Chris@332 930 if (!transform.getStepSize()) transform.setStepSize(1024);
Chris@332 931 transform.setBlockSize(transform.getStepSize());
Chris@332 932 } else {
Chris@332 933 transform.setStepSize(transform.getBlockSize());
Chris@332 934 }
Chris@332 935 } else {
Chris@332 936 Vamp::Plugin::InputDomain domain = vp->getInputDomain();
Chris@332 937 if (!transform.getStepSize()) {
Chris@332 938 transform.setStepSize(vp->getPreferredStepSize());
Chris@332 939 }
Chris@332 940 if (!transform.getBlockSize()) {
Chris@332 941 transform.setBlockSize(vp->getPreferredBlockSize());
Chris@332 942 }
Chris@332 943 if (!transform.getBlockSize()) {
Chris@332 944 transform.setBlockSize(1024);
Chris@332 945 }
Chris@332 946 if (!transform.getStepSize()) {
Chris@332 947 if (domain == Vamp::Plugin::FrequencyDomain) {
Chris@443 948 // cerr << "frequency domain, step = " << blockSize/2 << endl;
Chris@332 949 transform.setStepSize(transform.getBlockSize()/2);
Chris@332 950 } else {
Chris@443 951 // cerr << "time domain, step = " << blockSize/2 << endl;
Chris@332 952 transform.setStepSize(transform.getBlockSize());
Chris@332 953 }
Chris@332 954 }
Chris@332 955 }
Chris@332 956 }
Chris@332 957
Chris@350 958 QString
Chris@350 959 TransformFactory::getPluginConfigurationXml(const Transform &t)
Chris@332 960 {
Chris@350 961 QString xml;
Chris@350 962
Chris@351 963 Vamp::PluginBase *plugin = instantiateDefaultPluginFor
Chris@351 964 (t.getIdentifier(), 0);
Chris@350 965 if (!plugin) {
Chris@443 966 cerr << "TransformFactory::getPluginConfigurationXml: "
Chris@350 967 << "Unable to instantiate plugin for transform \""
Chris@443 968 << t.getIdentifier().toStdString() << "\"" << endl;
Chris@350 969 return xml;
Chris@332 970 }
Chris@332 971
Chris@351 972 setPluginParameters(t, plugin);
Chris@351 973
Chris@350 974 QTextStream out(&xml);
Chris@350 975 PluginXml(plugin).toXml(out);
Chris@350 976 delete plugin;
Chris@332 977
Chris@350 978 return xml;
Chris@350 979 }
Chris@332 980
Chris@350 981 void
Chris@350 982 TransformFactory::setParametersFromPluginConfigurationXml(Transform &t,
Chris@350 983 QString xml)
Chris@350 984 {
Chris@351 985 Vamp::PluginBase *plugin = instantiateDefaultPluginFor
Chris@351 986 (t.getIdentifier(), 0);
Chris@350 987 if (!plugin) {
Chris@443 988 cerr << "TransformFactory::setParametersFromPluginConfigurationXml: "
Chris@350 989 << "Unable to instantiate plugin for transform \""
Chris@443 990 << t.getIdentifier().toStdString() << "\"" << endl;
Chris@350 991 return;
Chris@332 992 }
Chris@332 993
Chris@350 994 PluginXml(plugin).setParametersFromXml(xml);
Chris@350 995 setParametersFromPlugin(t, plugin);
Chris@350 996 delete plugin;
Chris@332 997 }
Chris@332 998
Chris@443 999 TransformFactory::SearchResults
Chris@443 1000 TransformFactory::search(QString keyword)
Chris@443 1001 {
Chris@443 1002 QStringList keywords;
Chris@443 1003 keywords << keyword;
Chris@443 1004 return search(keywords);
Chris@443 1005 }
Chris@443 1006
Chris@443 1007 TransformFactory::SearchResults
Chris@443 1008 TransformFactory::search(QStringList keywords)
Chris@443 1009 {
Chris@460 1010 populateTransforms();
Chris@443 1011
Chris@447 1012 if (keywords.size() > 1) {
Chris@447 1013 // Additional score for all keywords in a row
Chris@447 1014 keywords.push_back(keywords.join(" "));
Chris@447 1015 }
Chris@447 1016
Chris@443 1017 SearchResults results;
Chris@457 1018 TextMatcher matcher;
Chris@443 1019
Chris@443 1020 for (TransformDescriptionMap::const_iterator i = m_transforms.begin();
Chris@443 1021 i != m_transforms.end(); ++i) {
Chris@443 1022
Chris@457 1023 TextMatcher::Match match;
Chris@443 1024
Chris@457 1025 match.key = i->first;
Chris@443 1026
Chris@457 1027 matcher.test(match, keywords, i->second.type, tr("Plugin type"), 5);
Chris@457 1028 matcher.test(match, keywords, i->second.category, tr("Category"), 20);
Chris@457 1029 matcher.test(match, keywords, i->second.identifier, tr("System Identifier"), 6);
Chris@457 1030 matcher.test(match, keywords, i->second.name, tr("Name"), 30);
Chris@457 1031 matcher.test(match, keywords, i->second.description, tr("Description"), 20);
Chris@457 1032 matcher.test(match, keywords, i->second.maker, tr("Maker"), 10);
Chris@457 1033 matcher.test(match, keywords, i->second.units, tr("Units"), 10);
Chris@457 1034
Chris@457 1035 if (match.score > 0) results[i->first] = match;
Chris@457 1036 }
Chris@457 1037
Chris@460 1038 if (!m_uninstalledTransformsMutex.tryLock()) {
Chris@460 1039 // uninstalled transforms are being populated; this may take some time,
Chris@460 1040 // and they aren't critical
Chris@460 1041 std::cerr << "TransformFactory::search: Uninstalled transforms mutex is held, skipping" << std::endl;
Chris@460 1042 return results;
Chris@460 1043 }
Chris@460 1044
Chris@460 1045 if (!m_uninstalledTransformsPopulated) {
Chris@460 1046 std::cerr << "WARNING: TransformFactory::search: Uninstalled transforms are not populated yet" << endl
Chris@460 1047 << "and are not being populated either -- was the thread not started correctly?" << endl;
Chris@460 1048 m_uninstalledTransformsMutex.unlock();
Chris@460 1049 return results;
Chris@460 1050 }
Chris@460 1051
Chris@460 1052 m_uninstalledTransformsMutex.unlock();
Chris@457 1053
Chris@457 1054 for (TransformDescriptionMap::const_iterator i = m_uninstalledTransforms.begin();
Chris@457 1055 i != m_uninstalledTransforms.end(); ++i) {
Chris@457 1056
Chris@457 1057 TextMatcher::Match match;
Chris@457 1058
Chris@457 1059 match.key = i->first;
Chris@457 1060
Chris@457 1061 matcher.test(match, keywords, i->second.type, tr("Plugin type"), 2);
Chris@457 1062 matcher.test(match, keywords, i->second.category, tr("Category"), 10);
Chris@457 1063 matcher.test(match, keywords, i->second.identifier, tr("System Identifier"), 3);
Chris@457 1064 matcher.test(match, keywords, i->second.name, tr("Name"), 15);
Chris@457 1065 matcher.test(match, keywords, i->second.description, tr("Description"), 10);
Chris@457 1066 matcher.test(match, keywords, i->second.maker, tr("Maker"), 5);
Chris@457 1067 matcher.test(match, keywords, i->second.units, tr("Units"), 5);
Chris@443 1068
Chris@443 1069 if (match.score > 0) results[i->first] = match;
Chris@443 1070 }
Chris@443 1071
Chris@443 1072 return results;
Chris@443 1073 }
Chris@443 1074