diff options
author | Carl Hetherington <carl@carlh.net> | 2009-10-15 00:57:55 +0000 |
---|---|---|
committer | Carl Hetherington <carl@carlh.net> | 2009-10-15 00:57:55 +0000 |
commit | 79f91c7a205d981d2b8cc15e32a6da02d8423065 (patch) | |
tree | f27dd8319522be8321720ef3560c2207dd56b158 /libs/ardour/ardour/io.h | |
parent | 09efd82c6aea973e3eb9497ef2b09256bf5ddde4 (diff) |
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
Diffstat (limited to 'libs/ardour/ardour/io.h')
-rw-r--r-- | libs/ardour/ardour/io.h | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/libs/ardour/ardour/io.h b/libs/ardour/ardour/io.h index 0be1493dbb..9a13ced942 100644 --- a/libs/ardour/ardour/io.h +++ b/libs/ardour/ardour/io.h @@ -137,7 +137,8 @@ class IO : public SessionObject, public Latent virtual XMLNode& state (bool full); XMLNode& get_state (void); - int set_state (const XMLNode&); + int set_state (const XMLNode&, int version = 3000); + int set_state_2X (const XMLNode&, int, bool); static int disable_connecting (void); static int enable_connecting (void); @@ -156,6 +157,8 @@ class IO : public SessionObject, public Latent static bool connecting_legal; XMLNode *pending_state_node; + int pending_state_node_version; + bool pending_state_node_in; /* three utility functions - this just seems to be simplest place to put them */ @@ -203,9 +206,11 @@ class IO : public SessionObject, public Latent void bundle_changed (Bundle::Change); - int get_port_counts (const XMLNode& node, ChanCount& n, boost::shared_ptr<Bundle>& c); - int create_ports (const XMLNode&); - int make_connections (const XMLNode&); + int get_port_counts (const XMLNode& node, int version, ChanCount& n, boost::shared_ptr<Bundle>& c); + int get_port_counts_2X (const XMLNode& node, int version, ChanCount& n, boost::shared_ptr<Bundle>& c); + int create_ports (const XMLNode&, int version); + int make_connections (const XMLNode&, int, bool); + int make_connections_2X (const XMLNode &, int, bool); boost::shared_ptr<Bundle> find_possible_bundle (const std::string &desired_name); |