Make stuff in the automation menu apply to the track selection.
[ardour.git] / gtk2_ardour / midi_time_axis.cc
index b281ba0529229a83c8221b882c250fa85c1eed49..0348e632f81f977fe64eac88e9c41ef1b7e8383e 100644 (file)
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2000 Paul Davis 
+    Copyright (C) 2000 Paul Davis
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
 #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/file_source.h"
 #include "ardour/midi_playlist.h"
 #include "ardour/midi_diskstream.h"
 #include "ardour/midi_patch_manager.h"
@@ -51,6 +52,9 @@
 #include "ardour/session_playlist.h"
 #include "ardour/tempo.h"
 #include "ardour/utils.h"
+#include "ardour/operations.h"
+
+#include "midi++/names.h"
 
 #include "add_midi_cc_track_dialog.h"
 #include "ardour_ui.h"
@@ -77,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 sigc;
+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,
+MidiTimeAxisView::MidiTimeAxisView (PublicEditor& ed, Session* sess,
                boost::shared_ptr<Route> rt, Canvas& canvas)
        : AxisView(sess) // virtually inherited
        , RouteTimeAxisView(ed, sess, rt, canvas)
-       , _ignore_signals(false)  
+       , _ignore_signals(false)
        , _range_scroomer(0)
        , _piano_roll_header(0)
        , _note_mode(Sustained)
@@ -111,18 +116,18 @@ MidiTimeAxisView::MidiTimeAxisView (PublicEditor& ed, Session& sess,
        , _step_edit_item (0)
        , _midi_thru_item (0)
        , default_channel_menu (0)
+       , controller_menu (0)
+        , _step_editor (0)
 {
        subplugin_menu.set_name ("ArdourContextMenu");
 
        _view = new MidiStreamView (*this);
 
        ignore_toggle = false;
-
+       
        mute_button->set_active (false);
        solo_button->set_active (false);
 
-       step_edit_insert_position = 0;
-       
        if (is_midi_track()) {
                controls_ebox.set_name ("MidiTimeAxisViewControlsBaseUnselected");
                _note_mode = midi_track()->note_mode();
@@ -132,16 +137,21 @@ MidiTimeAxisView::MidiTimeAxisView (PublicEditor& ed, Session& sess,
 
        /* map current state of the route */
 
-       processors_changed ();
+       processors_changed (RouteProcessorChange ());
 
        ensure_xml_node ();
 
-       set_state (*xml_node);
-       
-       _route->processors_changed.connect (mem_fun(*this, &MidiTimeAxisView::processors_changed));
+       set_state (*xml_node, Stateful::loading_state_version);
+
+       _route->processors_changed.connect (*this, invalidator (*this), ui_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);
 
                controls_hbox.pack_start(*_range_scroomer);
@@ -151,27 +161,32 @@ MidiTimeAxisView::MidiTimeAxisView (PublicEditor& ed, Session& sess,
                controls_base_selected_name = "MidiTrackControlsBaseSelected";
                controls_base_unselected_name = "MidiTrackControlsBaseUnselected";
 
-               midi_view()->NoteRangeChanged.connect (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 (mem_fun(*this, &MidiTimeAxisView::region_view_added));
-               _view->attach ();
-       }
+               _view->RegionViewAdded.connect (sigc::mem_fun(*this, &MidiTimeAxisView::region_view_added));
                
+               if (!_editor.have_idled()) {
+                       /* first idle will do what we need */
+               } else {
+                       first_idle ();
+               }
+       }
+
        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());
        }
-       
-       _model_selector.signal_changed().connect(mem_fun(*this, &MidiTimeAxisView::model_changed));
-       
+
+       _model_selector.signal_changed().connect(sigc::mem_fun(*this, &MidiTimeAxisView::model_changed));
+
        _custom_device_mode_selector.signal_changed().connect(
-                       mem_fun(*this, &MidiTimeAxisView::custom_device_mode_changed));
-       
+                       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);
@@ -181,18 +196,17 @@ MidiTimeAxisView::MidiTimeAxisView (PublicEditor& ed, Session& sess,
                _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);
-       
+
        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(
-               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) {
@@ -204,12 +218,20 @@ MidiTimeAxisView::MidiTimeAxisView (PublicEditor& ed, Session& sess,
 
        if ((prop = xml_node->property ("note-mode")) != 0) {
                _note_mode = NoteMode (string_2_enum(prop->value(), _note_mode));
-               if (mode_menu) {
+               if (_percussion_mode_item) {
                        _percussion_mode_item->set_active (_note_mode == Percussive);
                }
        }
 }
 
+void
+MidiTimeAxisView::first_idle ()
+{
+       if (is_track ()) {
+               _view->attach ();
+       }
+}
+
 MidiTimeAxisView::~MidiTimeAxisView ()
 {
        delete _piano_roll_header;
@@ -217,15 +239,42 @@ MidiTimeAxisView::~MidiTimeAxisView ()
 
        delete _range_scroomer;
        _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::leave_internal_edit_mode ()
+{
+        if (midi_view()) {
+                midi_view()->leave_internal_edit_mode ();
+        }
 }
 
-void MidiTimeAxisView::model_changed()
+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());
-       
+
        _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;
@@ -238,7 +287,7 @@ void MidiTimeAxisView::model_changed()
 void MidiTimeAxisView::custom_device_mode_changed()
 {
        _midi_patch_settings_changed.emit(_model_selector.get_active_text(),
-                       _custom_device_mode_selector.get_active_text());        
+                       _custom_device_mode_selector.get_active_text());
 }
 
 MidiStreamView*
@@ -252,7 +301,7 @@ 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;
 }
@@ -272,11 +321,11 @@ MidiTimeAxisView::set_height (uint32_t h)
        RouteTimeAxisView::set_height (h);
 
        if (height >= MIDI_CONTROLS_BOX_MIN_HEIGHT) {
-               _midi_controls_box.show();
+               _midi_controls_box.show_all ();
        } else {
                _midi_controls_box.hide();
        }
-       
+
        if (height >= KEYBOARD_MIN_HEIGHT) {
                if (is_track() && _range_scroomer)
                        _range_scroomer->show();
@@ -301,43 +350,43 @@ MidiTimeAxisView::append_extra_display_menu_items ()
        Menu *range_menu = manage(new Menu);
        MenuList& range_items = range_menu->items();
        range_menu->set_name ("ArdourContextMenu");
-       
-       range_items.push_back (MenuElem (_("Show Full Range"), bind (
-                       mem_fun(*this, &MidiTimeAxisView::set_note_range),
+
+       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"), bind (
-                       mem_fun(*this, &MidiTimeAxisView::set_note_range),
+
+       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"), mem_fun(*this, &MidiTimeAxisView::toggle_midi_thru)));
+       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;
-       
-       if (default_channel_menu == 0) {
-               default_channel_menu = manage (new Menu ());
-       } 
-       
+
+       default_channel_menu = manage (new Menu ());
+
        uint8_t defchn = midi_track()->default_channel();
        MenuList& def_channel_items = default_channel_menu->items();
        RadioMenuItem* item;
        RadioMenuItem::Group dc_group;
-       
+
        for (int i = 0; i < 16; ++i) {
                char buf[4];
                snprintf (buf, sizeof (buf), "%d", i+1);
-               
+
                def_channel_items.push_back (RadioMenuElem (dc_group, buf,
-                                                           bind (mem_fun (*this, &MidiTimeAxisView::set_default_channel), i)));
+                                                           sigc::bind (sigc::mem_fun (*this, &MidiTimeAxisView::set_default_channel), i)));
                item = dynamic_cast<RadioMenuItem*>(&def_channel_items.back());
                item->set_active ((i == defchn));
        }
@@ -365,26 +414,311 @@ MidiTimeAxisView::toggle_midi_thru ()
 }
 
 void
-MidiTimeAxisView::build_automation_action_menu ()
+MidiTimeAxisView::build_automation_action_menu (bool for_selection)
 {
        using namespace Menu_Helpers;
 
-       RouteTimeAxisView::build_automation_action_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.
+       */
+          
+       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();
        
-       automation_items.push_back (SeparatorElem());
-       automation_items.push_back (MenuElem (_("Controller..."), 
-                       mem_fun(*this, &MidiTimeAxisView::add_cc_track)));
-       automation_items.push_back (MenuElem (_("Program Change"), 
-                       sigc::bind(mem_fun(*this, &MidiTimeAxisView::add_parameter_track),
-                               Evoral::Parameter(MidiPgmChangeAutomation))));  
-       automation_items.push_back (MenuElem (_("Bender"), 
-                       sigc::bind(mem_fun(*this, &MidiTimeAxisView::add_parameter_track),
-                               Evoral::Parameter(MidiPitchBenderAutomation))));
-       automation_items.push_back (MenuElem (_("Pressure"), 
-                       sigc::bind(mem_fun(*this, &MidiTimeAxisView::add_parameter_track),
-                               Evoral::Parameter(MidiChannelPressureAutomation))));
+       uint16_t selected_channels = _channel_selector.get_selected_channels();
+
+       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.
+               */
+
+               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);
+       }
+               
+}
+
+void
+MidiTimeAxisView::change_all_channel_tracks_visibility (bool yn, Evoral::Parameter param)
+{
+       uint16_t selected_channels = _channel_selector.get_selected_channels();
+       
+       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);
+
+                       if (menu) {
+                               menu->set_active (yn);
+                       }
+               }
+       }
+}
+
+void
+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.
+        */
+
+       uint16_t selected_channels = _channel_selector.get_selected_channels();
+       int chn_cnt = 0;
+       
+       for (uint8_t chn = 0; chn < 16; chn++) {
+               if (selected_channels & (0x0001 << chn)) {
+                       if (++chn_cnt > 1) {
+                               break;
+                       }
+               }
+       }
+       
+       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)));
+               
+               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);
+                       }
+               }
+               
+               /* 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;
+                       }
+               }
+       }
+}
+
+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 */
+               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
+       */
+
+       uint16_t selected_channels = _channel_selector.get_selected_channels();
+
+       /* 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) {
+                               break;
+                       }
+               }
+       }
+       
+       /* 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 */
+
+                               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;
+                                                       }
+                                               }
+                                               
+                                               CheckMenuItem* cmi = static_cast<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, 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;
+                                       }
+                               }
+                       }
+               }
+                       
+               /* add the menu for this block of controllers to the overall controller menu */
+
+               items.push_back (MenuElem (string_compose (_("Controllers %1-%2"), i, i+15), *ctl_menu));
+       }
 }
 
 Gtk::Menu*
@@ -398,12 +732,12 @@ MidiTimeAxisView::build_note_mode_menu()
 
        RadioMenuItem::Group mode_group;
        items.push_back (RadioMenuElem (mode_group, _("Sustained"),
-                               bind (mem_fun (*this, &MidiTimeAxisView::set_note_mode), Sustained)));
+                               sigc::bind (sigc::mem_fun (*this, &MidiTimeAxisView::set_note_mode), Sustained)));
        _note_mode_item = dynamic_cast<RadioMenuItem*>(&items.back());
        _note_mode_item->set_active(_note_mode == Sustained);
 
        items.push_back (RadioMenuElem (mode_group, _("Percussive"),
-                               bind (mem_fun (*this, &MidiTimeAxisView::set_note_mode), Percussive)));
+                               sigc::bind (sigc::mem_fun (*this, &MidiTimeAxisView::set_note_mode), Percussive)));
        _percussion_mode_item = dynamic_cast<RadioMenuItem*>(&items.back());
        _percussion_mode_item->set_active(_note_mode == Percussive);
 
@@ -421,23 +755,23 @@ MidiTimeAxisView::build_color_mode_menu()
 
        RadioMenuItem::Group mode_group;
        items.push_back (RadioMenuElem (mode_group, _("Meter Colors"),
-                               bind (mem_fun (*this, &MidiTimeAxisView::set_color_mode), MeterColors)));
+                               sigc::bind (sigc::mem_fun (*this, &MidiTimeAxisView::set_color_mode), MeterColors)));
        _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"),
-                               bind (mem_fun (*this, &MidiTimeAxisView::set_color_mode), ChannelColors)));
+                               sigc::bind (sigc::mem_fun (*this, &MidiTimeAxisView::set_color_mode), ChannelColors)));
        _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"),
-                               bind (mem_fun (*this, &MidiTimeAxisView::set_color_mode), TrackColor)));
+                               sigc::bind (sigc::mem_fun (*this, &MidiTimeAxisView::set_color_mode), TrackColor)));
        _channel_color_mode_item = dynamic_cast<RadioMenuItem*>(&items.back());
        _channel_color_mode_item->set_active(_color_mode == TrackColor);
-               
+
        return mode_menu;
 }
-       
+
 void
 MidiTimeAxisView::set_note_mode(NoteMode mode)
 {
@@ -445,7 +779,7 @@ MidiTimeAxisView::set_note_mode(NoteMode mode)
                _note_mode = mode;
                midi_track()->set_note_mode(mode);
                xml_node->add_property ("note-mode", enum_2_string(_note_mode));
-               _view->redisplay_diskstream();
+               _view->redisplay_track();
        }
 }
 
@@ -461,7 +795,7 @@ MidiTimeAxisView::set_color_mode(ColorMode mode)
 
                _color_mode = mode;
                xml_node->add_property ("color-mode", enum_2_string(_color_mode));
-               _view->redisplay_diskstream();
+               _view->redisplay_track();
        }
 }
 
@@ -489,8 +823,7 @@ void
 MidiTimeAxisView::show_all_automation ()
 {
        if (midi_track()) {
-               const set<Evoral::Parameter> params = midi_track()->midi_diskstream()->
-                               midi_playlist()->contained_automation();
+               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);
@@ -504,8 +837,7 @@ void
 MidiTimeAxisView::show_existing_automation ()
 {
        if (midi_track()) {
-               const set<Evoral::Parameter> params = midi_track()->midi_diskstream()->
-                               midi_playlist()->contained_automation();
+               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);
@@ -515,78 +847,49 @@ MidiTimeAxisView::show_existing_automation ()
        RouteTimeAxisView::show_existing_automation ();
 }
 
-/** Prompt for a controller with a dialog and add an automation track for it
+/** Create an automation track for the given parameter (pitch bend, channel pressure).
  */
-void
-MidiTimeAxisView::add_cc_track()
-{
-       int response;
-       Evoral::Parameter param(0, 0, 0);
-
-       {
-               AddMidiCCTrackDialog dialog;
-               dialog.set_transient_for (_editor);
-               response = dialog.run();
-               
-               if (response == Gtk::RESPONSE_ACCEPT)
-                       param = dialog.parameter();
-       }
-
-       if (param.type() != 0 && response == Gtk::RESPONSE_ACCEPT)
-               create_automation_child(param, true);
-}
-
-
-/** Add an automation track for the given parameter (pitch bend, channel pressure).
- */
-void
-MidiTimeAxisView::add_parameter_track(const Evoral::Parameter& param)
-{
-       if ( !EventTypeMap::instance().is_midi_parameter(param) ) {
-               error << "MidiTimeAxisView: unknown automation child "
-                       << ARDOUR::EventTypeMap::instance().to_symbol(param) << endmsg;
-               return;
-       } 
-
-       // 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());
-                       create_automation_child(param_with_channel, true);
-               }
-       }
-}
-
 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(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);
+       AutomationTracks::iterator existing = _automation_tracks.find (param);
+       if (existing != _automation_tracks.end()) {
+               return;
+       }
+               
+       if (param.type() == 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)
+                               )
+                       );
+
+               if (_view) {
+                       _view->foreach_regionview (sigc::mem_fun (*track.get(), &TimeAxisView::add_ghost));
+               }
+               
+               add_automation_child (param, track, show);
+       }
 }
 
 
@@ -608,7 +911,7 @@ MidiTimeAxisView::route_active_changed ()
        } else {
 
                throw; // wha?
-               
+
                if (_route->active()) {
                        controls_ebox.set_name ("BusControlsBaseUnselected");
                        controls_base_selected_name = "BusControlsBaseSelected";
@@ -621,121 +924,191 @@ MidiTimeAxisView::route_active_changed ()
        }
 }
 
+
+
 void
-MidiTimeAxisView::start_step_editing ()
+MidiTimeAxisView::add_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 (!_editor.internal_editing()) {
+               return;
+       }
 
-       if (step_edit_region) {
-               RegionView* rv = view()->find_view (step_edit_region);
-               step_edit_region_view = dynamic_cast<MidiRegionView*> (rv);
+       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::add_note_selection_region_view), note, chn_mask));
        } else {
-               step_edit_region_view = 0;
+               _view->foreach_selected_regionview (sigc::bind (sigc::mem_fun (*this, &MidiTimeAxisView::add_note_selection_region_view), note, chn_mask));
        }
-
-       midi_track()->set_step_editing (true);
 }
 
 void
-MidiTimeAxisView::stop_step_editing ()
+MidiTimeAxisView::extend_note_selection (uint8_t note)
 {
-       midi_track()->set_step_editing (false);
+       if (!_editor.internal_editing()) {
+               return;
+       }
+
+       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::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));
+       }
 }
 
 void
-MidiTimeAxisView::check_step_edit ()
+MidiTimeAxisView::toggle_note_selection (uint8_t note)
 {
-       MidiRingBuffer<nframes_t>& incoming (midi_track()->step_edit_ring_buffer());
-       Evoral::Note<Evoral::MusicalTime> note;
-       uint8_t* buf;
-       uint32_t bufsize = 32;
+       if (!_editor.internal_editing()) {
+               return;
+       }
 
-       buf = new uint8_t[bufsize];
+       uint16_t chn_mask = _channel_selector.get_selected_channels();
 
-       while (incoming.read_space()) {
-               nframes_t time;
-               Evoral::EventType type;
-               uint32_t size;
+       if (_view->num_selected_regionviews() == 0) {
+               _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));
+       }
+}
 
-               incoming.read_prefix (&time, &type, &size);
-               
-               if (size > bufsize) {
-                       delete [] buf;
-                       bufsize = size;
-                       buf = new uint8_t[bufsize];
-               }
+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, false, false);
+}
 
-               incoming.read_contents (size, buf);
-               
-               if ((buf[0] & 0xf0) == MIDI_CMD_NOTE_ON) {
+void
+MidiTimeAxisView::extend_note_selection_region_view (RegionView* rv, uint8_t note, uint16_t chn_mask)
+{
+       dynamic_cast<MidiRegionView*>(rv)->select_matching_notes (note, chn_mask, true, true);
+}
 
-                       if (step_edit_region == 0) {
+void
+MidiTimeAxisView::toggle_note_selection_region_view (RegionView* rv, uint8_t note, uint16_t chn_mask)
+{
+       dynamic_cast<MidiRegionView*>(rv)->toggle_matching_notes (note, chn_mask);
+}
 
-                               step_edit_region = add_region (step_edit_insert_position);
-                               RegionView* rv = view()->find_view (step_edit_region);
+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.
+       */
 
-                               if (rv) {
-                                       step_edit_region_view = dynamic_cast<MidiRegionView*>(rv);
-                               } else {
-                                       fatal << X_("programming error: no view found for new MIDI region") << endmsg;
-                                       /*NOTREACHED*/
-                               }
-                       }       
+       uint16_t selected_channels = _channel_selector.get_selected_channels();
+       bool changed = false;
 
-                       if (step_edit_region_view) {
+       no_redraw = true;
 
-                               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;
+       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_visibility (false) || changed;
+                       } else {
+                               changed = track->set_visibility (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) {
+               _route->gui_changed ("track_height", this);
        }
 }
 
-void
-MidiTimeAxisView::step_edit_rest ()
+Gtk::CheckMenuItem*
+MidiTimeAxisView::automation_child_menu_item (Evoral::Parameter param)
 {
-       bool success;
-       Evoral::MusicalTime beats = _editor.get_grid_type_as_beats (success, step_edit_insert_position);
-       step_edit_beat_pos += beats;
+       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<Region>
-MidiTimeAxisView::add_region (nframes64_t pos)
+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 (_("create region"));
-       XMLNode &before = playlist()->get_state();
+       real_editor->begin_reversible_command (Operations::create_region);
+        playlist()->clear_changes ();
+
+       real_editor->snap_to (pos, 0);
        
-       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 (view()->trackview().track().get(),
+                                                                                  view()->trackview().track()->name());
+       PropertyList plist; 
        
-       boost::shared_ptr<Source> src = _session.create_midi_source_for_session (*diskstream.get());
+       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, 0, (nframes_t) length, 
-                                                                  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()));
 
-       playlist()->add_region (region, start);
-       XMLNode &after = playlist()->get_state();
-       _session.add_command (new MementoCommand<Playlist> (*playlist().get(), &before, &after));
+       if (commit) {
+               real_editor->commit_reversible_command ();
+       }
 
-       real_editor->commit_reversible_command();
+       return boost::dynamic_pointer_cast<MidiRegion>(region);
+}
 
-       return 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 ();
+        }
+}