From 5b90aab4d8837316fc5835083999747c56f24d58 Mon Sep 17 00:00:00 2001
From: Carl Hetherington <carl@carlh.net>
Date: Fri, 3 Sep 2010 15:34:09 +0000
Subject: Fix restore of sends from session files for both 2.X and 3.0
 sessions.  Fixes #3433.

git-svn-id: svn://localhost/ardour2/branches/3.0@7739 d708f5d6-7413-0410-9779-e7cbd77b26cf
---
 libs/ardour/ardour/io_processor.h | 3 +++
 libs/ardour/ardour/processor.h    | 5 ++---
 libs/ardour/ardour/route.h        | 3 +--
 libs/ardour/ardour/send.h         | 2 ++
 4 files changed, 8 insertions(+), 5 deletions(-)

(limited to 'libs/ardour/ardour')

diff --git a/libs/ardour/ardour/io_processor.h b/libs/ardour/ardour/io_processor.h
index 2acf7337a7..7d1854ced0 100644
--- a/libs/ardour/ardour/io_processor.h
+++ b/libs/ardour/ardour/io_processor.h
@@ -80,6 +80,9 @@ class IOProcessor : public Processor
   private:
 	/* disallow copy construction */
 	IOProcessor (const IOProcessor&);
+
+	virtual int set_state_2X (const XMLNode &, int);
+	
 	bool _own_input;
 	bool _own_output;
 
diff --git a/libs/ardour/ardour/processor.h b/libs/ardour/ardour/processor.h
index fe1b4bb6cd..09505e3f72 100644
--- a/libs/ardour/ardour/processor.h
+++ b/libs/ardour/ardour/processor.h
@@ -99,6 +99,8 @@ class Processor : public SessionObject, public Automatable, public Latent
 	PBD::Signal2<void,ChanCount,ChanCount> ConfigurationChanged;
 
 protected:
+	virtual int set_state_2X (const XMLNode&, int version);
+	
 	int       _pending_active;
 	bool      _active;
 	bool      _next_ab_is_active;
@@ -107,9 +109,6 @@ protected:
 	ChanCount _configured_output;
 	bool      _display_to_user;
 	bool      _pre_fader;
-
-private:
-	int set_state_2X (const XMLNode&, int version);
 };
 
 } // namespace ARDOUR
diff --git a/libs/ardour/ardour/route.h b/libs/ardour/ardour/route.h
index c4ea180954..b49cb77788 100644
--- a/libs/ardour/ardour/route.h
+++ b/libs/ardour/ardour/route.h
@@ -477,8 +477,7 @@ class Route : public SessionObject, public Automatable, public RouteGroupMember,
 
 	int configure_processors_unlocked (ProcessorStreams*);
 
-	bool add_processor_from_xml (const XMLNode&, ProcessorList::iterator iter);	
-	bool add_processor_from_xml_2X (const XMLNode&, int, ProcessorList::iterator iter);	
+	bool add_processor_from_xml_2X (const XMLNode&, int);
 
 	void placement_range (Placement p, ProcessorList::iterator& start, ProcessorList::iterator& end);
 
diff --git a/libs/ardour/ardour/send.h b/libs/ardour/ardour/send.h
index af806b3c1f..29b6dcbf64 100644
--- a/libs/ardour/ardour/send.h
+++ b/libs/ardour/ardour/send.h
@@ -77,6 +77,8 @@ class Send : public Delivery
 	/* disallow copy construction */
 	Send (const Send&);
 
+	int set_state_2X (XMLNode const &, int);
+
 	uint32_t  _bitslot;
 };
 
-- 
cgit v1.2.3