diff options
| author | Carl Hetherington <carl@carlh.net> | 2009-02-02 22:17:06 +0000 |
|---|---|---|
| committer | Carl Hetherington <carl@carlh.net> | 2009-02-02 22:17:06 +0000 |
| commit | 54afc94e62b6397286d545744cea796f93f4b5f9 (patch) | |
| tree | 589c5eedfb63e96da410801e1f8cc3d3d4c06cd1 /libs/ardour/ardour/bundle.h | |
| parent | 633629b2b1590b687a79990fe1fb0df35301e709 (diff) | |
Re-enable creation of stereo bundles for system IO, so that the mixer strip
connection menus for stereo tracks are populated again.
Also enable disconnection via these menus.
git-svn-id: svn://localhost/ardour2/branches/3.0@4481 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/ardour/bundle.h')
| -rw-r--r-- | libs/ardour/ardour/bundle.h | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/libs/ardour/ardour/bundle.h b/libs/ardour/ardour/bundle.h index 7e5cac6bf1..005e86842f 100644 --- a/libs/ardour/ardour/bundle.h +++ b/libs/ardour/ardour/bundle.h @@ -28,6 +28,8 @@ #include "ardour/data_type.h" namespace ARDOUR { + +class AudioEngine; /** A set of `channels', each of which is associated with 0 or more ports. * Each channel has a name which can be anything useful. @@ -96,7 +98,9 @@ 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>); + void add_channels_from_bundle (boost::shared_ptr<Bundle>); + void connect (boost::shared_ptr<Bundle>, AudioEngine &); + void disconnect (boost::shared_ptr<Bundle>, AudioEngine &); /** Set the name. * @param n New name. @@ -143,7 +147,7 @@ class Bundle : public sigc::trackable int parse_io_string (std::string const &, std::vector<std::string> &); std::string _name; - ARDOUR::DataType _type; + DataType _type; bool _ports_are_inputs; }; @@ -153,7 +157,7 @@ struct BundleChannel { BundleChannel () : channel (0) {} - BundleChannel (boost::shared_ptr<ARDOUR::Bundle> b, uint32_t c) + BundleChannel (boost::shared_ptr<Bundle> b, uint32_t c) : bundle (b), channel (c) {} bool operator== (BundleChannel const& other) const { @@ -164,13 +168,10 @@ struct BundleChannel return bundle != other.bundle || channel != other.channel; } - boost::shared_ptr<ARDOUR::Bundle> bundle; + boost::shared_ptr<Bundle> bundle; uint32_t channel; }; - - - } #endif /* __ardour_bundle_h__ */ |