From 79f91c7a205d981d2b8cc15e32a6da02d8423065 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Thu, 15 Oct 2009 00:57:55 +0000 Subject: 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 --- libs/ardour/ardour/panner.h | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'libs/ardour/ardour/panner.h') diff --git a/libs/ardour/ardour/panner.h b/libs/ardour/ardour/panner.h index c211aafc8c..6a435ec235 100644 --- a/libs/ardour/ardour/panner.h +++ b/libs/ardour/ardour/panner.h @@ -36,7 +36,6 @@ namespace ARDOUR { -class Route; class Session; class Panner; class BufferSet; @@ -74,7 +73,7 @@ class StreamPanner : public sigc::trackable, public PBD::Stateful sigc::signal Changed; /* for position */ sigc::signal StateChanged; /* for mute */ - int set_state (const XMLNode&); + int set_state (const XMLNode&, int version = 3000); virtual XMLNode& state (bool full_state) = 0; Panner & get_parent() { return parent; } @@ -149,9 +148,9 @@ class EqualPowerStereoPanner : public BaseStereoPanner static StreamPanner* factory (Panner&, Evoral::Parameter param); static std::string name; - XMLNode& state (bool full_state); - XMLNode& get_state (void); - int set_state (const XMLNode&); + XMLNode& state (bool full_state); + XMLNode& get_state (void); + int set_state (const XMLNode&, int version = 3000); private: void update (); @@ -172,7 +171,7 @@ class Multi2dPanner : public StreamPanner XMLNode& state (bool full_state); XMLNode& get_state (void); - int set_state (const XMLNode&); + int set_state (const XMLNode&, int version = 3000); /* old school automation loading */ @@ -229,7 +228,7 @@ public: XMLNode& get_state (void); XMLNode& state (bool full); - int set_state (const XMLNode&); + int set_state (const XMLNode&, int version = 3000); static bool equivalent (pan_t a, pan_t b) { return fabsf (a - b) < 0.002; // about 1 degree of arc for a stereo panner -- cgit v1.2.3