diff options
| author | GZharun <grygoriiz@wavesglobal.com> | 2015-03-23 13:51:45 +0200 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2015-06-29 14:18:12 -0400 |
| commit | 67d42d9b280315b76dcc32ffb96d6457eee15586 (patch) | |
| tree | aa9d78678ad259abc0f720ba0c444f4126a3509d /libs/ardour/io.cc | |
| parent | 939e7c2d526de66b080f2018d422b0ea5a569d78 (diff) | |
[Summary] Do not restore routes connection using XML IO state for TracksLive, because this is redundant for TracksLive.
Moreover if the device is changed XML state of IO contains port names of the old device which causes attempts to connect to non existent ports.
[Reviewed by] Paul Davis
Diffstat (limited to 'libs/ardour/io.cc')
| -rw-r--r-- | libs/ardour/io.cc | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/libs/ardour/io.cc b/libs/ardour/io.cc index 69f7c9053e..b72c29aae1 100644 --- a/libs/ardour/io.cc +++ b/libs/ardour/io.cc @@ -39,6 +39,7 @@ #include "ardour/debug.h" #include "ardour/io.h" #include "ardour/port.h" +#include "ardour/profile.h" #include "ardour/route.h" #include "ardour/session.h" #include "ardour/user_bundle.h" @@ -692,13 +693,16 @@ IO::set_state_2X (const XMLNode& node, int version, bool in) int IO::connecting_became_legal () { - int ret; + int ret = 0; assert (pending_state_node); connection_legal_c.disconnect (); - ret = make_connections (*pending_state_node, pending_state_node_version, pending_state_node_in); + // it's not required for TracksLive, as long as TracksLive's session does all the cennections when it's being loaded + if (!Profile->get_trx() ) { + ret = make_connections (*pending_state_node, pending_state_node_version, pending_state_node_in); + } delete pending_state_node; pending_state_node = 0; |