Merge with 2.0-ongoing R2885.

Fix loading of 2.0 sessions.


git-svn-id: svn://localhost/ardour2/trunk@2904 d708f5d6-7413-0410-9779-e7cbd77b26cf

9 files changed, 46 insertions, 82 deletions

diff --git a/libs/ardour/ardour/audio_unit.h b/libs/ardour/ardour/audio_unit.h
index b0e4d34c28..115e008a54 100644
--- a/libs/ardour/ardour/audio_unit.h
+++ b/libs/ardour/ardour/audio_unit.h
@@ -70,8 +70,6 @@ class AUPlugin : public ARDOUR::Plugin
 	int connect_and_run (BufferSet& bufs, uint32_t& in, uint32_t& out, nframes_t nframes, nframes_t offset);
 	
 	std::set<uint32_t> automatable() const;
-	void store_state (ARDOUR::PluginState&);
-	void restore_state (ARDOUR::PluginState&);
 	string describe_parameter (uint32_t);
 	string state_node_name () const { return "audiounit"; }
 	void print_parameter (uint32_t, char*, uint32_t len) const;
diff --git a/libs/ardour/ardour/ladspa_plugin.h b/libs/ardour/ardour/ladspa_plugin.h
index 7c0b0b2abe..976584b687 100644
--- a/libs/ardour/ardour/ladspa_plugin.h
+++ b/libs/ardour/ardour/ladspa_plugin.h
@@ -32,7 +32,6 @@
 
 #include <jack/types.h>
 #include <ardour/ladspa.h>
-#include <ardour/plugin_state.h>
 #include <ardour/plugin.h>
 #include <ardour/ladspa_plugin.h>
 
@@ -54,53 +53,47 @@ class LadspaPlugin : public ARDOUR::Plugin
 	/* Plugin interface */
 	
 	std::string unique_id() const;
-	const char * label() const                       { return descriptor->Label; }
-	const char * name() const                        { return descriptor->Name; }
-	const char * maker() const                       { return descriptor->Maker; }
-	uint32_t parameter_count() const                 { return descriptor->PortCount; }
-	float default_value (uint32_t port);
-	nframes_t signal_latency() const;
-	void set_parameter (uint32_t port, float val);
-	float get_parameter (uint32_t port) const;
-	int get_parameter_descriptor (uint32_t which, ParameterDescriptor&) const;
+	const char* label() const           { return _descriptor->Label; }
+	const char* name() const            { return _descriptor->Name; }
+	const char* maker() const           { return _descriptor->Maker; }
+	uint32_t    parameter_count() const { return _descriptor->PortCount; }
+	float       default_value (uint32_t port);
+	nframes_t   signal_latency() const;
+	void        set_parameter (uint32_t port, float val);
+	float       get_parameter (uint32_t port) const;
+	int         get_parameter_descriptor (uint32_t which, ParameterDescriptor&) const;
+	uint32_t    nth_parameter (uint32_t port, bool& ok) const;
+	
 	std::set<Parameter> automatable() const;
-	uint32_t nth_parameter (uint32_t port, bool& ok) const;
-	void activate () { 
-		if (was_activated)
-			return;
 
-		if (descriptor->activate) {
-			descriptor->activate (handle);
-		}
+	void activate () { 
+		if (!_was_activated && _descriptor->activate)
+			_descriptor->activate (_handle);
 
-		was_activated = true;
+		_was_activated = true;
 	}
-	void deactivate () {
-		if (!was_activated)
-			return;
 
-		if (descriptor->deactivate) {
-			descriptor->deactivate (handle);
-		}
+	void deactivate () {
+		if (_was_activated && _descriptor->deactivate)
+			_descriptor->deactivate (_handle);
 
-		was_activated = false;
+		_was_activated = false;
 	}
+
 	void cleanup () {
 		activate();
 		deactivate();
 
-		if (descriptor->cleanup) {
-			descriptor->cleanup (handle);
-		}
+		if (_descriptor->cleanup)
+			_descriptor->cleanup (_handle);
 	}
+
 	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);
-	void store_state (ARDOUR::PluginState&);
-	void restore_state (ARDOUR::PluginState&);
 	string describe_parameter (Parameter);
 	string state_node_name() const { return "ladspa"; }
-	void print_parameter (uint32_t, char*, uint32_t len) const;
+	void   print_parameter (uint32_t, char*, uint32_t len) const;
 
 	bool parameter_is_audio(uint32_t) const;
 	bool parameter_is_control(uint32_t) const;
@@ -109,8 +102,8 @@ class LadspaPlugin : public ARDOUR::Plugin
 	bool parameter_is_toggled(uint32_t) const;
 
 	XMLNode& get_state();
-	int set_state(const XMLNode& node);
-	bool save_preset(string name);
+	int      set_state(const XMLNode& node);
+	bool     save_preset(string name);
 
 	bool has_editor() const { return false; }
 
@@ -118,32 +111,27 @@ class LadspaPlugin : public ARDOUR::Plugin
 	
 	/* LADSPA extras */
 
-	LADSPA_Properties properties() const             { return descriptor->Properties; }
-	uint32_t index() const                      { return _index; }
-	const char * copyright() const                   { return descriptor->Copyright; }
-	LADSPA_PortDescriptor port_descriptor(uint32_t i) const { return descriptor->PortDescriptors[i]; }
-	const LADSPA_PortRangeHint * port_range_hints() const { return descriptor->PortRangeHints; }
-	const char * const * port_names() const          { return descriptor->PortNames; }
-	void set_gain (float gain) {
-		descriptor->set_run_adding_gain (handle, gain);
-	}
-	void run_adding (uint32_t nsamples) {
-		descriptor->run_adding (handle, nsamples);
-	}
-	void connect_port (uint32_t port, float *ptr) {
-		descriptor->connect_port (handle, port, ptr);
-	}
+	LADSPA_Properties           properties() const                { return _descriptor->Properties; }
+	uint32_t                    index() const                     { return _index; }
+	const char *                copyright() const                 { return _descriptor->Copyright; }
+	LADSPA_PortDescriptor       port_descriptor(uint32_t i) const { return _descriptor->PortDescriptors[i]; }
+	const LADSPA_PortRangeHint* port_range_hints() const          { return _descriptor->PortRangeHints; }
+	const char * const *        port_names() const                { return _descriptor->PortNames; }
+	
+	void set_gain (float gain)                    { _descriptor->set_run_adding_gain (_handle, gain); }
+	void run_adding (uint32_t nsamples)           { _descriptor->run_adding (_handle, nsamples); }
+	void connect_port (uint32_t port, float *ptr) { _descriptor->connect_port (_handle, port, ptr); }
 
   private:
-	void                    *module;
-	const LADSPA_Descriptor *descriptor;
-	LADSPA_Handle            handle;
-	nframes_t           sample_rate;
-	LADSPA_Data             *control_data;
-	LADSPA_Data             *shadow_data;
-	LADSPA_Data             *latency_control_port;
-	uint32_t                _index;
-	bool                     was_activated;
+	void*                    _module;
+	const LADSPA_Descriptor* _descriptor;
+	LADSPA_Handle            _handle;
+	nframes_t                _sample_rate;
+	LADSPA_Data*             _control_data;
+	LADSPA_Data*             _shadow_data;
+	LADSPA_Data*             _latency_control_port;
+	uint32_t                 _index;
+	bool                     _was_activated;
 
 	void init (void *mod, uint32_t index, nframes_t rate);
 	void run_in_place (nframes_t nsamples);
diff --git a/libs/ardour/ardour/plugin.h b/libs/ardour/ardour/plugin.h
index d721476db7..73f89f1a91 100644
--- a/libs/ardour/ardour/plugin.h
+++ b/libs/ardour/ardour/plugin.h
@@ -30,7 +30,6 @@
 #include <jack/types.h>
 #include <ardour/types.h>
 #include <ardour/chan_count.h>
-#include <ardour/plugin_state.h>
 #include <ardour/cycles.h>
 #include <ardour/latent.h>
 #include <ardour/parameter.h>
@@ -131,8 +130,6 @@ class Plugin : public PBD::StatefulDestructible, public Latent
 	virtual int connect_and_run (BufferSet& bufs, uint32_t& in, uint32_t& out, nframes_t nframes, nframes_t offset) = 0;
 	
 	virtual std::set<Parameter> automatable() const = 0;
-	virtual void store_state (ARDOUR::PluginState&) = 0;
-	virtual void restore_state (ARDOUR::PluginState&) = 0;
 	virtual string describe_parameter (Parameter) = 0;
 	virtual string state_node_name() const = 0;
 	virtual void print_parameter (uint32_t, char*, uint32_t len) const = 0;
diff --git a/libs/ardour/ardour/plugin_insert.h b/libs/ardour/ardour/plugin_insert.h
index 2038153d86..42c53c487c 100644
--- a/libs/ardour/ardour/plugin_insert.h
+++ b/libs/ardour/ardour/plugin_insert.h
@@ -25,7 +25,6 @@
 
 #include <sigc++/signal.h>
 #include <ardour/ardour.h>
-#include <ardour/plugin_state.h>
 #include <ardour/types.h>
 #include <ardour/processor.h>
 #include <ardour/automation_event.h>
diff --git a/libs/ardour/ardour/plugin_state.h b/libs/ardour/ardour/plugin_state.h
deleted file mode 100644
index bd499e2b90..0000000000
--- a/libs/ardour/ardour/plugin_state.h
+++ /dev/null
@@ -1,14 +0,0 @@
-#ifndef __ardour_plugin_state_h__
-#define __ardour_plugin_state_h__
-
-#include <map>
-
-namespace ARDOUR {
-
-struct PluginState {
-    std::map<uint32_t,float> parameters;
-};
-
-} 
-
-#endif /* __ardour_plugin_state_h__ */
diff --git a/libs/ardour/ardour/port_insert.h b/libs/ardour/ardour/port_insert.h
index 114d196750..1743040bf5 100644
--- a/libs/ardour/ardour/port_insert.h
+++ b/libs/ardour/ardour/port_insert.h
@@ -27,7 +27,6 @@
 #include <sigc++/signal.h>
 #include <ardour/ardour.h>
 #include <ardour/io_processor.h>
-#include <ardour/plugin_state.h>
 #include <ardour/types.h>
 
 class XMLNode;
diff --git a/libs/ardour/ardour/processor.h b/libs/ardour/ardour/processor.h
index bf9dfe0430..d3e95e8ebf 100644
--- a/libs/ardour/ardour/processor.h
+++ b/libs/ardour/ardour/processor.h
@@ -30,7 +30,6 @@
 
 #include <ardour/types.h>
 #include <ardour/ardour.h>
-#include <ardour/plugin_state.h>
 #include <ardour/buffer_set.h>
 #include <ardour/automatable.h>
 #include <ardour/latent.h>
diff --git a/libs/ardour/ardour/rb_effect.h b/libs/ardour/ardour/rb_effect.h
index bde0422335..a536a309b3 100644
--- a/libs/ardour/ardour/rb_effect.h
+++ b/libs/ardour/ardour/rb_effect.h
@@ -20,7 +20,7 @@
 #ifndef __ardour_rbeffect_h__
 #define __ardour_rbeffect_h__
 
-#include <ardour/audiofilter.h>
+#include <ardour/filter.h>
 
 namespace ARDOUR {
 
diff --git a/libs/ardour/ardour/vst_plugin.h b/libs/ardour/ardour/vst_plugin.h
index 3a05360f15..e41d000f9c 100644
--- a/libs/ardour/ardour/vst_plugin.h
+++ b/libs/ardour/ardour/vst_plugin.h
@@ -72,8 +72,6 @@ class VSTPlugin : public ARDOUR::Plugin
 	void deactivate ();
 	void set_block_size (nframes_t nframes);
 	int connect_and_run (BufferSet&, uint32_t& in, uint32_t& out, nframes_t nframes, nframes_t offset);
-	void store_state (ARDOUR::PluginState&);
-	void restore_state (ARDOUR::PluginState&);
 	string describe_parameter (uint32_t);
 	string state_node_name() const { return "vst"; }
 	void print_parameter (uint32_t, char*, uint32_t len) const;