revisit setting up processors during route construction; remove several more XML-based constructors; don't put () parens around inactive plugin names (we have a checkbox); improve management of send, return and insert bitslot IDs; clean up Diskstream construction a bit more

git-svn-id: svn://localhost/ardour2/branches/3.0@6819 d708f5d6-7413-0410-9779-e7cbd77b26cf

9 files changed, 6 insertions, 15 deletions

diff --git a/libs/ardour/ardour/audio_diskstream.h b/libs/ardour/ardour/audio_diskstream.h
index b19da7eec4..0a8a7a0a8e 100644
--- a/libs/ardour/ardour/audio_diskstream.h
+++ b/libs/ardour/ardour/audio_diskstream.h
@@ -231,7 +231,7 @@ class AudioDiskstream : public Diskstream
 	void transport_stopped (struct tm&, time_t, bool abort);
 	void transport_looped (nframes_t transport_frame);
 
-	void init (Diskstream::Flag);
+	void init ();
 
 	void init_channel (ChannelInfo &chan);
 	void destroy_channel (ChannelInfo &chan);
diff --git a/libs/ardour/ardour/diskstream.h b/libs/ardour/ardour/diskstream.h
index 7ac3d79e4e..f5b4b6da0d 100644
--- a/libs/ardour/ardour/diskstream.h
+++ b/libs/ardour/ardour/diskstream.h
@@ -216,8 +216,6 @@ class Diskstream : public SessionObject
 		uint32_t frames;
 	};
 
-	virtual void init (Flag);
-
 	virtual int use_new_write_source (uint32_t n=0) = 0;
 
 	virtual int find_and_use_playlist (const std::string&) = 0;
diff --git a/libs/ardour/ardour/midi_diskstream.h b/libs/ardour/ardour/midi_diskstream.h
index 5cb4a322f7..81f2979f3f 100644
--- a/libs/ardour/ardour/midi_diskstream.h
+++ b/libs/ardour/ardour/midi_diskstream.h
@@ -154,7 +154,7 @@ class MidiDiskstream : public Diskstream
 	void transport_stopped (struct tm&, time_t, bool abort);
 	void transport_looped (nframes_t transport_frame);
 
-	void init (Diskstream::Flag);
+	void init ();
 
 	int use_new_write_source (uint32_t n=0);
 
diff --git a/libs/ardour/ardour/plugin_insert.h b/libs/ardour/ardour/plugin_insert.h
index 25f380c41b..2e24bdd707 100644
--- a/libs/ardour/ardour/plugin_insert.h
+++ b/libs/ardour/ardour/plugin_insert.h
@@ -43,8 +43,7 @@ class Plugin;
 class PluginInsert : public Processor
 {
   public:
-	PluginInsert (Session&, boost::shared_ptr<Plugin>);
-	PluginInsert (Session&, const XMLNode&);
+	PluginInsert (Session&, boost::shared_ptr<Plugin> = boost::shared_ptr<Plugin>());
 	~PluginInsert ();
 
 	static const std::string port_automation_node_name;
diff --git a/libs/ardour/ardour/port_insert.h b/libs/ardour/ardour/port_insert.h
index 2f39d8688e..097c96eb94 100644
--- a/libs/ardour/ardour/port_insert.h
+++ b/libs/ardour/ardour/port_insert.h
@@ -44,7 +44,6 @@ class PortInsert : public IOProcessor
 {
   public:
 	PortInsert (Session&, boost::shared_ptr<MuteMaster> mm);
-	PortInsert (Session&, boost::shared_ptr<MuteMaster> mm, const XMLNode&);
 	~PortInsert ();
 
 	XMLNode& state(bool full);
diff --git a/libs/ardour/ardour/processor.h b/libs/ardour/ardour/processor.h
index a07c9dcfaf..4e13338ac1 100644
--- a/libs/ardour/ardour/processor.h
+++ b/libs/ardour/ardour/processor.h
@@ -49,7 +49,6 @@ class Processor : public SessionObject, public AutomatableControls, public Laten
 	static const std::string state_node_name;
 
 	Processor(Session&, const std::string& name);
-	Processor(Session&, const XMLNode& node);
 
 	virtual ~Processor() { }
 
@@ -98,8 +97,6 @@ class Processor : public SessionObject, public AutomatableControls, public Laten
 	void *get_gui () const { return _gui; }
 	void  set_gui (void *p) { _gui = p; }
 
-	static PBD::Signal1<void,Processor*> ProcessorCreated;
-
 	PBD::Signal0<void>                     ActiveChanged;
 	PBD::Signal2<void,ChanCount,ChanCount> ConfigurationChanged;
 
diff --git a/libs/ardour/ardour/return.h b/libs/ardour/ardour/return.h
index f663c109a5..63915e5d78 100644
--- a/libs/ardour/ardour/return.h
+++ b/libs/ardour/ardour/return.h
@@ -38,7 +38,6 @@ class Return : public IOProcessor
 {
 public:
 	Return (Session&, bool internal = false);
-	Return (Session&, const XMLNode&, bool internal = false);
 	virtual ~Return ();
 
 	uint32_t bit_slot() const { return _bitslot; }
diff --git a/libs/ardour/ardour/send.h b/libs/ardour/ardour/send.h
index 8b39d12727..a060363a23 100644
--- a/libs/ardour/ardour/send.h
+++ b/libs/ardour/ardour/send.h
@@ -37,7 +37,6 @@ class Send : public Delivery
 {
   public:
 	Send (Session&, boost::shared_ptr<MuteMaster>, Delivery::Role r = Delivery::Send);
-	Send (Session&, boost::shared_ptr<MuteMaster>, const XMLNode&, int version = 3000, Delivery::Role r = Delivery::Send);
 	virtual ~Send ();
 
 	uint32_t bit_slot() const { return _bitslot; }
diff --git a/libs/ardour/ardour/session.h b/libs/ardour/ardour/session.h
index 4af432eeb5..bd59e83824 100644
--- a/libs/ardour/ardour/session.h
+++ b/libs/ardour/ardour/session.h
@@ -619,6 +619,9 @@ class Session : public PBD::StatefulDestructible, public PBD::ScopedConnectionLi
 	void mark_send_id (uint32_t);
 	void mark_return_id (uint32_t);
 	void mark_insert_id (uint32_t);
+	void unmark_send_id (uint32_t);
+	void unmark_return_id (uint32_t);
+	void unmark_insert_id (uint32_t);
 
 	/* s/w "RAID" management */
 
@@ -1294,9 +1297,6 @@ class Session : public PBD::StatefulDestructible, public PBD::ScopedConnectionLi
 	boost::dynamic_bitset<uint32_t> return_bitset;
 	boost::dynamic_bitset<uint32_t> insert_bitset;
 
-	void add_processor (Processor *);
-	void remove_processor (Processor *);
-
 	/* S/W RAID */
 
 	struct space_and_path {