diff options
author | Julien "_FrnchFrgg_" RIVAUD <frnchfrgg@free.fr> | 2017-08-23 22:03:20 +0200 |
---|---|---|
committer | Julien "_FrnchFrgg_" RIVAUD <frnchfrgg@free.fr> | 2017-08-23 23:31:28 +0200 |
commit | 1aa3a3f4d6cd0c75c0f346bde37813fff3f5eedb (patch) | |
tree | 8023def4031a94da4a291cd2f1f51c7677e60651 | |
parent | 8cb40ab25b3de8d52a1e205cc5e34b9b9c4e91f3 (diff) |
Make IO::connect_ports_to_bundle able to partially connect
Forward the optional |allow_partial| boolean to |Bundle::connect|.
-rw-r--r-- | libs/ardour/ardour/io.h | 1 | ||||
-rw-r--r-- | libs/ardour/io.cc | 10 |
2 files changed, 9 insertions, 2 deletions
diff --git a/libs/ardour/ardour/io.h b/libs/ardour/ardour/io.h index ae3865168e..ce47ec54a5 100644 --- a/libs/ardour/ardour/io.h +++ b/libs/ardour/ardour/io.h @@ -98,6 +98,7 @@ class LIBARDOUR_API IO : public SessionObject, public Latent int ensure_io (ChanCount cnt, bool clear, void *src); int connect_ports_to_bundle (boost::shared_ptr<Bundle>, bool exclusive, void *); + int connect_ports_to_bundle (boost::shared_ptr<Bundle>, bool, bool, void *); int disconnect_ports_from_bundle (boost::shared_ptr<Bundle>, void *); BundleList bundles_connected (); diff --git a/libs/ardour/io.cc b/libs/ardour/io.cc index a3549f0a1d..40c4d854f3 100644 --- a/libs/ardour/io.cc +++ b/libs/ardour/io.cc @@ -1299,7 +1299,13 @@ IO::latency () const } int -IO::connect_ports_to_bundle (boost::shared_ptr<Bundle> c, bool exclusive, void* src) +IO::connect_ports_to_bundle (boost::shared_ptr<Bundle> c, bool exclusive, void* src) { + return connect_ports_to_bundle(c, exclusive, false, src); +} + +int +IO::connect_ports_to_bundle (boost::shared_ptr<Bundle> c, bool exclusive, + bool allow_partial, void* src) { BLOCK_PROCESS_CALLBACK (); @@ -1312,7 +1318,7 @@ IO::connect_ports_to_bundle (boost::shared_ptr<Bundle> c, bool exclusive, void* } } - c->connect (_bundle, _session.engine()); + c->connect (_bundle, _session.engine(), allow_partial); /* If this is a UserBundle, make a note of what we've done */ |