Scale the piano roll right with stacked tracks, as well.
[ardour.git] / gtk2_ardour / midi_time_axis.cc
index f647dd9dcc528cd6d19a9cd69be22b9369b0c071..b83f865ce091ff128617999f0172d1c3cb59b8d2 100644 (file)
 #include "pbd/basename.h"
 #include "pbd/enumwriter.h"
 #include "pbd/memento_command.h"
+#include "pbd/stateful_diff_command.h"
 
-#include <gtkmm2ext/gtk_ui.h>
-#include <gtkmm2ext/selector.h>
-#include <gtkmm2ext/stop_signal.h>
-#include <gtkmm2ext/bindable_button.h>
-#include <gtkmm2ext/utils.h>
+#include "gtkmm2ext/gtk_ui.h"
+#include "gtkmm2ext/selector.h"
+#include "gtkmm2ext/bindable_button.h"
+#include "gtkmm2ext/utils.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/session_object.h"
+#include "ardour/source.h"
+#include "ardour/track.h"
+#include "ardour/types.h"
 
 #include "midi++/names.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"
@@ -79,6 +81,7 @@
 #include "region_view.h"
 #include "rgb_macros.h"
 #include "selection.h"
+#include "step_editor.h"
 #include "simplerect.h"
 #include "utils.h"
 
 using namespace ARDOUR;
 using namespace PBD;
 using namespace Gtk;
+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;
 
-MidiTimeAxisView::MidiTimeAxisView (PublicEditor& ed, Session* sess,
-               boost::shared_ptr<Route> rt, Canvas& canvas)
+MidiTimeAxisView::MidiTimeAxisView (PublicEditor& ed, Session* sess, 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)
@@ -111,19 +114,40 @@ MidiTimeAxisView::MidiTimeAxisView (PublicEditor& ed, Session* sess,
        , _track_color_mode_item(0)
        , _step_edit_item (0)
        , _midi_thru_item (0)
-       , default_channel_menu (0)
+       , controller_menu (0)
+        , _step_editor (0)
 {
-       subplugin_menu.set_name ("ArdourContextMenu");
+}
 
+void
+MidiTimeAxisView::set_route (boost::shared_ptr<Route> rt)
+{
+       _route = rt;
+       
        _view = new MidiStreamView (*this);
 
-       ignore_toggle = false;
-       _ignore_toggle_parameter = false;
-       
-       mute_button->set_active (false);
-       solo_button->set_active (false);
+       if (is_track ()) {
+               _piano_roll_header = new PianoRollHeader(*midi_view());
+               _range_scroomer = new MidiScroomer(midi_view()->note_range_adjustment);
+       }
 
-       step_edit_insert_position = 0;
+       /* 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;
 
        if (is_midi_track()) {
                controls_ebox.set_name ("MidiTimeAxisViewControlsBaseUnselected");
@@ -136,23 +160,29 @@ 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, 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->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));
 
-               _range_scroomer = new MidiScroomer(midi_view()->note_range_adjustment);
-
-               controls_hbox.pack_start(*_range_scroomer);
-               controls_hbox.pack_start(*_piano_roll_header);
+               /* 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));
+
+               /* 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);
+               controls_hbox.pack_start(*v);
 
                controls_ebox.set_name ("MidiTrackControlsBaseUnselected");
                controls_base_selected_name = "MidiTrackControlsBaseSelected";
@@ -162,7 +192,12 @@ MidiTimeAxisView::MidiTimeAxisView (PublicEditor& ed, Session* sess,
 
                /* ask for notifications of any new RegionViews */
                _view->RegionViewAdded.connect (sigc::mem_fun(*this, &MidiTimeAxisView::region_view_added));
-               _view->attach ();
+
+               if (!_editor.have_idled()) {
+                       /* first idle will do what we need */
+               } else {
+                       first_idle ();
+               }
        }
 
        HBox* midi_controls_hbox = manage(new HBox());
@@ -174,17 +209,21 @@ MidiTimeAxisView::MidiTimeAxisView (PublicEditor& ed, Session* sess,
                _model_selector.append_text(m->c_str());
        }
 
+
        _model_selector.signal_changed().connect(sigc::mem_fun(*this, &MidiTimeAxisView::model_changed));
 
        _custom_device_mode_selector.signal_changed().connect(
                        sigc::mem_fun(*this, &MidiTimeAxisView::custom_device_mode_changed));
 
-       // TODO: persist the choice
-       // this initializes the comboboxes and sends out the signal
-       _model_selector.set_active(0);
+       _model_selector.set_active_text (gui_property (X_("midnam-model-name")));
+       _custom_device_mode_selector.set_active_text (gui_property (X_("midnam-custom-device-mode")));
+
+       ARDOUR_UI::instance()->set_tip (_model_selector, _("External MIDI Device"));
+       ARDOUR_UI::instance()->set_tip (_custom_device_mode_selector, _("External Device Mode"));
 
        midi_controls_hbox->pack_start(_channel_selector, true, false);
        if (!patch_manager.all_models().empty()) {
+               _midi_controls_box.set_border_width (5);
                _midi_controls_box.pack_start(_model_selector, true, false);
                _midi_controls_box.pack_start(_custom_device_mode_selector, true, false);
        }
@@ -193,30 +232,54 @@ MidiTimeAxisView::MidiTimeAxisView (PublicEditor& ed, Session* sess,
 
        controls_vbox.pack_start(_midi_controls_box, false, false);
 
-       boost::shared_ptr<MidiDiskstream> diskstream = midi_track()->midi_diskstream();
-
        // restore channel selector settings
-       _channel_selector.set_channel_mode(diskstream->get_channel_mode(),
-                       diskstream->get_channel_mask());
+       _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(*midi_track()->midi_diskstream(), &MidiDiskstream::set_channel_mode));
+               sigc::mem_fun(*this, &MidiTimeAxisView::set_channel_mode));
 
-       XMLProperty *prop;
-       if ((prop = xml_node->property ("color-mode")) != 0) {
-               _color_mode = ColorMode (string_2_enum(prop->value(), _color_mode));
+       string prop = gui_property ("color-mode");
+       if (!prop.empty()) {
+               _color_mode = ColorMode (string_2_enum(prop, _color_mode));
                if (_color_mode == ChannelColors) {
                        _channel_selector.set_channel_colors(CanvasNoteEvent::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);
+
+       prop = gui_property ("note-mode");
+       if (!prop.empty()) {
+               _note_mode = NoteMode (string_2_enum (prop, _note_mode));
                if (_percussion_mode_item) {
                        _percussion_mode_item->set_active (_note_mode == Percussive);
                }
        }
 
-       build_controller_menu ();
+       /* Look for any GUI object state nodes that represent automation children that should exist, and create
+        * the children.
+        */
+
+       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) {
+                       create_automation_child (parameter, string_is_affirmative (gui_object_state().get_string (*i, X_("visible"))));
+               }
+       }
+}
+
+void
+MidiTimeAxisView::first_idle ()
+{
+       if (is_track ()) {
+               _view->attach ();
+       }
 }
 
 MidiTimeAxisView::~MidiTimeAxisView ()
@@ -228,9 +291,34 @@ MidiTimeAxisView::~MidiTimeAxisView ()
        _range_scroomer = 0;
 
        delete controller_menu;
+        delete _step_editor;
+}
+
+void
+MidiTimeAxisView::enter_internal_edit_mode ()
+{
+        if (midi_view()) {
+                midi_view()->enter_internal_edit_mode ();
+        }
 }
 
-void MidiTimeAxisView::model_changed()
+void
+MidiTimeAxisView::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 ();
+}
+
+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());
@@ -239,17 +327,18 @@ void MidiTimeAxisView::model_changed()
 
        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);
        }
 
        _custom_device_mode_selector.set_active(0);
+       
+       _route->instrument_info().set_external_instrument (_model_selector.get_active_text(), _custom_device_mode_selector.get_active_text());
 }
 
-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());
+       _route->instrument_info().set_external_instrument (_model_selector.get_active_text(), _custom_device_mode_selector.get_active_text());
 }
 
 MidiStreamView*
@@ -258,47 +347,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();
+       if (h >= MIDI_CONTROLS_BOX_MIN_HEIGHT) {
+               _midi_controls_box.show_all ();
        } 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
@@ -314,89 +393,202 @@ MidiTimeAxisView::append_extra_display_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)));
+                       sigc::mem_fun(*this, &MidiTimeAxisView::set_note_range), 
+                       MidiStreamView::FullRange, true)));
 
        range_items.push_back (MenuElem (_("Fit Contents"), sigc::bind (
                        sigc::mem_fun(*this, &MidiTimeAxisView::set_note_range),
-                       MidiStreamView::ContentsRange)));
+                       MidiStreamView::ContentsRange, true)));
 
-       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 (MenuElem (_("Note Range"), *range_menu));
+       items.push_back (MenuElem (_("Note Mode"), *build_note_mode_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 ()
+void
+MidiTimeAxisView::toggle_midi_thru ()
+{
+       if (!_midi_thru_item) {
+               return;
+       }
+
+       bool view_yn = _midi_thru_item->get_active();
+       if (view_yn != midi_track()->midi_thru()) {
+               midi_track()->set_midi_thru (view_yn);
+       }
+}
+
+void
+MidiTimeAxisView::build_automation_action_menu (bool for_selection)
 {
        using namespace Menu_Helpers;
 
-       default_channel_menu = manage (new Menu ());
+       /* If we have a controller menu, we need to detach it before
+          RouteTimeAxis::build_automation_action_menu destroys the
+          menu it is attached to.  Otherwise GTK destroys
+          controller_menu's gobj, meaning that it can't be reattached
+          below.  See bug #3134.
+       */
 
-       uint8_t defchn = midi_track()->default_channel();
-       MenuList& def_channel_items = default_channel_menu->items();
-       RadioMenuItem* item;
-       RadioMenuItem::Group dc_group;
+       if (controller_menu) {
+               detach_menu (*controller_menu);
+       }
+
+       _channel_command_menu_map.clear ();
+       RouteTimeAxisView::build_automation_action_menu (for_selection);
+
+       MenuList& automation_items = automation_action_menu->items();
+
+       uint16_t selected_channels = _channel_selector.get_selected_channels();
+
+       if (selected_channels !=  0) {
 
-       for (int i = 0; i < 16; ++i) {
-               char buf[4];
-               snprintf (buf, sizeof (buf), "%d", i+1);
+               automation_items.push_back (SeparatorElem());
 
-               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));
+               /* 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.
+               */
+
+               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);
+       } else {
+               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);
        }
 
-       return default_channel_menu;
 }
 
 void
-MidiTimeAxisView::set_default_channel (int chn)
+MidiTimeAxisView::change_all_channel_tracks_visibility (bool yn, Evoral::Parameter param)
 {
-       midi_track()->set_default_channel (chn);
-}
+       uint16_t selected_channels = _channel_selector.get_selected_channels();
 
-void
-MidiTimeAxisView::toggle_midi_thru ()
-{
-       if (!_midi_thru_item) {
-               return;
-       }
+       for (uint8_t chn = 0; chn < 16; chn++) {
+               if (selected_channels & (0x0001 << chn)) {
 
-       bool view_yn = _midi_thru_item->get_active();
-       if (view_yn != midi_track()->midi_thru()) {
-               midi_track()->set_midi_thru (view_yn);
+                       Evoral::Parameter fully_qualified_param (param.type(), chn, param.id());
+                       Gtk::CheckMenuItem* menu = automation_child_menu_item (fully_qualified_param);
+
+                       if (menu) {
+                               menu->set_active (yn);
+                       }
+               }
        }
 }
 
 void
-MidiTimeAxisView::build_automation_action_menu ()
+MidiTimeAxisView::add_channel_command_menu_item (Menu_Helpers::MenuList& items, const string& label, AutomationType auto_type, uint8_t cmd)
 {
        using namespace Menu_Helpers;
 
-       RouteTimeAxisView::build_automation_action_menu ();
+       /* count the number of selected channels because we will build a different menu structure if there is more than 1 selected.
+        */
 
-       MenuList& automation_items = automation_action_menu->items();
+       uint16_t selected_channels = _channel_selector.get_selected_channels();
+       int chn_cnt = 0;
 
-       automation_items.push_back (SeparatorElem());
+       for (uint8_t chn = 0; chn < 16; chn++) {
+               if (selected_channels & (0x0001 << chn)) {
+                       if (++chn_cnt > 1) {
+                               break;
+                       }
+               }
+       }
 
-       add_basic_parameter_menu_item (automation_items, _("Program Change"), Evoral::Parameter (MidiPgmChangeAutomation));
-       add_basic_parameter_menu_item (automation_items, _("Bender"), Evoral::Parameter (MidiPitchBenderAutomation));
-       add_basic_parameter_menu_item (automation_items, _("Pressure"), Evoral::Parameter (MidiChannelPressureAutomation));
+       if (chn_cnt > 1) {
 
-       if (controller_menu) {
+               /* 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)));
 
-               if (controller_menu->gobj()) {
-                       if (controller_menu->get_attach_widget()) {
-                               controller_menu->detach();
+               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)));
+
+                               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());
+                               _channel_command_menu_map[fully_qualified_param] = cmi;
+                               cmi->set_active (visible);
                        }
                }
 
-               automation_items.push_back (MenuElem (_("Controllers"), *controller_menu));
+               /* 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)));
+
+                               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());
+                               _channel_command_menu_map[fully_qualified_param] = cmi;
+                               cmi->set_active (visible);
+
+                               /* one channel only */
+                               break;
+                       }
+               }
        }
 }
 
@@ -405,10 +597,15 @@ MidiTimeAxisView::build_controller_menu ()
 {
        using namespace Menu_Helpers;
 
-       controller_menu = new Menu; // not managed 
+       if (controller_menu) {
+               /* it exists and has not been invalidated by a channel mode change, so just return it */
+               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 
+       /* 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
        */
 
@@ -418,7 +615,7 @@ MidiTimeAxisView::build_controller_menu ()
         */
 
        int chn_cnt = 0;
-       
+
        for (uint8_t chn = 0; chn < 16; chn++) {
                if (selected_channels & (0x0001 << chn)) {
                        if (++chn_cnt > 1) {
@@ -426,14 +623,23 @@ 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) {
 
@@ -442,35 +648,44 @@ MidiTimeAxisView::build_controller_menu ()
                                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, &MidiTimeAxisView::toggle_parameter_track), 
+                                                                                   sigc::bind (sigc::mem_fun (*this, &RouteTimeAxisView::toggle_automation_track),
                                                                                                fully_qualified_param)));
-                                               
-                                               RouteAutomationNode* node = automation_track (fully_qualified_param);
+
+                                               boost::shared_ptr<AutomationTimeAxisView> track = automation_child (fully_qualified_param);
                                                bool visible = false;
-                                               
-                                               if (node) {
-                                                       if (node->track->marked_for_display()) {
+
+                                               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);
-                                               
-                                               parameter_menu_map[fully_qualified_param] = cmi;
                                        }
                                }
-                               
+
                                /* add the per-channel menu to the list of controllers, with the name of the controller */
-                               
-                               ctl_items.push_back (MenuElem (midi_name (ctl), *chn_menu));
+                               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 {
 
@@ -478,80 +693,40 @@ MidiTimeAxisView::build_controller_menu ()
 
                                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 (_route->describe_parameter (fully_qualified_param),
-                                                                                   sigc::bind (sigc::mem_fun (*this, &MidiTimeAxisView::toggle_parameter_track), 
-                                                                                               fully_qualified_param)));
-                                               
-                                               RouteAutomationNode* node = automation_track (fully_qualified_param);
+                                               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 (node) {
-                                                       if (node->track->marked_for_display()) {
+
+                                               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);
-                                               
-                                               parameter_menu_map[fully_qualified_param] = cmi;
+
                                                /* one channel only */
                                                break;
                                        }
                                }
                        }
                }
-                       
-               /* add the menu for this block of controllers to the overall controller menu */
-
-               items.push_back (MenuElem (string_compose (_("Controllers %1-%2"), i+1, i+16), *ctl_menu));
-       }
-}
-
-void
-MidiTimeAxisView::add_basic_parameter_menu_item (Menu_Helpers::MenuList& items, const string& label, Evoral::Parameter param)
-{
-       items.push_back (Menu_Helpers::CheckMenuElem 
-                        (label, sigc::bind (sigc::mem_fun 
-                                            (*this, &MidiTimeAxisView::toggle_parameter_track), param)));
-       
-       // cerr << "Create a new menu item from " << param.type() << '/' << param.id() << '/' << (int) param.channel() << endl;
-
-       uint16_t selected_channels = _channel_selector.get_selected_channels();
-       bool visible = false;
-
-       for (uint8_t i = 0; i < 16; i++) {
-               if (selected_channels & (0x0001 << i)) {
-                       Evoral::Parameter param_with_channel(param.type(), i, param.id());
-
-                       // cerr << "\tChecking on channel " << (int) i << " via " << param_with_channel.type() << '/' << param_with_channel.id() << endl;
-                       
-                       RouteAutomationNode* node = automation_track (param_with_channel);
-
-                       if (node) {
-                               if (node->track->marked_for_display()) {
-                                       visible = true;
-                                       // cerr << "\tGot a track, and it appears visible\n";
-                                       break;
-                               } else {
-                                       // cerr << "\tGot a track, and it appears hidden\n";
-                               }
-                       } else {
-                               // cerr << "\tno track found\n";
-                       }
-               }
-       }
 
-       CheckMenuItem* cmi = static_cast<CheckMenuItem*>(&items.back());
-       cmi->set_active (visible);
+               /* add the menu for this block of controllers to the overall controller menu */
 
-       pair<ParameterMenuMap::iterator,bool> result;
-       result = parameter_menu_map.insert (pair<Evoral::Parameter,CheckMenuItem*> (param, cmi));
-       if (!result.second) {
-               /* it already exists, but we're asssigning a new menu item to it */
-               result.first->second = cmi;
+               items.push_back (MenuElem (string_compose (_("Controllers %1-%2"), i, i+15), *ctl_menu));
        }
 }
 
@@ -565,13 +740,13 @@ 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)));
+                               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);
 
@@ -589,17 +764,20 @@ MidiTimeAxisView::build_color_mode_menu()
 
        RadioMenuItem::Group mode_group;
        items.push_back (RadioMenuElem (mode_group, _("Meter Colors"),
-                               sigc::bind (sigc::mem_fun (*this, &MidiTimeAxisView::set_color_mode), MeterColors)));
+                                       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)));
+                                       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)));
+                                       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);
 
@@ -607,40 +785,61 @@ 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_diskstream();
+       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 (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 (mode == ChannelColors) {
                        _channel_selector.set_channel_colors(CanvasNoteEvent::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_diskstream();
+               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()
 {
@@ -654,144 +853,114 @@ MidiTimeAxisView::update_range()
 }
 
 void
-MidiTimeAxisView::show_all_automation ()
+MidiTimeAxisView::show_all_automation (bool apply_to_selection)
 {
-       if (midi_track()) {
-               const set<Evoral::Parameter> params = midi_track()->midi_diskstream()->
-                               midi_playlist()->contained_automation();
+       if (apply_to_selection) {
+               _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);
+                       for (set<Evoral::Parameter>::const_iterator i = params.begin(); i != params.end(); ++i) {
+                               create_automation_child(*i, true);
+                       }
                }
-       }
-
-       RouteTimeAxisView::show_all_automation ();
-}
-
-void
-MidiTimeAxisView::show_existing_automation ()
-{
-       if (midi_track()) {
-               const set<Evoral::Parameter> params = midi_track()->midi_diskstream()->
-                               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 ();
        }
-
-       RouteTimeAxisView::show_existing_automation ();
 }
 
-/** Prompt for a controller with a dialog and add an automation track for it
- */
 void
-MidiTimeAxisView::add_cc_track()
+MidiTimeAxisView::show_existing_automation (bool apply_to_selection)
 {
-       int response;
-       Evoral::Parameter param(0, 0, 0);
+       if (apply_to_selection) {
+               _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();
 
-       {
-               AddMidiCCTrackDialog dialog;
-               dialog.set_transient_for (_editor);
-               response = dialog.run();
+                       for (set<Evoral::Parameter>::const_iterator i = params.begin(); i != params.end(); ++i) {
+                               create_automation_child (*i, true);
+                       }
+               }
 
-               if (response == Gtk::RESPONSE_ACCEPT)
-                       param = dialog.parameter();
+               RouteTimeAxisView::show_existing_automation ();
        }
-
-       if (param.type() != 0 && response == Gtk::RESPONSE_ACCEPT)
-               create_automation_child(param, true);
 }
 
-/** Toggle an automation track for the given parameter (pitch bend, channel pressure).
- *  Will add track if necessary.
+/** Create an automation track for the given parameter (pitch bend, channel pressure).
  */
 void
-MidiTimeAxisView::toggle_parameter_track(const Evoral::Parameter& param)
+MidiTimeAxisView::create_automation_child (const Evoral::Parameter& param, bool show)
 {
-       if (_ignore_toggle_parameter) {
-               return;
-       }
-
-       cerr << "CHANGE VISIBILITY OF " << param.type() << '/' << param.id() << '/' << (int) param.channel() << endl;
-
-       if ( !EventTypeMap::instance().is_midi_parameter(param) ) {
-               error << "MidiTimeAxisView: unknown automation child "
-                       << ARDOUR::EventTypeMap::instance().to_symbol(param) << endmsg;
-               return;
-       }
-
-       map<Evoral::Parameter,CheckMenuItem*>::iterator x = parameter_menu_map.find (param);
-       if (x == parameter_menu_map.end()) {
-               cerr << "Param not found in pm map\n";
+       if (param.type() == NullAutomation) {
                return;
        }
 
-       bool yn = x->second->get_active ();
-       cerr << "Menu item state for " << param.type() << '/' << param.id() << '/' << (int) param.channel() << ' ' << yn << endl;
+       AutomationTracks::iterator existing = _automation_tracks.find (param);
 
-       cerr << "toggle param " << param.type() << '/' << param.id() << '/' << (int) param.channel() << " from " << !yn << " to " << yn << endl;
+       if (existing != _automation_tracks.end()) {
 
-       // create the parameter lane for each selected channel
-       uint16_t selected_channels = _channel_selector.get_selected_channels();
-
-       for (uint8_t i = 0; i < 16; i++) {
-               if (selected_channels & (0x0001 << i)) {
-                       Evoral::Parameter param_with_channel(param.type(), i, param.id());
+               /* 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.
+                */
 
-                       RouteAutomationNode* node = automation_track (param_with_channel);
-                       
-                       if (!node) {
-                               cerr << "\tNO EXISTING TRACK FOR chn " << (int) i << endl;
-                               if (yn) {
-                                       create_automation_child (param_with_channel, true);
-                               }
-                       } else {
-                               cerr << "\tTRACK EXISTS, set its menu item to " << yn << " to change its visibilty\n";
-                               node->menu_item->set_active (yn);
-                       }
+               if (existing->second->set_marked_for_display (show) && !no_redraw) {
+                       request_redraw ();
                }
-       }
-
-       _ignore_toggle_parameter = true;
-       x->second->set_active (yn);
-       _ignore_toggle_parameter = false;
-}
-
-/** Hide an automation track for the given parameter (pitch bend, channel pressure).
- */
-void
-MidiTimeAxisView::create_automation_child (const Evoral::Parameter& param, bool show)
-{
-       /* These controllers are region "automation", so we do not create
-        * an AutomationList/Line for the track */
 
-       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())
-               return;
-
-       boost::shared_ptr<AutomationControl> c = _route->get_control (param);
-
-       assert(c);
+       boost::shared_ptr<AutomationTimeAxisView> track;
+
+       switch (param.type()) {
+
+       case GainAutomation:
+               create_gain_automation_child (param, show);
+               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));
+               }
 
-       boost::shared_ptr<AutomationTimeAxisView> track(new AutomationTimeAxisView (_session,
-                       _route, boost::shared_ptr<ARDOUR::Automatable>(), c,
-                       _editor,
-                       *this,
-                       true,
-                       parent_canvas,
-                       _route->describe_parameter(param)));
+               add_automation_child (param, track, show);
+               break;
 
-       add_automation_child(param, track, show);
+       default:
+               error << "MidiTimeAxisView: unknown automation child " << EventTypeMap::instance().to_symbol(param) << endmsg;
+       }
 }
 
-
 void
 MidiTimeAxisView::route_active_changed ()
 {
@@ -824,124 +993,21 @@ MidiTimeAxisView::route_active_changed ()
 }
 
 void
-MidiTimeAxisView::start_step_editing ()
+MidiTimeAxisView::set_note_selection (uint8_t note)
 {
-       step_edit_insert_position = _editor.get_preferred_edit_position ();
-       step_edit_beat_pos = 0;
-       step_edit_region = playlist()->top_region_at (step_edit_insert_position);
-
-       if (step_edit_region) {
-               RegionView* rv = view()->find_view (step_edit_region);
-               step_edit_region_view = dynamic_cast<MidiRegionView*> (rv);
-       } else {
-               step_edit_region_view = 0;
+       if (!_editor.internal_editing()) {
+               return;
        }
 
-       midi_track()->set_step_editing (true);
-}
-
-void
-MidiTimeAxisView::stop_step_editing ()
-{
-       midi_track()->set_step_editing (false);
-}
-
-void
-MidiTimeAxisView::check_step_edit ()
-{
-       MidiRingBuffer<nframes_t>& incoming (midi_track()->step_edit_ring_buffer());
-       Evoral::Note<Evoral::MusicalTime> note;
-       uint8_t* buf;
-       uint32_t bufsize = 32;
-
-       buf = new uint8_t[bufsize];
-
-       while (incoming.read_space()) {
-               nframes_t time;
-               Evoral::EventType type;
-               uint32_t size;
-
-               incoming.read_prefix (&time, &type, &size);
-
-               if (size > bufsize) {
-                       delete [] buf;
-                       bufsize = size;
-                       buf = new uint8_t[bufsize];
-               }
-
-               incoming.read_contents (size, buf);
-
-               if ((buf[0] & 0xf0) == MIDI_CMD_NOTE_ON) {
-
-                       if (step_edit_region == 0) {
-
-                               step_edit_region = add_region (step_edit_insert_position);
-                               RegionView* rv = view()->find_view (step_edit_region);
-
-                               if (rv) {
-                                       step_edit_region_view = dynamic_cast<MidiRegionView*>(rv);
-                               } else {
-                                       fatal << X_("programming error: no view found for new MIDI region") << endmsg;
-                                       /*NOTREACHED*/
-                               }
-                       }
-
-                       if (step_edit_region_view) {
-
-                               bool success;
-                               Evoral::MusicalTime beats = _editor.get_grid_type_as_beats (success, step_edit_insert_position);
-
-                               if (!success) {
-                                       continue;
-                               }
-
-                               step_edit_region_view->add_note (buf[0] & 0xf, buf[1], buf[2], step_edit_beat_pos, beats);
-                               step_edit_beat_pos += beats;
-                       }
-               }
+       uint16_t chn_mask = _channel_selector.get_selected_channels();
 
+       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::step_edit_rest ()
-{
-       bool success;
-       Evoral::MusicalTime beats = _editor.get_grid_type_as_beats (success, step_edit_insert_position);
-       step_edit_beat_pos += beats;
-}
-
-boost::shared_ptr<Region>
-MidiTimeAxisView::add_region (nframes64_t pos)
-{
-       Editor* real_editor = dynamic_cast<Editor*> (&_editor);
-
-       real_editor->begin_reversible_command (_("create region"));
-       XMLNode &before = playlist()->get_state();
-
-       nframes64_t start = pos;
-       real_editor->snap_to (start, -1);
-       const Meter& m = _session->tempo_map().meter_at(start);
-       const Tempo& t = _session->tempo_map().tempo_at(start);
-       double length = floor (m.frames_per_bar(t, _session->frame_rate()));
-
-       const boost::shared_ptr<MidiDiskstream> diskstream =
-               boost::dynamic_pointer_cast<MidiDiskstream>(view()->trackview().track()->diskstream());
-
-       boost::shared_ptr<Source> src = _session->create_midi_source_for_session (*diskstream.get());
-
-       boost::shared_ptr<Region> region = (RegionFactory::create (src, 0, (nframes_t) length,
-                                                                  PBD::basename_nosuffix(src->name())));
-
-       playlist()->add_region (region, start);
-       XMLNode &after = playlist()->get_state();
-       _session->add_command (new MementoCommand<Playlist> (*playlist().get(), &before, &after));
-
-       real_editor->commit_reversible_command();
-
-       return region;
-}
-
 void
 MidiTimeAxisView::add_note_selection (uint8_t note)
 {
@@ -991,11 +1057,17 @@ MidiTimeAxisView::toggle_note_selection (uint8_t note)
 }
 
 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)
 {
@@ -1007,3 +1079,166 @@ MidiTimeAxisView::toggle_note_selection_region_view (RegionView* rv, uint8_t not
 {
        dynamic_cast<MidiRegionView*>(rv)->toggle_matching_notes (note, chn_mask);
 }
+
+void
+MidiTimeAxisView::set_channel_mode (ChannelMode, uint16_t)
+{
+       /* hide all automation tracks that use the wrong channel(s) and show all those that use
+          the right ones.
+       */
+
+       uint16_t selected_channels = _channel_selector.get_selected_channels();
+       bool changed = false;
+
+       no_redraw = true;
+
+       for (uint32_t ctl = 0; ctl < 127; ++ctl) {
+
+               for (uint32_t chn = 0; chn < 16; ++chn) {
+                       Evoral::Parameter fully_qualified_param (MidiCCAutomation, chn, ctl);
+                       boost::shared_ptr<AutomationTimeAxisView> track = automation_child (fully_qualified_param);
+
+                       if (!track) {
+                               continue;
+                       }
+
+                       if ((selected_channels & (0x0001 << chn)) == 0) {
+                               /* 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_marked_for_display (false) || changed;
+                       } else {
+                               changed = track->set_marked_for_display (true) || changed;
+                       }
+               }
+       }
+
+       no_redraw = false;
+
+       /* TODO: Bender, Pressure */
+
+       /* invalidate the controller menu, so that we rebuild it next time */
+       _controller_menu_map.clear ();
+       delete controller_menu;
+       controller_menu = 0;
+
+       if (changed) {
+               request_redraw ();
+       }
+}
+
+Gtk::CheckMenuItem*
+MidiTimeAxisView::automation_child_menu_item (Evoral::Parameter param)
+{
+       Gtk::CheckMenuItem* m = RouteTimeAxisView::automation_child_menu_item (param);
+       if (m) {
+               return m;
+       }
+
+       ParameterMenuMap::iterator i = _controller_menu_map.find (param);
+       if (i != _controller_menu_map.end()) {
+               return i->second;
+       }
+
+       i = _channel_command_menu_map.find (param);
+       if (i != _channel_command_menu_map.end()) {
+               return i->second;
+       }
+
+       return 0;
+}
+
+boost::shared_ptr<MidiRegion>
+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 ();
+
+       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;
+
+       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()));
+
+       if (commit) {
+               real_editor->commit_reversible_command ();
+       }
+
+       return boost::dynamic_pointer_cast<MidiRegion>(region);
+}
+
+void
+MidiTimeAxisView::ensure_step_editor ()
+{
+       if (!_step_editor) {
+               _step_editor = new StepEditor (_editor, midi_track(), *this);
+       }
+}
+
+void
+MidiTimeAxisView::start_step_editing ()
+{
+       ensure_step_editor ();
+        _step_editor->start_step_editing ();
+
+}
+void
+MidiTimeAxisView::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 = _channel_selector.get_selected_channels ();
+       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 ());
+}