From 4ca1fe7993adf63ea3f35958f63dd20ee546e7ae Mon Sep 17 00:00:00 2001 From: David Robillard Date: Sat, 19 Jan 2008 03:49:52 +0000 Subject: Merge with trunk R2935. git-svn-id: svn://localhost/ardour2/branches/3.0@2943 d708f5d6-7413-0410-9779-e7cbd77b26cf --- libs/ardour/ardour/ladspa_plugin.h | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) (limited to 'libs/ardour/ardour/ladspa_plugin.h') diff --git a/libs/ardour/ardour/ladspa_plugin.h b/libs/ardour/ardour/ladspa_plugin.h index 976584b687..b26e4120b1 100644 --- 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 #include #include #include @@ -33,11 +32,6 @@ #include #include #include -#include - -using std::string; -using std::vector; -using std::list; namespace ARDOUR { class AudioEngine; @@ -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 (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; } -- cgit v1.2.3