# HG changeset patch
# User Chris Cannam
# Date 1172513587 0
# Node ID 3a6af0e5e2d1f32d681ceea14490b6e29deb1152
# Parent  3e6fee4e425796fd2e042b3f9146f65dda1dab9f
* Update along with latest Vamp API change.  This has not yet been tested.

diff -r 3e6fee4e4257 -r 3a6af0e5e2d1 plugin/DSSIPluginInstance.h
--- a/plugin/DSSIPluginInstance.h	Mon Feb 26 14:55:08 2007 +0000
+++ b/plugin/DSSIPluginInstance.h	Mon Feb 26 18:13:07 2007 +0000
@@ -44,7 +44,7 @@
     virtual bool isOK() const { return m_instanceHandle != 0; }
 
     int getClientId() const { return m_client; }
-    virtual QString getIdentifier() const { return m_identifier; }
+    virtual QString getPluginIdentifier() const { return m_identifier; }
     int getPosition() const { return m_position; }
 
     virtual std::string getName() const;
diff -r 3e6fee4e4257 -r 3a6af0e5e2d1 plugin/LADSPAPluginFactory.cpp
--- a/plugin/LADSPAPluginFactory.cpp	Mon Feb 26 14:55:08 2007 +0000
+++ b/plugin/LADSPAPluginFactory.cpp	Mon Feb 26 18:13:07 2007 +0000
@@ -354,7 +354,7 @@
     for (std::set<RealTimePluginInstance *>::iterator ii = m_instances.begin();
 	 ii != m_instances.end(); ++ii) {
 	QString itype, isoname, ilabel;
-	PluginIdentifier::parseIdentifier((*ii)->getIdentifier(), itype, isoname, ilabel);
+	PluginIdentifier::parseIdentifier((*ii)->getPluginIdentifier(), itype, isoname, ilabel);
 	if (isoname == soname) {
 	    std::cerr << "LADSPAPluginFactory::releasePlugin: dll " << soname.toStdString() << " is still in use for plugin " << ilabel.toStdString() << std::endl;
 	    stillInUse = true;
@@ -490,7 +490,7 @@
 	     ii != m_instances.end(); ++ii) {
 
 	    QString itype, isoname, ilabel;
-	    PluginIdentifier::parseIdentifier((*ii)->getIdentifier(), itype, isoname, ilabel);
+	    PluginIdentifier::parseIdentifier((*ii)->getPluginIdentifier(), itype, isoname, ilabel);
 	    if (isoname == i->first) {
 		stillInUse = true;
 		break;
diff -r 3e6fee4e4257 -r 3a6af0e5e2d1 plugin/LADSPAPluginInstance.h
--- a/plugin/LADSPAPluginInstance.h	Mon Feb 26 14:55:08 2007 +0000
+++ b/plugin/LADSPAPluginInstance.h	Mon Feb 26 18:13:07 2007 +0000
@@ -40,7 +40,7 @@
     virtual bool isOK() const { return m_instanceHandles.size() != 0; }
 
     int getClientId() const { return m_client; }
-    virtual QString getIdentifier() const { return m_identifier; }
+    virtual QString getPluginIdentifier() const { return m_identifier; }
     int getPosition() const { return m_position; }
 
     virtual std::string getName() const;
diff -r 3e6fee4e4257 -r 3a6af0e5e2d1 plugin/RealTimePluginInstance.cpp
--- a/plugin/RealTimePluginInstance.cpp	Mon Feb 26 14:55:08 2007 +0000
+++ b/plugin/RealTimePluginInstance.cpp	Mon Feb 26 18:13:07 2007 +0000
@@ -21,6 +21,8 @@
 #include "RealTimePluginInstance.h"
 #include "RealTimePluginFactory.h"
 
+#include "PluginIdentifier.h"
+
 #include <iostream>
 
 
@@ -35,3 +37,12 @@
     }
 }
 
+std::string
+RealTimePluginInstance::getIdentifier() const
+{
+    QString plid = getPluginIdentifier();
+    QString type, soname, label;
+    PluginIdentifier::parseIdentifier(plid, type, soname, label);
+    return label.toStdString();
+}
+
diff -r 3e6fee4e4257 -r 3a6af0e5e2d1 plugin/RealTimePluginInstance.h
--- a/plugin/RealTimePluginInstance.h	Mon Feb 26 14:55:08 2007 +0000
+++ b/plugin/RealTimePluginInstance.h	Mon Feb 26 18:13:07 2007 +0000
@@ -81,7 +81,8 @@
 
     virtual bool isOK() const = 0;
 
-    virtual QString getIdentifier() const = 0;
+    virtual QString getPluginIdentifier() const = 0;
+    virtual std::string getIdentifier() const;
 
     /**
      * Run for one block, starting at the given time.  The start time