fix (mostly) measure lines and click box text and meter markings

[ardour.git] / libs / ardour / ardour / plugin.h

diff --git a/libs/ardour/ardour/plugin.h b/libs/ardour/ardour/plugin.h
index 8839393b721e7dd82f82171d28e04986c3db0dfc..272506f11ed70f1a80c9d2b56bc7a8fdf8de0a07 100644 (file)
--- a/libs/ardour/ardour/plugin.h
+++ b/libs/ardour/ardour/plugin.h
@@ -30,14 +30,12 @@
 #include <ardour/plugin_state.h>
 #include <ardour/cycles.h>
 
-#include <list>
 #include <vector>
 #include <set>
 #include <map>
 
 using std::string;
 using std::vector;
-using std::list;
 using std::set;
 using std::map;
 
@@ -56,7 +54,7 @@ class PluginInfo {
        PluginInfo () { };
        PluginInfo (const PluginInfo &o)
                : name(o.name), n_inputs(o.n_inputs), n_outputs(o.n_outputs),
-               path (o.path), index(o.index) {}
+               unique_id(o.unique_id), path (o.path), index(o.index) {}
        ~PluginInfo () { };
        string name;
        string category;
@@ -64,6 +62,8 @@ class PluginInfo {
        uint32_t n_outputs;
        Type type;
 
+       long unique_id;
+
   private:
        friend class PluginManager;
        string path;
@@ -128,7 +128,7 @@ class Plugin : public Stateful, public sigc::trackable
 
        virtual bool save_preset(string name) = 0;
        virtual bool load_preset (const string preset_label);
-       virtual list<string> get_presets();
+       virtual std::vector<std::string> get_presets();
 
        virtual bool has_editor() const = 0;
 
@@ -187,7 +187,7 @@ class Plugin : public Stateful, public sigc::trackable
 
 /* this is actually defined in plugin_manager.cc */
 
-Plugin * find_plugin(ARDOUR::Session&, string name, PluginInfo::Type);
+Plugin * find_plugin(ARDOUR::Session&, string name, long unique_id, PluginInfo::Type);
 
 } // namespace ARDOUR