Fixes to bundle manager to make it vaguely usable.

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

diff --git a/libs/ardour/ardour/ladspa_plugin.h b/libs/ardour/ardour/ladspa_plugin.h
index 976584b68798494f959f8ef967c0baeeedc80a70..1e7a53a65a0ef65858c5fa3b2baa8fea83f4b917 100644 (file)
--- a/libs/ardour/ardour/ladspa_plugin.h
+++ b/libs/ardour/ardour/ladspa_plugin.h
@@ -20,7 +20,6 @@
 #ifndef __ardour_ladspa_plugin_h__
 #define __ardour_ladspa_plugin_h__
 
-#include <list>
 #include <set>
 #include <vector>
 #include <string>
@@ -33,11 +32,6 @@
 #include <jack/types.h>
 #include <ardour/ladspa.h>
 #include <ardour/plugin.h>
-#include <ardour/ladspa_plugin.h>
-
-using std::string;
-using std::vector;
-using std::list;
 
 namespace ARDOUR {
 class AudioEngine;
@@ -64,7 +58,7 @@ class LadspaPlugin : public ARDOUR::Plugin
        int         get_parameter_descriptor (uint32_t which, ParameterDescriptor&) const;
        uint32_t    nth_parameter (uint32_t port, bool& ok) const;
        
-       std::set<Parameter> automatable() const;
+       std::set<Evoral::Parameter> automatable() const;
 
        void activate () { 
                if (!_was_activated && _descriptor->activate)
@@ -90,10 +84,10 @@ class LadspaPlugin : public ARDOUR::Plugin
 
        void set_block_size (nframes_t nframes) {}
        
-       int connect_and_run (BufferSet& bufs, uint32_t& in, uint32_t& out, nframes_t nframes, nframes_t offset);
-       string describe_parameter (Parameter);
-       string state_node_name() const { return "ladspa"; }
-       void   print_parameter (uint32_t, char*, uint32_t len) const;
+       int         connect_and_run (BufferSet& bufs, uint32_t& in, uint32_t& out, nframes_t nframes, nframes_t offset);
+       std::string describe_parameter (Evoral::Parameter);
+       std::string state_node_name() const { return "ladspa"; }
+       void        print_parameter (uint32_t, char*, uint32_t len) const;
 
        bool parameter_is_audio(uint32_t) const;
        bool parameter_is_control(uint32_t) const;
@@ -103,7 +97,7 @@ class LadspaPlugin : public ARDOUR::Plugin
 
        XMLNode& get_state();
        int      set_state(const XMLNode& node);
-       bool     save_preset(string name);
+       bool     save_preset(std::string name);
 
        bool has_editor() const { return false; }