Merge remote-tracking branch 'remotes/origin/cairocanvas' into windows
[ardour.git] / gtk2_ardour / midi_time_axis.cc
index 2f809ce2e151d5b5cea59d24b4c78616cdfd66ec..4884dc34f38c929f9b3b3edf9600925994bfd2e9 100644 (file)
@@ -26,6 +26,7 @@
 #include <sigc++/bind.h>
 
 #include "pbd/error.h"
+#include "pbd/ffs.h"
 #include "pbd/stl_delete.h"
 #include "pbd/whitespace.h"
 #include "pbd/basename.h"
 #include "gtkmm2ext/bindable_button.h"
 #include "gtkmm2ext/utils.h"
 
-#include "ardour/file_source.h"
-#include "ardour/midi_playlist.h"
-#include "ardour/midi_diskstream.h"
+#include "ardour/event_type_map.h"
 #include "ardour/midi_patch_manager.h"
+#include "ardour/midi_playlist.h"
+#include "ardour/midi_region.h"
 #include "ardour/midi_source.h"
-#include "ardour/processor.h"
-#include "ardour/ladspa_plugin.h"
-#include "ardour/location.h"
+#include "ardour/midi_track.h"
+#include "ardour/operations.h"
 #include "ardour/playlist.h"
+#include "ardour/region.h"
 #include "ardour/region_factory.h"
+#include "ardour/route.h"
 #include "ardour/session.h"
-#include "ardour/session_playlist.h"
-#include "ardour/tempo.h"
-#include "ardour/utils.h"
-#include "ardour/operations.h"
-
-#include "midi++/names.h"
+#include "ardour/session_object.h"
+#include "ardour/source.h"
+#include "ardour/track.h"
+#include "ardour/types.h"
 
-#include "add_midi_cc_track_dialog.h"
 #include "ardour_ui.h"
+#include "ardour_button.h"
 #include "automation_line.h"
 #include "automation_time_axis.h"
-#include "canvas-note-event.h"
-#include "canvas_impl.h"
-#include "crossfade_view.h"
 #include "editor.h"
 #include "enums.h"
 #include "ghostregion.h"
 #include "gui_thread.h"
 #include "keyboard.h"
+#include "midi_channel_selector.h"
 #include "midi_scroomer.h"
 #include "midi_streamview.h"
 #include "midi_region_view.h"
@@ -82,8 +80,8 @@
 #include "rgb_macros.h"
 #include "selection.h"
 #include "step_editor.h"
-#include "simplerect.h"
 #include "utils.h"
+#include "note_base.h"
 
 #include "ardour/midi_track.h"
 
@@ -96,13 +94,12 @@ using namespace Gtkmm2ext;
 using namespace Editing;
 
 // Minimum height at which a control is displayed
-static const uint32_t MIDI_CONTROLS_BOX_MIN_HEIGHT = 162;
-static const uint32_t KEYBOARD_MIN_HEIGHT = 140;
+static const uint32_t MIDI_CONTROLS_BOX_MIN_HEIGHT = 140;
+static const uint32_t KEYBOARD_MIN_HEIGHT = 130;
 
-MidiTimeAxisView::MidiTimeAxisView (PublicEditor& ed, Session* sess,
-               boost::shared_ptr<Route> rt, Canvas& canvas)
+MidiTimeAxisView::MidiTimeAxisView (PublicEditor& ed, Session* sess, ArdourCanvas::Canvas& canvas)
        : AxisView(sess) // virtually inherited
-       , RouteTimeAxisView(ed, sess, rt, canvas)
+       , RouteTimeAxisView(ed, sess, canvas)
        , _ignore_signals(false)
        , _range_scroomer(0)
        , _piano_roll_header(0)
@@ -113,20 +110,50 @@ MidiTimeAxisView::MidiTimeAxisView (PublicEditor& ed, Session* sess,
        , _meter_color_mode_item(0)
        , _channel_color_mode_item(0)
        , _track_color_mode_item(0)
+       , _channel_selector (0)
        , _step_edit_item (0)
-       , _midi_thru_item (0)
-       , default_channel_menu (0)
        , controller_menu (0)
-        , _step_editor (0)
+       , _step_editor (0)
 {
-       subplugin_menu.set_name ("ArdourContextMenu");
+}
 
+void
+MidiTimeAxisView::set_route (boost::shared_ptr<Route> rt)
+{
+       _route = rt;
+       
        _view = new MidiStreamView (*this);
 
+       if (is_track ()) {
+               _piano_roll_header = new PianoRollHeader(*midi_view());
+               _range_scroomer = new MidiScroomer(midi_view()->note_range_adjustment);
+               _range_scroomer->DoubleClicked.connect (
+                       sigc::bind (sigc::mem_fun(*this, &MidiTimeAxisView::set_note_range),
+                                   MidiStreamView::ContentsRange, false));
+       }
+
+       /* This next call will result in our height being set up, so it must come after
+          the creation of the piano roll / range scroomer as their visibility is set up
+          when our height is.
+       */
+       RouteTimeAxisView::set_route (rt);
+
+       _view->apply_color (_color, StreamView::RegionColor);
+
+       subplugin_menu.set_name ("ArdourContextMenu");
+
+       if (!gui_property ("note-range-min").empty ()) {
+               midi_view()->apply_note_range (atoi (gui_property ("note-range-min").c_str()),
+                                              atoi (gui_property ("note-range-max").c_str()),
+                                              true);
+       }
+
+       midi_view()->NoteRangeChanged.connect (
+               sigc::mem_fun (*this, &MidiTimeAxisView::note_range_changed));
+       _view->ContentsHeightChanged.connect (
+               sigc::mem_fun (*this, &MidiTimeAxisView::contents_height_changed));
+
        ignore_toggle = false;
-       
-       mute_button->set_active (false);
-       solo_button->set_active (false);
 
        if (is_midi_track()) {
                controls_ebox.set_name ("MidiTimeAxisViewControlsBaseUnselected");
@@ -139,37 +166,67 @@ MidiTimeAxisView::MidiTimeAxisView (PublicEditor& ed, Session* sess,
 
        processors_changed (RouteProcessorChange ());
 
-       ensure_xml_node ();
-
-       set_state (*xml_node, Stateful::loading_state_version);
-
-       _route->processors_changed.connect (*this, invalidator (*this), ui_bind (&MidiTimeAxisView::processors_changed, this, _1), gui_context());
+       _route->processors_changed.connect (*this, invalidator (*this),
+                                           boost::bind (&MidiTimeAxisView::processors_changed, this, _1),
+                                           gui_context());
 
        if (is_track()) {
-               _piano_roll_header = new PianoRollHeader(*midi_view());
-
-               _piano_roll_header->AddNoteSelection.connect (sigc::mem_fun (*this, &MidiTimeAxisView::add_note_selection));
-               _piano_roll_header->ExtendNoteSelection.connect (sigc::mem_fun (*this, &MidiTimeAxisView::extend_note_selection));
-               _piano_roll_header->ToggleNoteSelection.connect (sigc::mem_fun (*this, &MidiTimeAxisView::toggle_note_selection));
-
-               _range_scroomer = new MidiScroomer(midi_view()->note_range_adjustment);
+               _piano_roll_header->SetNoteSelection.connect (
+                       sigc::mem_fun (*this, &MidiTimeAxisView::set_note_selection));
+               _piano_roll_header->AddNoteSelection.connect (
+                       sigc::mem_fun (*this, &MidiTimeAxisView::add_note_selection));
+               _piano_roll_header->ExtendNoteSelection.connect (
+                       sigc::mem_fun (*this, &MidiTimeAxisView::extend_note_selection));
+               _piano_roll_header->ToggleNoteSelection.connect (
+                       sigc::mem_fun (*this, &MidiTimeAxisView::toggle_note_selection));
 
                /* Suspend updates of the StreamView during scroomer drags to speed things up */
-               _range_scroomer->DragStarting.connect (sigc::mem_fun (*midi_view(), &MidiStreamView::suspend_updates));
-               _range_scroomer->DragFinishing.connect (sigc::mem_fun (*midi_view(), &MidiStreamView::resume_updates));
-
-               controls_hbox.pack_start(*_range_scroomer);
-               controls_hbox.pack_start(*_piano_roll_header);
+               _range_scroomer->DragStarting.connect (
+                       sigc::mem_fun (*midi_view(), &MidiStreamView::suspend_updates));
+               _range_scroomer->DragFinishing.connect (
+                       sigc::mem_fun (*midi_view(), &MidiStreamView::resume_updates));
+
+               /* Put the scroomer and the keyboard in a VBox with a padding
+                  label so that they can be reduced in height for stacked-view
+                  tracks.
+               */
+               VBox* v = manage (new VBox);
+               HBox* h = manage (new HBox);
+               h->pack_start (*_range_scroomer);
+               h->pack_start (*_piano_roll_header);
+               v->pack_start (*h, false, false);
+               v->pack_start (*manage (new Label ("")), true, true);
+               v->show ();
+               h->show ();
+               controls_hbox.pack_start(*v, false, false);
 
                controls_ebox.set_name ("MidiTrackControlsBaseUnselected");
                controls_base_selected_name = "MidiTrackControlsBaseSelected";
                controls_base_unselected_name = "MidiTrackControlsBaseUnselected";
 
-               midi_view()->NoteRangeChanged.connect (sigc::mem_fun(*this, &MidiTimeAxisView::update_range));
+               midi_view()->NoteRangeChanged.connect (
+                       sigc::mem_fun(*this, &MidiTimeAxisView::update_range));
 
                /* ask for notifications of any new RegionViews */
-               _view->RegionViewAdded.connect (sigc::mem_fun(*this, &MidiTimeAxisView::region_view_added));
-               
+               _view->RegionViewAdded.connect (
+                       sigc::mem_fun(*this, &MidiTimeAxisView::region_view_added));
+
+               midi_track()->PlaybackChannelModeChanged.connect (*this, invalidator (*this),
+                                                                 boost::bind (&MidiTimeAxisView::playback_channel_mode_changed, this),
+                                                                 gui_context());
+               midi_track()->PlaybackChannelMaskChanged.connect (*this, invalidator (*this),
+                                                                 boost::bind (&MidiTimeAxisView::playback_channel_mode_changed, this),
+                                                                 gui_context());
+               midi_track()->CaptureChannelModeChanged.connect (*this, invalidator (*this),
+                                                                 boost::bind (&MidiTimeAxisView::capture_channel_mode_changed, this),
+                                                                 gui_context());
+               midi_track()->CaptureChannelMaskChanged.connect (*this, invalidator (*this),
+                                                                 boost::bind (&MidiTimeAxisView::capture_channel_mode_changed, this),
+                                                                 gui_context());
+
+               playback_channel_mode_changed ();
+               capture_channel_mode_changed ();
+
                if (!_editor.have_idled()) {
                        /* first idle will do what we need */
                } else {
@@ -177,55 +234,115 @@ MidiTimeAxisView::MidiTimeAxisView (PublicEditor& ed, Session* sess,
                }
        }
 
-       HBox* midi_controls_hbox = manage(new HBox());
-
        MIDI::Name::MidiPatchManager& patch_manager = MIDI::Name::MidiPatchManager::instance();
 
        MIDI::Name::MasterDeviceNames::Models::const_iterator m = patch_manager.all_models().begin();
        for (; m != patch_manager.all_models().end(); ++m) {
-               _model_selector.append_text(m->c_str());
+               _midnam_model_selector.append_text(m->c_str());
        }
 
-       _model_selector.signal_changed().connect(sigc::mem_fun(*this, &MidiTimeAxisView::model_changed));
+       if (gui_property (X_("midnam-model-name")).empty()) {
+               set_gui_property (X_("midnam-model-name"), "Generic");
+       }
+
+       if (gui_property (X_("midnam-custom-device-mode")).empty()) {
+               boost::shared_ptr<MIDI::Name::MasterDeviceNames> device_names = get_device_names();
+               if (device_names) {
+                       set_gui_property (X_("midnam-custom-device-mode"),
+                                         *device_names->custom_device_mode_names().begin());
+               }
+       }
+
+       _midnam_model_selector.set_active_text (gui_property (X_("midnam-model-name")));
+       _midnam_custom_device_mode_selector.set_active_text (gui_property (X_("midnam-custom-device-mode")));
+
+       ARDOUR_UI::instance()->set_tip (_midnam_model_selector, _("External MIDI Device"));
+       ARDOUR_UI::instance()->set_tip (_midnam_custom_device_mode_selector, _("External Device Mode"));
+
+       _midi_controls_box.set_homogeneous(false);
+       _midi_controls_box.set_border_width (10);
+
+       _channel_status_box.set_homogeneous (false);
+       _channel_status_box.set_spacing (6);
+       
+       _channel_selector_button.set_label (_("Chns"));
+       ARDOUR_UI::instance()->set_tip (_channel_selector_button, _("Click to edit channel settings"));
+       
+       /* fixed sized labels to prevent silly nonsense (though obviously,
+        * they cause their own too)
+        */
 
-       _custom_device_mode_selector.signal_changed().connect(
-                       sigc::mem_fun(*this, &MidiTimeAxisView::custom_device_mode_changed));
+       _playback_channel_status.set_size_request (65, -1);
+       _capture_channel_status.set_size_request (60, -1);
 
-       // TODO: persist the choice
-       // this initializes the comboboxes and sends out the signal
-       _model_selector.set_active(0);
+       _channel_status_box.pack_start (_playback_channel_status, false, false);
+       _channel_status_box.pack_start (_capture_channel_status, false, false);
+       _channel_status_box.pack_start (_channel_selector_button, false, false);
+       _channel_status_box.show_all ();
+
+       _channel_selector_button.signal_clicked().connect (sigc::mem_fun (*this, &MidiTimeAxisView::toggle_channel_selector));
+       
+       _midi_controls_box.pack_start (_channel_status_box, false, false, 10);
 
-       midi_controls_hbox->pack_start(_channel_selector, true, false);
        if (!patch_manager.all_models().empty()) {
-               _midi_controls_box.pack_start(_model_selector, true, false);
-               _midi_controls_box.pack_start(_custom_device_mode_selector, true, false);
-       }
 
-       _midi_controls_box.pack_start(*midi_controls_hbox, true, true);
+               _midnam_model_selector.set_size_request(22, 30);
+               _midnam_model_selector.set_border_width(2);
+               _midnam_model_selector.show ();
+               _midi_controls_box.pack_start (_midnam_model_selector);
 
-       controls_vbox.pack_start(_midi_controls_box, false, false);
+               _midnam_custom_device_mode_selector.set_size_request(10, 30);
+               _midnam_custom_device_mode_selector.set_border_width(2);
+               _midnam_custom_device_mode_selector.show ();
 
-       // restore channel selector settings
-       _channel_selector.set_channel_mode(midi_track()->get_channel_mode(), midi_track()->get_channel_mask());
-       _channel_selector.mode_changed.connect(
-               sigc::mem_fun(*midi_track(), &MidiTrack::set_channel_mode));
-       _channel_selector.mode_changed.connect(
-               sigc::mem_fun(*this, &MidiTimeAxisView::set_channel_mode));
+               _midi_controls_box.pack_start (_midnam_custom_device_mode_selector);
+       } 
 
-       XMLProperty *prop;
-       if ((prop = xml_node->property ("color-mode")) != 0) {
-               _color_mode = ColorMode (string_2_enum(prop->value(), _color_mode));
-               if (_color_mode == ChannelColors) {
-                       _channel_selector.set_channel_colors(CanvasNoteEvent::midi_channel_colors);
+       model_changed();
+       custom_device_mode_changed();
+
+       _midnam_model_selector.signal_changed().connect(
+               sigc::mem_fun(*this, &MidiTimeAxisView::model_changed));
+       _midnam_custom_device_mode_selector.signal_changed().connect(
+               sigc::mem_fun(*this, &MidiTimeAxisView::custom_device_mode_changed));
+
+       controls_vbox.pack_start(_midi_controls_box, false, false);
+
+       const string color_mode = gui_property ("color-mode");
+       if (!color_mode.empty()) {
+               _color_mode = ColorMode (string_2_enum(color_mode, _color_mode));
+               if (_channel_selector && _color_mode == ChannelColors) {
+                       _channel_selector->set_channel_colors(NoteBase::midi_channel_colors);
                }
        }
 
-       if ((prop = xml_node->property ("note-mode")) != 0) {
-               _note_mode = NoteMode (string_2_enum(prop->value(), _note_mode));
+       set_color_mode (_color_mode, true, false);
+
+       const string note_mode = gui_property ("note-mode");
+       if (!note_mode.empty()) {
+               _note_mode = NoteMode (string_2_enum (note_mode, _note_mode));
                if (_percussion_mode_item) {
                        _percussion_mode_item->set_active (_note_mode == Percussive);
                }
        }
+
+       /* Look for any GUI object state nodes that represent automation children
+        * that should exist, and create the children.
+        */
+
+       const list<string> gui_ids = gui_object_state().all_ids ();
+       for (list<string>::const_iterator i = gui_ids.begin(); i != gui_ids.end(); ++i) {
+               PBD::ID route_id;
+               bool has_parameter;
+               Evoral::Parameter parameter (0, 0, 0);
+
+               bool const p = AutomationTimeAxisView::parse_state_id (
+                       *i, route_id, has_parameter, parameter);
+               if (p && route_id == _route->id () && has_parameter) {
+                       const std::string& visible = gui_object_state().get_string (*i, X_("visible"));
+                       create_automation_child (parameter, string_is_affirmative (visible));
+               }
+       }
 }
 
 void
@@ -238,6 +355,8 @@ MidiTimeAxisView::first_idle ()
 
 MidiTimeAxisView::~MidiTimeAxisView ()
 {
+       delete _channel_selector;
+
        delete _piano_roll_header;
        _piano_roll_header = 0;
 
@@ -245,53 +364,68 @@ MidiTimeAxisView::~MidiTimeAxisView ()
        _range_scroomer = 0;
 
        delete controller_menu;
-        delete _step_editor;
+       delete _step_editor;
 }
 
 void
 MidiTimeAxisView::enter_internal_edit_mode ()
 {
-        if (midi_view()) {
-                midi_view()->enter_internal_edit_mode ();
-        } 
+       if (midi_view()) {
+               midi_view()->enter_internal_edit_mode ();
+       }
 }
 
 void
 MidiTimeAxisView::leave_internal_edit_mode ()
 {
-        if (midi_view()) {
-                midi_view()->leave_internal_edit_mode ();
-        }
+       if (midi_view()) {
+               midi_view()->leave_internal_edit_mode ();
+       }
 }
 
 void
 MidiTimeAxisView::check_step_edit ()
 {
        ensure_step_editor ();
-        _step_editor->check_step_edit ();
+       _step_editor->check_step_edit ();
 }
 
-void 
+void
 MidiTimeAxisView::model_changed()
 {
-       std::list<std::string> device_modes = MIDI::Name::MidiPatchManager::instance()
-               .custom_device_mode_names_by_model(_model_selector.get_active_text());
+       const Glib::ustring model = _midnam_model_selector.get_active_text();
+       set_gui_property (X_("midnam-model-name"), model);
 
-       _custom_device_mode_selector.clear_items();
+       const std::list<std::string> device_modes = MIDI::Name::MidiPatchManager::instance()
+               .custom_device_mode_names_by_model(model);
+
+       _midnam_custom_device_mode_selector.clear_items();
 
        for (std::list<std::string>::const_iterator i = device_modes.begin();
-                       i != device_modes.end(); ++i) {
-               cerr << "found custom device mode " << *i << " thread_id: " << pthread_self() << endl;
-               _custom_device_mode_selector.append_text(*i);
+            i != device_modes.end(); ++i) {
+               _midnam_custom_device_mode_selector.append_text(*i);
        }
 
-       _custom_device_mode_selector.set_active(0);
+       _midnam_custom_device_mode_selector.set_active(0);
+       
+       _route->instrument_info().set_external_instrument (
+               _midnam_model_selector.get_active_text(),
+               _midnam_custom_device_mode_selector.get_active_text());
+
+       // Rebuild controller menu
+       _controller_menu_map.clear ();
+       delete controller_menu;
+       controller_menu = 0;
+       build_automation_action_menu(false);
 }
 
-void MidiTimeAxisView::custom_device_mode_changed()
+void
+MidiTimeAxisView::custom_device_mode_changed()
 {
-       _midi_patch_settings_changed.emit(_model_selector.get_active_text(),
-                       _custom_device_mode_selector.get_active_text());
+       const Glib::ustring mode = _midnam_custom_device_mode_selector.get_active_text();
+       set_gui_property (X_("midnam-custom-device-mode"), mode);
+       _route->instrument_info().set_external_instrument (
+               _midnam_model_selector.get_active_text(), mode);
 }
 
 MidiStreamView*
@@ -300,47 +434,37 @@ MidiTimeAxisView::midi_view()
        return dynamic_cast<MidiStreamView*>(_view);
 }
 
-guint32
-MidiTimeAxisView::show_at (double y, int& nth, Gtk::VBox *parent)
-{
-       ensure_xml_node ();
-       xml_node->add_property ("shown-editor", "yes");
-
-       guint32 ret = TimeAxisView::show_at (y, nth, parent);
-       return ret;
-}
-
-void
-MidiTimeAxisView::hide ()
-{
-       ensure_xml_node ();
-       xml_node->add_property ("shown-editor", "no");
-
-       TimeAxisView::hide ();
-}
-
 void
 MidiTimeAxisView::set_height (uint32_t h)
 {
-       RouteTimeAxisView::set_height (h);
-
-       if (height >= MIDI_CONTROLS_BOX_MIN_HEIGHT) {
-               _midi_controls_box.show_all ();
+       if (h >= MIDI_CONTROLS_BOX_MIN_HEIGHT) {
+               _midi_controls_box.show ();
        } else {
                _midi_controls_box.hide();
        }
-
-       if (height >= KEYBOARD_MIN_HEIGHT) {
-               if (is_track() && _range_scroomer)
+       
+       if (h >= KEYBOARD_MIN_HEIGHT) {
+               if (is_track() && _range_scroomer) {
                        _range_scroomer->show();
-               if (is_track() && _piano_roll_header)
+               }
+               if (is_track() && _piano_roll_header) {
                        _piano_roll_header->show();
+               }
        } else {
-               if (is_track() && _range_scroomer)
+               if (is_track() && _range_scroomer) {
                        _range_scroomer->hide();
-               if (is_track() && _piano_roll_header)
+               }
+               if (is_track() && _piano_roll_header) {
                        _piano_roll_header->hide();
+               }
        }
+
+       /* We need to do this after changing visibility of our stuff, as it will
+          eventually trigger a call to Editor::reset_controls_layout_width(),
+          which needs to know if we have just shown or hidden a scroomer /
+          piano roll.
+       */
+       RouteTimeAxisView::set_height (h);
 }
 
 void
@@ -355,65 +479,44 @@ MidiTimeAxisView::append_extra_display_menu_items ()
        MenuList& range_items = range_menu->items();
        range_menu->set_name ("ArdourContextMenu");
 
-       range_items.push_back (MenuElem (_("Show Full Range"), sigc::bind (
-                       sigc::mem_fun(*this, &MidiTimeAxisView::set_note_range),
-                       MidiStreamView::FullRange)));
-
-       range_items.push_back (MenuElem (_("Fit Contents"), sigc::bind (
-                       sigc::mem_fun(*this, &MidiTimeAxisView::set_note_range),
-                       MidiStreamView::ContentsRange)));
-
-       items.push_back (MenuElem (_("Note range"), *range_menu));
-       items.push_back (MenuElem (_("Note mode"), *build_note_mode_menu()));
-       items.push_back (MenuElem (_("Default Channel"), *build_def_channel_menu()));
-
-       items.push_back (CheckMenuElem (_("MIDI Thru"), sigc::mem_fun(*this, &MidiTimeAxisView::toggle_midi_thru)));
-       _midi_thru_item = dynamic_cast<CheckMenuItem*>(&items.back());
-
-       items.push_back (SeparatorElem ());
-}
-
-Gtk::Menu*
-MidiTimeAxisView::build_def_channel_menu ()
-{
-       using namespace Menu_Helpers;
-
-       default_channel_menu = manage (new Menu ());
+       range_items.push_back (
+               MenuElem (_("Show Full Range"),
+                         sigc::bind (sigc::mem_fun(*this, &MidiTimeAxisView::set_note_range), 
+                                     MidiStreamView::FullRange, true)));
 
-       uint8_t defchn = midi_track()->default_channel();
-       MenuList& def_channel_items = default_channel_menu->items();
-       RadioMenuItem* item;
-       RadioMenuItem::Group dc_group;
+       range_items.push_back (
+               MenuElem (_("Fit Contents"),
+                         sigc::bind (sigc::mem_fun(*this, &MidiTimeAxisView::set_note_range),
+                                     MidiStreamView::ContentsRange, true)));
 
-       for (int i = 0; i < 16; ++i) {
-               char buf[4];
-               snprintf (buf, sizeof (buf), "%d", i+1);
+       items.push_back (MenuElem (_("Note Range"), *range_menu));
+       items.push_back (MenuElem (_("Note Mode"), *build_note_mode_menu()));
+       items.push_back (MenuElem (_("Channel Selector"),
+                                  sigc::mem_fun(*this, &MidiTimeAxisView::toggle_channel_selector)));
 
-               def_channel_items.push_back (RadioMenuElem (dc_group, buf,
-                                                           sigc::bind (sigc::mem_fun (*this, &MidiTimeAxisView::set_default_channel), i)));
-               item = dynamic_cast<RadioMenuItem*>(&def_channel_items.back());
-               item->set_active ((i == defchn));
+       color_mode_menu = build_color_mode_menu();
+       if (color_mode_menu) {
+               items.push_back (MenuElem (_("Color Mode"), *color_mode_menu));
        }
-
-       return default_channel_menu;
+       
+       items.push_back (SeparatorElem ());
 }
 
 void
-MidiTimeAxisView::set_default_channel (int chn)
+MidiTimeAxisView::toggle_channel_selector ()
 {
-       midi_track()->set_default_channel (chn);
-}
+       if (!_channel_selector) {
+               _channel_selector = new MidiChannelSelectorWindow (midi_track());
 
-void
-MidiTimeAxisView::toggle_midi_thru ()
-{
-       if (!_midi_thru_item) {
-               return;
-       }
+               if (_color_mode == ChannelColors) {
+                       _channel_selector->set_channel_colors(NoteBase::midi_channel_colors);
+               } else {
+                       _channel_selector->set_default_channel_color ();
+               }
 
-       bool view_yn = _midi_thru_item->get_active();
-       if (view_yn != midi_track()->midi_thru()) {
-               midi_track()->set_midi_thru (view_yn);
+               _channel_selector->show_all ();
+       } else {
+               _channel_selector->cycle_visibility ();
        }
 }
 
@@ -428,7 +531,7 @@ MidiTimeAxisView::build_automation_action_menu (bool for_selection)
           controller_menu's gobj, meaning that it can't be reattached
           below.  See bug #3134.
        */
-          
+
        if (controller_menu) {
                detach_menu (*controller_menu);
        }
@@ -437,49 +540,56 @@ MidiTimeAxisView::build_automation_action_menu (bool for_selection)
        RouteTimeAxisView::build_automation_action_menu (for_selection);
 
        MenuList& automation_items = automation_action_menu->items();
-       
-       uint16_t selected_channels = _channel_selector.get_selected_channels();
+
+       uint16_t selected_channels = midi_track()->get_playback_channel_mask();
 
        if (selected_channels !=  0) {
 
                automation_items.push_back (SeparatorElem());
 
-               /* these 2 MIDI "command" types are semantically more like automation than note data,
-                  but they are not MIDI controllers. We give them special status in this menu, since
-                  they will not show up in the controller list and anyone who actually knows
-                  something about MIDI (!) would not expect to find them there.
+               /* these 2 MIDI "command" types are semantically more like automation
+                  than note data, but they are not MIDI controllers. We give them
+                  special status in this menu, since they will not show up in the
+                  controller list and anyone who actually knows something about MIDI
+                  (!) would not expect to find them there.
                */
 
-               add_channel_command_menu_item (automation_items, _("Bender"), MidiPitchBenderAutomation, 0);
-               automation_items.back().set_sensitive (!for_selection || _editor.get_selection().tracks.size() == 1);
-               add_channel_command_menu_item (automation_items, _("Pressure"), MidiChannelPressureAutomation, 0);
-               automation_items.back().set_sensitive (!for_selection || _editor.get_selection().tracks.size() == 1);
-               
-               /* now all MIDI controllers. Always offer the possibility that we will rebuild the controllers menu
-                  since it might need to be updated after a channel mode change or other change. Also detach it
-                  first in case it has been used anywhere else.
+               add_channel_command_menu_item (
+                       automation_items, _("Bender"), MidiPitchBenderAutomation, 0);
+               automation_items.back().set_sensitive (
+                       !for_selection || _editor.get_selection().tracks.size() == 1);
+               add_channel_command_menu_item (
+                       automation_items, _("Pressure"), MidiChannelPressureAutomation, 0);
+               automation_items.back().set_sensitive (
+                       !for_selection || _editor.get_selection().tracks.size() == 1);
+
+               /* now all MIDI controllers. Always offer the possibility that we will
+                  rebuild the controllers menu since it might need to be updated after
+                  a channel mode change or other change. Also detach it first in case
+                  it has been used anywhere else.
                */
-               
+
                build_controller_menu ();
-               
+
                automation_items.push_back (SeparatorElem());
                automation_items.push_back (MenuElem (_("Controllers"), *controller_menu));
-               automation_items.back().set_sensitive (!for_selection || _editor.get_selection().tracks.size() == 1);
+               automation_items.back().set_sensitive (
+                       !for_selection || _editor.get_selection().tracks.size() == 1);
        } else {
-               automation_items.push_back (MenuElem (string_compose ("<i>%1</i>", _("No MIDI Channels selected"))));
+               automation_items.push_back (
+                       MenuElem (string_compose ("<i>%1</i>", _("No MIDI Channels selected"))));
                dynamic_cast<Label*> (automation_items.back().get_child())->set_use_markup (true);
        }
-               
 }
 
 void
 MidiTimeAxisView::change_all_channel_tracks_visibility (bool yn, Evoral::Parameter param)
 {
-       uint16_t selected_channels = _channel_selector.get_selected_channels();
-       
+       const uint16_t selected_channels = midi_track()->get_playback_channel_mask();
+
        for (uint8_t chn = 0; chn < 16; chn++) {
                if (selected_channels & (0x0001 << chn)) {
-                       
+
                        Evoral::Parameter fully_qualified_param (param.type(), chn, param.id());
                        Gtk::CheckMenuItem* menu = automation_child_menu_item (fully_qualified_param);
 
@@ -491,16 +601,20 @@ MidiTimeAxisView::change_all_channel_tracks_visibility (bool yn, Evoral::Paramet
 }
 
 void
-MidiTimeAxisView::add_channel_command_menu_item (Menu_Helpers::MenuList& items, const string& label, AutomationType auto_type, uint8_t cmd)
+MidiTimeAxisView::add_channel_command_menu_item (Menu_Helpers::MenuList& items,
+                                                 const string&           label,
+                                                 AutomationType          auto_type,
+                                                 uint8_t                 cmd)
 {
        using namespace Menu_Helpers;
 
-       /* count the number of selected channels because we will build a different menu structure if there is more than 1 selected.
+       /* count the number of selected channels because we will build a different menu
+          structure if there is more than 1 selected.
         */
 
-       uint16_t selected_channels = _channel_selector.get_selected_channels();
+       const uint16_t selected_channels = midi_track()->get_playback_channel_mask();
        int chn_cnt = 0;
-       
+
        for (uint8_t chn = 0; chn < 16; chn++) {
                if (selected_channels & (0x0001 << chn)) {
                        if (++chn_cnt > 1) {
@@ -508,78 +622,82 @@ MidiTimeAxisView::add_channel_command_menu_item (Menu_Helpers::MenuList& items,
                        }
                }
        }
-       
+
        if (chn_cnt > 1) {
-               
+
                /* multiple channels - create a submenu, with 1 item per channel */
-               
+
                Menu* chn_menu = manage (new Menu);
                MenuList& chn_items (chn_menu->items());
                Evoral::Parameter param_without_channel (auto_type, 0, cmd);
 
                /* add a couple of items to hide/show all of them */
 
-               chn_items.push_back (MenuElem (_("Hide all channels"),
-                                                   sigc::bind (sigc::mem_fun (*this, &MidiTimeAxisView::change_all_channel_tracks_visibility), 
-                                                               false, param_without_channel)));
-               chn_items.push_back (MenuElem (_("Show all channels"),
-                                                   sigc::bind (sigc::mem_fun (*this, &MidiTimeAxisView::change_all_channel_tracks_visibility), 
-                                                               true, param_without_channel)));
-               
+               chn_items.push_back (
+                       MenuElem (_("Hide all channels"),
+                                 sigc::bind (sigc::mem_fun (*this, &MidiTimeAxisView::change_all_channel_tracks_visibility),
+                                             false, param_without_channel)));
+               chn_items.push_back (
+                       MenuElem (_("Show all channels"),
+                                 sigc::bind (sigc::mem_fun (*this, &MidiTimeAxisView::change_all_channel_tracks_visibility),
+                                             true, param_without_channel)));
+
                for (uint8_t chn = 0; chn < 16; chn++) {
                        if (selected_channels & (0x0001 << chn)) {
-                               
+
                                /* for each selected channel, add a menu item for this controller */
-                               
+
                                Evoral::Parameter fully_qualified_param (auto_type, chn, cmd);
-                               chn_items.push_back (CheckMenuElem (string_compose (_("Channel %1"), chn+1),
-                                                                   sigc::bind (sigc::mem_fun (*this, &RouteTimeAxisView::toggle_automation_track),
-                                                                               fully_qualified_param)));
-                               
+                               chn_items.push_back (
+                                       CheckMenuElem (string_compose (_("Channel %1"), chn+1),
+                                                      sigc::bind (sigc::mem_fun (*this, &RouteTimeAxisView::toggle_automation_track),
+                                                                  fully_qualified_param)));
+
                                boost::shared_ptr<AutomationTimeAxisView> track = automation_child (fully_qualified_param);
                                bool visible = false;
-                               
+
                                if (track) {
                                        if (track->marked_for_display()) {
                                                visible = true;
                                        }
                                }
 
-                               CheckMenuItem* cmi = static_cast<CheckMenuItem*>(&chn_items.back());
+                               Gtk::CheckMenuItem* cmi = static_cast<Gtk::CheckMenuItem*>(&chn_items.back());
                                _channel_command_menu_map[fully_qualified_param] = cmi;
                                cmi->set_active (visible);
                        }
                }
-               
+
                /* now create an item in the parent menu that has the per-channel list as a submenu */
-                       
+
                items.push_back (MenuElem (label, *chn_menu));
-               
+
        } else {
-               
+
                /* just one channel - create a single menu item for this command+channel combination*/
-               
+
                for (uint8_t chn = 0; chn < 16; chn++) {
                        if (selected_channels & (0x0001 << chn)) {
-                               
+
                                Evoral::Parameter fully_qualified_param (auto_type, chn, cmd);
-                               items.push_back (CheckMenuElem (label,
-                                                               sigc::bind (sigc::mem_fun (*this, &RouteTimeAxisView::toggle_automation_track),
-                                                                           fully_qualified_param)));
-                               
+                               items.push_back (
+                                       CheckMenuElem (label,
+                                                      sigc::bind (sigc::mem_fun (*this, &RouteTimeAxisView::toggle_automation_track),
+                                                                  fully_qualified_param)));
+
                                boost::shared_ptr<AutomationTimeAxisView> track = automation_child (fully_qualified_param);
                                bool visible = false;
-                               
+
                                if (track) {
                                        if (track->marked_for_display()) {
                                                visible = true;
                                        }
                                }
-                               
-                               CheckMenuItem* cmi = static_cast<CheckMenuItem*>(&items.back());
+
+                               Gtk::CheckMenuItem* cmi = static_cast<Gtk::CheckMenuItem*>(&items.back());
                                _channel_command_menu_map[fully_qualified_param] = cmi;
                                cmi->set_active (visible);
-                               
+
                                /* one channel only */
                                break;
                        }
@@ -587,30 +705,160 @@ MidiTimeAxisView::add_channel_command_menu_item (Menu_Helpers::MenuList& items,
        }
 }
 
+/** Add a single menu item for a controller on one channel. */
+void
+MidiTimeAxisView::add_single_channel_controller_item(Menu_Helpers::MenuList& ctl_items,
+                                                     int                     ctl,
+                                                     const std::string&      name)
+{
+       using namespace Menu_Helpers;
+
+       const uint16_t selected_channels = midi_track()->get_playback_channel_mask();
+       for (uint8_t chn = 0; chn < 16; chn++) {
+               if (selected_channels & (0x0001 << chn)) {
+
+                       Evoral::Parameter fully_qualified_param (MidiCCAutomation, chn, ctl);
+                       ctl_items.push_back (
+                               CheckMenuElem (
+                                       string_compose ("<b>%1</b>: %2 [%3]", ctl, name, int (chn)),
+                                       sigc::bind (
+                                               sigc::mem_fun (*this, &RouteTimeAxisView::toggle_automation_track),
+                                               fully_qualified_param)));
+                       dynamic_cast<Label*> (ctl_items.back().get_child())->set_use_markup (true);
+
+                       boost::shared_ptr<AutomationTimeAxisView> track = automation_child (
+                               fully_qualified_param);
+
+                       bool visible = false;
+                       if (track) {
+                               if (track->marked_for_display()) {
+                                       visible = true;
+                               }
+                       }
+
+                       Gtk::CheckMenuItem* cmi = static_cast<Gtk::CheckMenuItem*>(&ctl_items.back());
+                       _controller_menu_map[fully_qualified_param] = cmi;
+                       cmi->set_active (visible);
+
+                       /* one channel only */
+                       break;
+               }
+       }
+}
+
+/** Add a submenu with 1 item per channel for a controller on many channels. */
+void
+MidiTimeAxisView::add_multi_channel_controller_item(Menu_Helpers::MenuList& ctl_items,
+                                                    int                     ctl,
+                                                    const std::string&      name)
+{
+       using namespace Menu_Helpers;
+
+       const uint16_t selected_channels = midi_track()->get_playback_channel_mask();
+
+       Menu* chn_menu = manage (new Menu);
+       MenuList& chn_items (chn_menu->items());
+
+       /* add a couple of items to hide/show this controller on all channels */
+
+       Evoral::Parameter param_without_channel (MidiCCAutomation, 0, ctl);
+       chn_items.push_back (
+               MenuElem (_("Hide all channels"),
+                         sigc::bind (sigc::mem_fun (*this, &MidiTimeAxisView::change_all_channel_tracks_visibility),
+                                     false, param_without_channel)));
+       chn_items.push_back (
+               MenuElem (_("Show all channels"),
+                         sigc::bind (sigc::mem_fun (*this, &MidiTimeAxisView::change_all_channel_tracks_visibility),
+                                     true, param_without_channel)));
+
+       for (uint8_t chn = 0; chn < 16; chn++) {
+               if (selected_channels & (0x0001 << chn)) {
+
+                       /* for each selected channel, add a menu item for this controller */
+
+                       Evoral::Parameter fully_qualified_param (MidiCCAutomation, chn, ctl);
+                       chn_items.push_back (
+                               CheckMenuElem (string_compose (_("Channel %1"), chn+1),
+                                              sigc::bind (sigc::mem_fun (*this, &RouteTimeAxisView::toggle_automation_track),
+                                                          fully_qualified_param)));
+
+                       boost::shared_ptr<AutomationTimeAxisView> track = automation_child (
+                               fully_qualified_param);
+                       bool visible = false;
+
+                       if (track) {
+                               if (track->marked_for_display()) {
+                                       visible = true;
+                               }
+                       }
+
+                       Gtk::CheckMenuItem* cmi = static_cast<Gtk::CheckMenuItem*>(&chn_items.back());
+                       _controller_menu_map[fully_qualified_param] = cmi;
+                       cmi->set_active (visible);
+               }
+       }
+
+       /* add the per-channel menu to the list of controllers, with the name of the controller */
+       ctl_items.push_back (MenuElem (string_compose ("<b>%1</b>: %2", ctl, name),
+                                      *chn_menu));
+       dynamic_cast<Label*> (ctl_items.back().get_child())->set_use_markup (true);
+}
+
+boost::shared_ptr<MIDI::Name::CustomDeviceMode>
+MidiTimeAxisView::get_device_mode()
+{
+       using namespace MIDI::Name;
+
+       boost::shared_ptr<MasterDeviceNames> device_names = get_device_names();
+       if (!device_names) {
+               return boost::shared_ptr<MIDI::Name::CustomDeviceMode>();
+       }
+
+       return device_names->custom_device_mode_by_name(
+               gui_property (X_("midnam-custom-device-mode")));
+}
+
+boost::shared_ptr<MIDI::Name::MasterDeviceNames>
+MidiTimeAxisView::get_device_names()
+{
+       using namespace MIDI::Name;
+
+       const std::string model = gui_property (X_("midnam-model-name"));
+
+       boost::shared_ptr<MIDINameDocument> midnam = MidiPatchManager::instance()
+               .document_by_model(model);
+       if (midnam) {
+               return midnam->master_device_names(model);
+       } else {
+               return boost::shared_ptr<MasterDeviceNames>();
+       }
+}
+
 void
 MidiTimeAxisView::build_controller_menu ()
 {
        using namespace Menu_Helpers;
 
        if (controller_menu) {
-               /* it exists and has not been invalidated by a channel mode change, so just return it */
+               /* it exists and has not been invalidated by a channel mode change */
                return;
        }
 
        controller_menu = new Menu; // explicitly managed by us
        MenuList& items (controller_menu->items());
 
-       /* create several "top level" menu items for sets of controllers (16 at a time), and populate each one with a submenu 
-          for each controller+channel combination covering the currently selected channels for this track
+       /* create several "top level" menu items for sets of controllers (16 at a
+          time), and populate each one with a submenu for each controller+channel
+          combination covering the currently selected channels for this track
        */
 
-       uint16_t selected_channels = _channel_selector.get_selected_channels();
+       const uint16_t selected_channels = midi_track()->get_playback_channel_mask();
 
-       /* count the number of selected channels because we will build a different menu structure if there is more than 1 selected.
-        */
+       /* count the number of selected channels because we will build a different menu
+          structure if there is more than 1 selected.
+       */
 
        int chn_cnt = 0;
-       
        for (uint8_t chn = 0; chn < 16; chn++) {
                if (selected_channels & (0x0001 << chn)) {
                        if (++chn_cnt > 1) {
@@ -618,110 +866,79 @@ MidiTimeAxisView::build_controller_menu ()
                        }
                }
        }
-       
-       /* loop over all 127 MIDI controllers, in groups of 16; except don't offer
-          bank select controllers, as they are handled by the `patch' code */
-
-       for (int i = 0; i < 127; i += 16) {
-
-               Menu* ctl_menu = manage (new Menu);
-               MenuList& ctl_items (ctl_menu->items());
-
-
-               /* for each controller, consider whether to create a submenu or a single item */
-
-               for (int ctl = i; ctl < i+16; ++ctl) {
-
-                       if (ctl == MIDI_CTL_MSB_BANK || ctl == MIDI_CTL_LSB_BANK) {
-                               continue;
-                       }
-
-                       if (chn_cnt > 1) {
 
-                               /* multiple channels - create a submenu, with 1 item per channel */
+       using namespace MIDI::Name;
+       boost::shared_ptr<MasterDeviceNames> device_names = get_device_names();
 
-                               Menu* chn_menu = manage (new Menu);
-                               MenuList& chn_items (chn_menu->items());
+       if (device_names && !device_names->controls().empty()) {
+               /* Controllers names available in midnam file, generate fancy menu */
+               unsigned n_items  = 0;
+               unsigned n_groups = 0;
 
-                               /* add a couple of items to hide/show this controller on all channels */
+               /* TODO: This is not correct, should look up the currently applicable ControlNameList
+                  and only build a menu for that one. */
+               for (MasterDeviceNames::ControlNameLists::const_iterator l = device_names->controls().begin();
+                    l != device_names->controls().end(); ++l) {
+                       boost::shared_ptr<ControlNameList> name_list = l->second;
+                       Menu*                              ctl_menu  = NULL;
+                       
+                       for (ControlNameList::Controls::const_iterator c = name_list->controls().begin();
+                            c != name_list->controls().end();) {
+                               const uint16_t ctl = c->second->number();
+                               if (ctl != MIDI_CTL_MSB_BANK && ctl != MIDI_CTL_LSB_BANK) {
+                                       /* Skip bank select controllers since they're handled specially */
+                                       if (n_items == 0) {
+                                               /* Create a new submenu */
+                                               ctl_menu = manage (new Menu);
+                                       }
                                
-                               Evoral::Parameter param_without_channel (MidiCCAutomation, 0, ctl);
-                               chn_items.push_back (MenuElem (_("Hide all channels"),
-                                                                   sigc::bind (sigc::mem_fun (*this, &MidiTimeAxisView::change_all_channel_tracks_visibility), 
-                                                                               false, param_without_channel)));
-                               chn_items.push_back (MenuElem (_("Show all channels"),
-                                                                   sigc::bind (sigc::mem_fun (*this, &MidiTimeAxisView::change_all_channel_tracks_visibility), 
-                                                                               true, param_without_channel)));
-               
-                               for (uint8_t chn = 0; chn < 16; chn++) {
-                                       if (selected_channels & (0x0001 << chn)) {
-                                               
-                                               /* for each selected channel, add a menu item for this controller */
-                                               
-                                               Evoral::Parameter fully_qualified_param (MidiCCAutomation, chn, ctl);
-                                               chn_items.push_back (CheckMenuElem (string_compose (_("Channel %1"), chn+1),
-                                                                                   sigc::bind (sigc::mem_fun (*this, &RouteTimeAxisView::toggle_automation_track),
-                                                                                               fully_qualified_param)));
-
-                                               boost::shared_ptr<AutomationTimeAxisView> track = automation_child (fully_qualified_param);
-                                               bool visible = false;
-                                               
-                                               if (track) {
-                                                       if (track->marked_for_display()) {
-                                                               visible = true;
-                                                       }
-                                               }
-                                               
-                                               CheckMenuItem* cmi = static_cast<CheckMenuItem*>(&chn_items.back());
-                                               _controller_menu_map[fully_qualified_param] = cmi;
-                                               cmi->set_active (visible);
+                                       MenuList& ctl_items (ctl_menu->items());
+                                       if (chn_cnt > 1) {
+                                               add_multi_channel_controller_item(ctl_items, ctl, c->second->name());
+                                       } else {
+                                               add_single_channel_controller_item(ctl_items, ctl, c->second->name());
                                        }
                                }
-                               
-                               /* add the per-channel menu to the list of controllers, with the name of the controller */
-                               ctl_items.push_back (MenuElem (string_compose ("<b>%1</b>: %2", ctl, midi_name (ctl)), *chn_menu));
-                               dynamic_cast<Label*> (ctl_items.back().get_child())->set_use_markup (true);
-                                     
-                       } else {
 
-                               /* just one channel - create a single menu item for this ctl+channel combination*/
-
-                               for (uint8_t chn = 0; chn < 16; chn++) {
-                                       if (selected_channels & (0x0001 << chn)) {
-                                               
-                                               Evoral::Parameter fully_qualified_param (MidiCCAutomation, chn, ctl);
-                                               ctl_items.push_back (
-                                                       CheckMenuElem (
-                                                               string_compose ("<b>%1</b>: %2 [%3]", ctl, midi_name (ctl), int (chn)),
-                                                               sigc::bind (sigc::mem_fun (*this, &RouteTimeAxisView::toggle_automation_track),
-                                                                           fully_qualified_param)
-                                                               )
-                                                       );
-                                               dynamic_cast<Label*> (ctl_items.back().get_child())->set_use_markup (true);
-                                               
-                                               boost::shared_ptr<AutomationTimeAxisView> track = automation_child (fully_qualified_param);
-                                               bool visible = false;
-                                               
-                                               if (track) {
-                                                       if (track->marked_for_display()) {
-                                                               visible = true;
-                                                       }
-                                               }
-                                               
-                                               CheckMenuItem* cmi = static_cast<CheckMenuItem*>(&ctl_items.back());
-                                               _controller_menu_map[fully_qualified_param] = cmi;
-                                               cmi->set_active (visible);
-                                               
-                                               /* one channel only */
-                                               break;
-                                       }
+                               ++c;
+                               if (ctl_menu && (++n_items == 16 || c == name_list->controls().end())) {
+                                       /* Submenu has 16 items or we're done, add it to controller menu and reset */
+                                       items.push_back(
+                                               MenuElem(string_compose(_("Controllers %1-%2"),
+                                                                       (16 * n_groups), (16 * n_groups) + n_items - 1),
+                                                        *ctl_menu));
+                                       ctl_menu = NULL;
+                                       n_items  = 0;
+                                       ++n_groups;
                                }
                        }
                }
-                       
-               /* add the menu for this block of controllers to the overall controller menu */
+       } else {
+               /* No controllers names, generate generic numeric menu */
+               for (int i = 0; i < 127; i += 16) {
+                       Menu*     ctl_menu = manage (new Menu);
+                       MenuList& ctl_items (ctl_menu->items());
+
+                       for (int ctl = i; ctl < i+16; ++ctl) {
+                               if (ctl == MIDI_CTL_MSB_BANK || ctl == MIDI_CTL_LSB_BANK) {
+                                       /* Skip bank select controllers since they're handled specially */
+                                       continue;
+                               }
 
-               items.push_back (MenuElem (string_compose (_("Controllers %1-%2"), i, i+15), *ctl_menu));
+                               if (chn_cnt > 1) {
+                                       add_multi_channel_controller_item(
+                                               ctl_items, ctl, string_compose(_("Controller %1"), ctl));
+                               } else {
+                                       add_single_channel_controller_item(
+                                               ctl_items, ctl, string_compose(_("Controller %1"), ctl));
+                               }
+                       }
+
+                       /* Add submenu for this block of controllers to controller menu */
+                       items.push_back (
+                               MenuElem (string_compose (_("Controllers %1-%2"), i, i + 15),
+                                         *ctl_menu));
+               }
        }
 }
 
@@ -735,13 +952,17 @@ MidiTimeAxisView::build_note_mode_menu()
        mode_menu->set_name ("ArdourContextMenu");
 
        RadioMenuItem::Group mode_group;
-       items.push_back (RadioMenuElem (mode_group, _("Sustained"),
-                               sigc::bind (sigc::mem_fun (*this, &MidiTimeAxisView::set_note_mode), Sustained)));
+       items.push_back (
+               RadioMenuElem (mode_group,_("Sustained"),
+                              sigc::bind (sigc::mem_fun (*this, &MidiTimeAxisView::set_note_mode),
+                                          Sustained, true)));
        _note_mode_item = dynamic_cast<RadioMenuItem*>(&items.back());
        _note_mode_item->set_active(_note_mode == Sustained);
 
-       items.push_back (RadioMenuElem (mode_group, _("Percussive"),
-                               sigc::bind (sigc::mem_fun (*this, &MidiTimeAxisView::set_note_mode), Percussive)));
+       items.push_back (
+               RadioMenuElem (mode_group, _("Percussive"),
+                              sigc::bind (sigc::mem_fun (*this, &MidiTimeAxisView::set_note_mode),
+                                          Percussive, true)));
        _percussion_mode_item = dynamic_cast<RadioMenuItem*>(&items.back());
        _percussion_mode_item->set_active(_note_mode == Percussive);
 
@@ -758,18 +979,24 @@ MidiTimeAxisView::build_color_mode_menu()
        mode_menu->set_name ("ArdourContextMenu");
 
        RadioMenuItem::Group mode_group;
-       items.push_back (RadioMenuElem (mode_group, _("Meter Colors"),
-                               sigc::bind (sigc::mem_fun (*this, &MidiTimeAxisView::set_color_mode), MeterColors)));
+       items.push_back (
+               RadioMenuElem (mode_group, _("Meter Colors"),
+                              sigc::bind (sigc::mem_fun (*this, &MidiTimeAxisView::set_color_mode),
+                                          MeterColors, false, true, true)));
        _meter_color_mode_item = dynamic_cast<RadioMenuItem*>(&items.back());
        _meter_color_mode_item->set_active(_color_mode == MeterColors);
 
-       items.push_back (RadioMenuElem (mode_group, _("Channel Colors"),
-                               sigc::bind (sigc::mem_fun (*this, &MidiTimeAxisView::set_color_mode), ChannelColors)));
+       items.push_back (
+               RadioMenuElem (mode_group, _("Channel Colors"),
+                              sigc::bind (sigc::mem_fun (*this, &MidiTimeAxisView::set_color_mode),
+                                          ChannelColors, false, true, true)));
        _channel_color_mode_item = dynamic_cast<RadioMenuItem*>(&items.back());
        _channel_color_mode_item->set_active(_color_mode == ChannelColors);
 
-       items.push_back (RadioMenuElem (mode_group, _("Track Color"),
-                               sigc::bind (sigc::mem_fun (*this, &MidiTimeAxisView::set_color_mode), TrackColor)));
+       items.push_back (
+               RadioMenuElem (mode_group, _("Track Color"),
+                              sigc::bind (sigc::mem_fun (*this, &MidiTimeAxisView::set_color_mode),
+                                          TrackColor, false, true, true)));
        _channel_color_mode_item = dynamic_cast<RadioMenuItem*>(&items.back());
        _channel_color_mode_item->set_active(_color_mode == TrackColor);
 
@@ -777,46 +1004,67 @@ MidiTimeAxisView::build_color_mode_menu()
 }
 
 void
-MidiTimeAxisView::set_note_mode(NoteMode mode)
+MidiTimeAxisView::set_note_mode(NoteMode mode, bool apply_to_selection)
 {
-       if (_note_mode != mode || midi_track()->note_mode() != mode) {
-               _note_mode = mode;
-               midi_track()->set_note_mode(mode);
-               xml_node->add_property ("note-mode", enum_2_string(_note_mode));
-               _view->redisplay_track();
+       if (apply_to_selection) {
+               _editor.get_selection().tracks.foreach_midi_time_axis (
+                       boost::bind (&MidiTimeAxisView::set_note_mode, _1, mode, false));
+       } else {
+               if (_note_mode != mode || midi_track()->note_mode() != mode) {
+                       _note_mode = mode;
+                       midi_track()->set_note_mode(mode);
+                       set_gui_property ("note-mode", enum_2_string(_note_mode));
+                       _view->redisplay_track();
+               }
        }
 }
 
 void
-MidiTimeAxisView::set_color_mode(ColorMode mode)
+MidiTimeAxisView::set_color_mode (ColorMode mode, bool force, bool redisplay, bool apply_to_selection)
 {
-       if (_color_mode != mode) {
-               if (mode == ChannelColors) {
-                       _channel_selector.set_channel_colors(CanvasNoteEvent::midi_channel_colors);
-               } else {
-                       _channel_selector.set_default_channel_color();
+       if (apply_to_selection) {
+               _editor.get_selection().tracks.foreach_midi_time_axis (
+                       boost::bind (&MidiTimeAxisView::set_color_mode, _1, mode, force, redisplay, false));
+       } else {
+               if (_color_mode == mode && !force) {
+                       return;
                }
-
+               
+               if (_channel_selector) {
+                       if (mode == ChannelColors) {
+                               _channel_selector->set_channel_colors(NoteBase::midi_channel_colors);
+                       } else {
+                               _channel_selector->set_default_channel_color();
+                       }
+               }
+               
                _color_mode = mode;
-               xml_node->add_property ("color-mode", enum_2_string(_color_mode));
-               _view->redisplay_track();
+               set_gui_property ("color-mode", enum_2_string(_color_mode));
+               if (redisplay) {
+                       _view->redisplay_track();
+               }
        }
 }
 
 void
-MidiTimeAxisView::set_note_range(MidiStreamView::VisibleNoteRange range)
+MidiTimeAxisView::set_note_range (MidiStreamView::VisibleNoteRange range, bool apply_to_selection)
 {
-       if (!_ignore_signals)
-               midi_view()->set_note_range(range);
+       if (apply_to_selection) {
+               _editor.get_selection().tracks.foreach_midi_time_axis (
+                       boost::bind (&MidiTimeAxisView::set_note_range, _1, range, false));
+       } else {
+               if (!_ignore_signals) {
+                       midi_view()->set_note_range(range);
+               }
+       }
 }
 
-
 void
 MidiTimeAxisView::update_range()
 {
        MidiGhostRegion* mgr;
 
-       for(list<GhostRegion*>::iterator i = ghosts.begin(); i != ghosts.end(); ++i) {
+       for (list<GhostRegion*>::iterator i = ghosts.begin(); i != ghosts.end(); ++i) {
                if ((mgr = dynamic_cast<MidiGhostRegion*>(*i)) != 0) {
                        mgr->update_range();
                }
@@ -827,16 +1075,17 @@ void
 MidiTimeAxisView::show_all_automation (bool apply_to_selection)
 {
        if (apply_to_selection) {
-               _editor.get_selection().tracks.foreach_midi_time_axis (boost::bind (&MidiTimeAxisView::show_all_automation, _1, false));
+               _editor.get_selection().tracks.foreach_midi_time_axis (
+                       boost::bind (&MidiTimeAxisView::show_all_automation, _1, false));
        } else {
                if (midi_track()) {
                        const set<Evoral::Parameter> params = midi_track()->midi_playlist()->contained_automation();
-                       
+
                        for (set<Evoral::Parameter>::const_iterator i = params.begin(); i != params.end(); ++i) {
                                create_automation_child(*i, true);
                        }
                }
-               
+
                RouteTimeAxisView::show_all_automation ();
        }
 }
@@ -845,16 +1094,17 @@ void
 MidiTimeAxisView::show_existing_automation (bool apply_to_selection)
 {
        if (apply_to_selection) {
-               _editor.get_selection().tracks.foreach_midi_time_axis (boost::bind (&MidiTimeAxisView::show_existing_automation, _1, false));
+               _editor.get_selection().tracks.foreach_midi_time_axis (
+                       boost::bind (&MidiTimeAxisView::show_existing_automation, _1, false));
        } else {
                if (midi_track()) {
                        const set<Evoral::Parameter> params = midi_track()->midi_playlist()->contained_automation();
-                       
+
                        for (set<Evoral::Parameter>::const_iterator i = params.begin(); i != params.end(); ++i) {
-                               create_automation_child(*i, true);
+                               create_automation_child (*i, true);
                        }
                }
-               
+
                RouteTimeAxisView::show_existing_automation ();
        }
 }
@@ -865,46 +1115,74 @@ void
 MidiTimeAxisView::create_automation_child (const Evoral::Parameter& param, bool show)
 {
        if (param.type() == NullAutomation) {
-               cerr << "WARNING: Attempt to create NullAutomation child, ignoring" << endl;
                return;
        }
-       
+
        AutomationTracks::iterator existing = _automation_tracks.find (param);
+
        if (existing != _automation_tracks.end()) {
+
+               /* automation track created because we had existing data for
+                * the processor, but visibility may need to be controlled
+                * since it will have been set visible by default.
+                */
+
+               if (existing->second->set_marked_for_display (show) && !no_redraw) {
+                       request_redraw ();
+               }
+
                return;
        }
-               
-       if (param.type() == GainAutomation) {
+
+       boost::shared_ptr<AutomationTimeAxisView> track;
+
+       switch (param.type()) {
+
+       case GainAutomation:
                create_gain_automation_child (param, show);
-       } else {
-               
-               /* These controllers are region "automation", so we do not create
-                * an AutomationList/Line for the track */
-               
-               boost::shared_ptr<AutomationTimeAxisView> track (
-                       new AutomationTimeAxisView (
-                               _session,
-                               _route, 
-                               boost::shared_ptr<Automatable> (),
-                               boost::shared_ptr<AutomationControl> (),
-                               param,
-                               _editor,
-                               *this,
-                               true,
-                               parent_canvas,
-                               _route->describe_parameter(param)
-                               )
-                       );
+               break;
+
+       case PluginAutomation:
+               /* handled elsewhere */
+               break;
+
+       case MidiCCAutomation:
+       case MidiPgmChangeAutomation:
+       case MidiPitchBenderAutomation:
+       case MidiChannelPressureAutomation:
+       case MidiSystemExclusiveAutomation:
+               /* These controllers are region "automation" - they are owned
+                * by regions (and their MidiModels), not by the track. As a
+                * result we do not create an AutomationList/Line for the track
+                * ... except here we are doing something!! XXX 
+                */
+
+               track.reset (new AutomationTimeAxisView (
+                                    _session,
+                                    _route,
+                                    boost::shared_ptr<Automatable> (),
+                                    boost::shared_ptr<AutomationControl> (),
+                                    param,
+                                    _editor,
+                                    *this,
+                                    true,
+                                    parent_canvas,
+                                    _route->describe_parameter(param)));
 
                if (_view) {
-                       _view->foreach_regionview (sigc::mem_fun (*track.get(), &TimeAxisView::add_ghost));
+                       _view->foreach_regionview (
+                               sigc::mem_fun (*track.get(), &TimeAxisView::add_ghost));
                }
-               
+
                add_automation_child (param, track, show);
+               break;
+
+       default:
+               error << "MidiTimeAxisView: unknown automation child "
+                     << EventTypeMap::instance().to_symbol(param) << endmsg;
        }
 }
 
-
 void
 MidiTimeAxisView::route_active_changed ()
 {
@@ -921,9 +1199,6 @@ MidiTimeAxisView::route_active_changed ()
                        controls_base_unselected_name = "MidiTrackControlsBaseInactiveUnselected";
                }
        } else {
-
-               throw; // wha?
-
                if (_route->active()) {
                        controls_ebox.set_name ("BusControlsBaseUnselected");
                        controls_base_selected_name = "BusControlsBaseSelected";
@@ -936,7 +1211,25 @@ MidiTimeAxisView::route_active_changed ()
        }
 }
 
+void
+MidiTimeAxisView::set_note_selection (uint8_t note)
+{
+       if (!_editor.internal_editing()) {
+               return;
+       }
+
+       uint16_t chn_mask = midi_track()->get_playback_channel_mask();
 
+       if (_view->num_selected_regionviews() == 0) {
+               _view->foreach_regionview (
+                       sigc::bind (sigc::mem_fun (*this, &MidiTimeAxisView::set_note_selection_region_view),
+                                   note, chn_mask));
+       } else {
+               _view->foreach_selected_regionview (
+                       sigc::bind (sigc::mem_fun (*this, &MidiTimeAxisView::set_note_selection_region_view),
+                                   note, chn_mask));
+       }
+}
 
 void
 MidiTimeAxisView::add_note_selection (uint8_t note)
@@ -945,12 +1238,16 @@ MidiTimeAxisView::add_note_selection (uint8_t note)
                return;
        }
 
-       uint16_t chn_mask = _channel_selector.get_selected_channels();
+       const uint16_t chn_mask = midi_track()->get_playback_channel_mask();
 
        if (_view->num_selected_regionviews() == 0) {
-               _view->foreach_regionview (sigc::bind (sigc::mem_fun (*this, &MidiTimeAxisView::add_note_selection_region_view), note, chn_mask));
+               _view->foreach_regionview (
+                       sigc::bind (sigc::mem_fun (*this, &MidiTimeAxisView::add_note_selection_region_view),
+                                   note, chn_mask));
        } else {
-               _view->foreach_selected_regionview (sigc::bind (sigc::mem_fun (*this, &MidiTimeAxisView::add_note_selection_region_view), note, chn_mask));
+               _view->foreach_selected_regionview (
+                       sigc::bind (sigc::mem_fun (*this, &MidiTimeAxisView::add_note_selection_region_view),
+                                   note, chn_mask));
        }
 }
 
@@ -961,12 +1258,16 @@ MidiTimeAxisView::extend_note_selection (uint8_t note)
                return;
        }
 
-       uint16_t chn_mask = _channel_selector.get_selected_channels();
+       const uint16_t chn_mask = midi_track()->get_playback_channel_mask();
 
        if (_view->num_selected_regionviews() == 0) {
-               _view->foreach_regionview (sigc::bind (sigc::mem_fun (*this, &MidiTimeAxisView::extend_note_selection_region_view), note, chn_mask));
+               _view->foreach_regionview (
+                       sigc::bind (sigc::mem_fun (*this, &MidiTimeAxisView::extend_note_selection_region_view),
+                                   note, chn_mask));
        } else {
-               _view->foreach_selected_regionview (sigc::bind (sigc::mem_fun (*this, &MidiTimeAxisView::extend_note_selection_region_view), note, chn_mask));
+               _view->foreach_selected_regionview (
+                       sigc::bind (sigc::mem_fun (*this, &MidiTimeAxisView::extend_note_selection_region_view),
+                                   note, chn_mask));
        }
 }
 
@@ -977,21 +1278,31 @@ MidiTimeAxisView::toggle_note_selection (uint8_t note)
                return;
        }
 
-       uint16_t chn_mask = _channel_selector.get_selected_channels();
+       const uint16_t chn_mask = midi_track()->get_playback_channel_mask();
 
        if (_view->num_selected_regionviews() == 0) {
-               _view->foreach_regionview (sigc::bind (sigc::mem_fun (*this, &MidiTimeAxisView::toggle_note_selection_region_view), note, chn_mask));
+               _view->foreach_regionview (
+                       sigc::bind (sigc::mem_fun (*this, &MidiTimeAxisView::toggle_note_selection_region_view),
+                                   note, chn_mask));
        } else {
-               _view->foreach_selected_regionview (sigc::bind (sigc::mem_fun (*this, &MidiTimeAxisView::toggle_note_selection_region_view), note, chn_mask));
+               _view->foreach_selected_regionview (
+                       sigc::bind (sigc::mem_fun (*this, &MidiTimeAxisView::toggle_note_selection_region_view),
+                                   note, chn_mask));
        }
 }
 
 void
-MidiTimeAxisView::add_note_selection_region_view (RegionView* rv, uint8_t note, uint16_t chn_mask)
+MidiTimeAxisView::set_note_selection_region_view (RegionView* rv, uint8_t note, uint16_t chn_mask)
 {
        dynamic_cast<MidiRegionView*>(rv)->select_matching_notes (note, chn_mask, false, false);
 }
 
+void
+MidiTimeAxisView::add_note_selection_region_view (RegionView* rv, uint8_t note, uint16_t chn_mask)
+{
+       dynamic_cast<MidiRegionView*>(rv)->select_matching_notes (note, chn_mask, true, false);
+}
+
 void
 MidiTimeAxisView::extend_note_selection_region_view (RegionView* rv, uint8_t note, uint16_t chn_mask)
 {
@@ -1011,7 +1322,7 @@ MidiTimeAxisView::set_channel_mode (ChannelMode, uint16_t)
           the right ones.
        */
 
-       uint16_t selected_channels = _channel_selector.get_selected_channels();
+       const uint16_t selected_channels = midi_track()->get_playback_channel_mask();
        bool changed = false;
 
        no_redraw = true;
@@ -1025,14 +1336,14 @@ MidiTimeAxisView::set_channel_mode (ChannelMode, uint16_t)
                        if (!track) {
                                continue;
                        }
-                       
+
                        if ((selected_channels & (0x0001 << chn)) == 0) {
-                               /* channel not in use. hiding it will trigger RouteTimeAxisView::automation_track_hidden() 
+                               /* channel not in use. hiding it will trigger RouteTimeAxisView::automation_track_hidden()
                                   which will cause a redraw. We don't want one per channel, so block that with no_redraw.
-                                */
-                               changed = track->set_visibility (false) || changed;
+                               */
+                               changed = track->set_marked_for_display (false) || changed;
                        } else {
-                               changed = track->set_visibility (true) || changed;
+                               changed = track->set_marked_for_display (true) || changed;
                        }
                }
        }
@@ -1047,7 +1358,7 @@ MidiTimeAxisView::set_channel_mode (ChannelMode, uint16_t)
        controller_menu = 0;
 
        if (changed) {
-               _route->gui_changed ("track_height", this);
+               request_redraw ();
        }
 }
 
@@ -1078,20 +1389,20 @@ MidiTimeAxisView::add_region (framepos_t pos, framecnt_t length, bool commit)
        Editor* real_editor = dynamic_cast<Editor*> (&_editor);
 
        real_editor->begin_reversible_command (Operations::create_region);
-        playlist()->clear_changes ();
+       playlist()->clear_changes ();
 
        real_editor->snap_to (pos, 0);
-       
-       boost::shared_ptr<Source> src = _session->create_midi_source_for_session (view()->trackview().track().get(),
-                                                                                  view()->trackview().track()->name());
-       PropertyList plist; 
-       
+
+       boost::shared_ptr<Source> src = _session->create_midi_source_for_session (
+               view()->trackview().track().get(), view()->trackview().track()->name());
+       PropertyList plist;
+
        plist.add (ARDOUR::Properties::start, 0);
        plist.add (ARDOUR::Properties::length, length);
        plist.add (ARDOUR::Properties::name, PBD::basename_nosuffix(src->name()));
-       
+
        boost::shared_ptr<Region> region = (RegionFactory::create (src, plist));
-        
+
        playlist()->add_region (region, pos);
        _session->add_command (new StatefulDiffCommand (playlist()));
 
@@ -1110,17 +1421,90 @@ MidiTimeAxisView::ensure_step_editor ()
        }
 }
 
-void 
+void
 MidiTimeAxisView::start_step_editing ()
 {
        ensure_step_editor ();
-        _step_editor->start_step_editing ();
+       _step_editor->start_step_editing ();
 
 }
-void 
+void
 MidiTimeAxisView::stop_step_editing ()
 {
-        if (_step_editor) {
-                _step_editor->stop_step_editing ();
-        }
+       if (_step_editor) {
+               _step_editor->stop_step_editing ();
+       }
+}
+
+/** @return channel (counted from 0) to add an event to, based on the current setting
+ *  of the channel selector.
+ */
+uint8_t
+MidiTimeAxisView::get_channel_for_add () const
+{
+       uint16_t const chn_mask = midi_track()->get_playback_channel_mask();
+       int chn_cnt = 0;
+       uint8_t channel = 0;
+
+       /* pick the highest selected channel, unless all channels are selected,
+          which is interpreted to mean channel 1 (zero)
+       */
+
+       for (uint16_t i = 0; i < 16; ++i) {
+               if (chn_mask & (1<<i)) {
+                       channel = i;
+                       chn_cnt++;
+               }
+       }
+
+       if (chn_cnt == 16) {
+               channel = 0;
+       }
+
+       return channel;
+}
+
+void
+MidiTimeAxisView::note_range_changed ()
+{
+       set_gui_property ("note-range-min", (int) midi_view()->lowest_note ());
+       set_gui_property ("note-range-max", (int) midi_view()->highest_note ());
+}
+
+void
+MidiTimeAxisView::contents_height_changed ()
+{
+       _range_scroomer->set_size_request (-1, _view->child_height ());
+}
+
+void
+MidiTimeAxisView::playback_channel_mode_changed ()
+{
+       switch (midi_track()->get_playback_channel_mode()) {
+       case AllChannels:
+               _playback_channel_status.set_markup (string_compose ("<b>%1</b>: <i>%2</i>", _("Play"), _("all")));
+               break;
+       case FilterChannels:
+               _playback_channel_status.set_markup (string_compose ("<b>%1</b>: <i>%2</i>", _("Play"), _("some")));
+               break;
+       case ForceChannel:
+               _playback_channel_status.set_markup (string_compose ("<b>%1</b>: <i>%2>%3</i>", _("Play"), _("all"), PBD::ffs (midi_track()->get_playback_channel_mask())));
+               break;
+       }
+}
+
+void
+MidiTimeAxisView::capture_channel_mode_changed ()
+{
+       switch (midi_track()->get_capture_channel_mode()) {
+       case AllChannels:
+               _capture_channel_status.set_markup (string_compose ("<b>%1</b>: <i>%2</i>", _("Rec"), _("all")));
+               break;
+       case FilterChannels:
+               _capture_channel_status.set_markup (string_compose ("<b>%1</b>: <i>%2</i>", _("Rec"), _("some")));
+               break;
+       case ForceChannel:
+               _capture_channel_status.set_markup (string_compose ("<b>%1</b>: <i>%2>%3</i>", _("Rec"), _("all"), PBD::ffs (midi_track()->get_capture_channel_mask())));
+               break;
+       }
 }