diff options
| author | Carl Hetherington <carl@carlh.net> | 2009-01-14 23:54:46 +0000 |
|---|---|---|
| committer | Carl Hetherington <carl@carlh.net> | 2009-01-14 23:54:46 +0000 |
| commit | bed58e9f372a6c2671e9f072c19a4c77d06c4292 (patch) | |
| tree | 7e146669f680c6275f92687b8434fafef4689ded /gtk2_ardour/mixer_strip.cc | |
| parent | ad9913538e903359de700432459f559794f2e80d (diff) | |
Make Bundles work a bit better. A few include optimisations.
git-svn-id: svn://localhost/ardour2/branches/3.0@4408 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/mixer_strip.cc')
| -rw-r--r-- | gtk2_ardour/mixer_strip.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/gtk2_ardour/mixer_strip.cc b/gtk2_ardour/mixer_strip.cc index 6c006d7e24..6f591bc6c0 100644 --- a/gtk2_ardour/mixer_strip.cc +++ b/gtk2_ardour/mixer_strip.cc @@ -43,7 +43,6 @@ #include <ardour/processor.h> #include <ardour/profile.h> #include <ardour/ladspa_plugin.h> -#include <ardour/auto_bundle.h> #include <ardour/user_bundle.h> #include "ardour_ui.h" @@ -758,7 +757,7 @@ MixerStrip::add_bundle_to_input_menu (boost::shared_ptr<Bundle> b, std::vector<b MenuList& citems = input_menu.items(); - if (b->nchannels() == _route->n_inputs()) { + if (b->nchannels() == _route->n_inputs().get (b->type ())) { citems.push_back (CheckMenuElem (b->name(), bind (mem_fun(*this, &MixerStrip::bundle_input_chosen), b))); @@ -781,7 +780,7 @@ MixerStrip::add_bundle_to_output_menu (boost::shared_ptr<Bundle> b, std::vector< return; } - if (b->nchannels() == _route->n_outputs()) { + if (b->nchannels() == _route->n_outputs().get (b->type ())) { MenuList& citems = output_menu.items(); citems.push_back (CheckMenuElem (b->name(), bind (mem_fun(*this, &MixerStrip::bundle_output_chosen), b))); |