Part 1 of loading 2.X sessions; some things work, some things don't, hacks a-plenty.

LOADING 2.X SESSIONS WITH THIS COMMIT IN PLACE WILL (PROBABLY) CORRUPT THE .ardour FILE,
MAKING THE SESSION UNLOADABLE ON 2.X AND LOSING INFORMATION.

So don't do that unless you make a backup of the session file first.



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

1 files changed, 6 insertions, 4 deletions

diff --git a/libs/ardour/panner.cc b/libs/ardour/panner.cc
index a8d30954cc..993cbe39f8 100644
--- a/libs/ardour/panner.cc
+++ b/libs/ardour/panner.cc
@@ -162,7 +162,7 @@ StreamPanner::set_position (float xpos, float ypos, float zpos, bool link_call)
 }
 
 int
-StreamPanner::set_state (const XMLNode& node)
+StreamPanner::set_state (const XMLNode& node, int version)
 {
 	const XMLProperty* prop;
 	XMLNodeConstIterator iter;
@@ -485,7 +485,7 @@ EqualPowerStereoPanner::state (bool /*full_state*/)
 }
 
 int
-EqualPowerStereoPanner::set_state (const XMLNode& node)
+EqualPowerStereoPanner::set_state (const XMLNode& node, int version)
 {
 	const XMLProperty* prop;
 	float pos;
@@ -673,7 +673,7 @@ Multi2dPanner::state (bool /*full_state*/)
 }
 
 int
-Multi2dPanner::set_state (const XMLNode& node)
+Multi2dPanner::set_state (const XMLNode& node, int version)
 {
 	const XMLProperty* prop;
 	float newx,newy;
@@ -830,6 +830,8 @@ Panner::reset (uint32_t nouts, uint32_t npans)
 	bool changed = false;
 	bool do_not_and_did_not_need_panning = ((nouts < 2) && (outputs.size() < 2));
 
+	cout << "Reset panner for " << nouts << " " << npans << "\n";
+
 	/* if new and old config don't need panning, or if
 	   the config hasn't changed, we're done.
 	*/
@@ -1085,7 +1087,7 @@ Panner::state (bool full)
 }
 
 int
-Panner::set_state (const XMLNode& node)
+Panner::set_state (const XMLNode& node, int version)
 {
 	XMLNodeList nlist;
 	XMLNodeConstIterator niter;