diff options
author | Carl Hetherington <carl@carlh.net> | 2009-01-27 18:36:40 +0000 |
---|---|---|
committer | Carl Hetherington <carl@carlh.net> | 2009-01-27 18:36:40 +0000 |
commit | 948034f15aa8716fc87cc0efefe6152d27de5552 (patch) | |
tree | 9d4cd49f8da82942367d73ba5fa2465c7c3d7599 /libs/ardour/ardour | |
parent | b2e163a410a62a20e982b3baac0cf65e611acbce (diff) |
Make track sends etc. appear in the same bundle as the track. Tidy up bundle channel naming a bit.
git-svn-id: svn://localhost/ardour2/branches/3.0@4448 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/ardour')
-rw-r--r-- | libs/ardour/ardour/bundle.h | 4 | ||||
-rw-r--r-- | libs/ardour/ardour/io.h | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/libs/ardour/ardour/bundle.h b/libs/ardour/ardour/bundle.h index f9971ddf15..ac5928fc34 100644 --- a/libs/ardour/ardour/bundle.h +++ b/libs/ardour/ardour/bundle.h @@ -24,6 +24,7 @@ #include <vector> #include <glibmm/thread.h> #include <sigc++/signal.h> +#include <boost/shared_ptr.hpp> #include "ardour/data_type.h" namespace ARDOUR { @@ -72,6 +73,8 @@ class Bundle : public sigc::trackable */ Bundle (std::string const & n, DataType t, bool i = true) : _name (n), _type (t), _ports_are_inputs (i) {} + Bundle (boost::shared_ptr<Bundle>); + virtual ~Bundle() {} /** @return Number of channels that this Bundle has */ @@ -93,6 +96,7 @@ class Bundle : public sigc::trackable bool offers_port_alone (std::string) const; void remove_channel (uint32_t); void remove_channels (); + void add_channels_from_bundle (boost::shared_ptr<ARDOUR::Bundle>); /** Set the name. * @param n New name. diff --git a/libs/ardour/ardour/io.h b/libs/ardour/ardour/io.h index 1918a9a41a..2d5b55c502 100644 --- a/libs/ardour/ardour/io.h +++ b/libs/ardour/ardour/io.h @@ -380,6 +380,7 @@ class IO : public SessionObject, public AutomatableControls, public Latent void create_bundles_for_inputs_and_outputs (); void setup_bundles_for_inputs_and_outputs (); + std::string bundle_channel_name (uint32_t, uint32_t) const; }; } // namespace ARDOUR |