diff options
Diffstat (limited to 'gtk2_ardour')
| -rw-r--r-- | gtk2_ardour/ardour_ui.h | 1 | ||||
| -rw-r--r-- | gtk2_ardour/automation_controller.cc | 2 | ||||
| -rw-r--r-- | gtk2_ardour/bundle_manager.cc | 2 | ||||
| -rw-r--r-- | gtk2_ardour/mixer_strip.cc | 5 |
4 files changed, 6 insertions, 4 deletions
diff --git a/gtk2_ardour/ardour_ui.h b/gtk2_ardour/ardour_ui.h index baa8224cf8..5bb8691ac4 100644 --- a/gtk2_ardour/ardour_ui.h +++ b/gtk2_ardour/ardour_ui.h @@ -37,6 +37,7 @@ #include <libgnomecanvasmm/canvas.h> #include <pbd/xml++.h> +#include <pbd/controllable.h> #include <gtkmm/box.h> #include <gtkmm/frame.h> #include <gtkmm/label.h> diff --git a/gtk2_ardour/automation_controller.cc b/gtk2_ardour/automation_controller.cc index c9e04bf70b..6f62608f0a 100644 --- a/gtk2_ardour/automation_controller.cc +++ b/gtk2_ardour/automation_controller.cc @@ -21,6 +21,8 @@ #include <pbd/error.h> #include "ardour/automation_list.h" #include "ardour/automation_control.h" +#include "ardour/event_type_map.h" +#include "ardour/automatable.h" #include "ardour_ui.h" #include "utils.h" #include "automation_controller.h" diff --git a/gtk2_ardour/bundle_manager.cc b/gtk2_ardour/bundle_manager.cc index 916413d835..e4e848557e 100644 --- a/gtk2_ardour/bundle_manager.cc +++ b/gtk2_ardour/bundle_manager.cc @@ -61,7 +61,7 @@ BundleEditorMatrix::get_state (int r, std::string const & p) const uint32_t BundleEditorMatrix::n_rows () const { - return _bundle->nchannels ().n_total(); + return _bundle->nchannels (); } uint32_t 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))); |