changes to help strp silence
[ardour.git] / gtk2_ardour / midi_time_axis.cc
index 5802cc7e20a76a73b5dc77a86d7ae57b1757a4e3..5949541e56b9e0f4254313778808975fac48afa2 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 <sigc++/bind.h>
 
-#include <pbd/error.h>
-#include <pbd/stl_delete.h>
-#include <pbd/whitespace.h>
+#include "pbd/error.h"
+#include "pbd/stl_delete.h"
+#include "pbd/whitespace.h"
+#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/bindable_button.h>
 #include <gtkmm2ext/utils.h>
 
-#include <ardour/midi_playlist.h>
-#include <ardour/midi_diskstream.h>
-#include <ardour/processor.h>
-#include <ardour/ladspa_plugin.h>
-#include <ardour/location.h>
-#include <ardour/playlist.h>
-#include <ardour/session.h>
-#include <ardour/session_playlist.h>
-#include <ardour/utils.h>
+#include "ardour/midi_playlist.h"
+#include "ardour/midi_diskstream.h"
+#include "ardour/midi_patch_manager.h"
+#include "ardour/midi_source.h"
+#include "ardour/processor.h"
+#include "ardour/ladspa_plugin.h"
+#include "ardour/location.h"
+#include "ardour/playlist.h"
+#include "ardour/region_factory.h"
+#include "ardour/session.h"
+#include "ardour/session_playlist.h"
+#include "ardour/tempo.h"
+#include "ardour/utils.h"
+
+#include "midi++/names.h"
 
+#include "add_midi_cc_track_dialog.h"
 #include "ardour_ui.h"
-#include "midi_time_axis.h"
-#include "automation_time_axis.h"
 #include "automation_line.h"
-#include "add_midi_cc_track_dialog.h"
+#include "automation_time_axis.h"
+#include "canvas-note-event.h"
 #include "canvas_impl.h"
 #include "crossfade_view.h"
+#include "editor.h"
 #include "enums.h"
+#include "ghostregion.h"
 #include "gui_thread.h"
 #include "keyboard.h"
+#include "midi_scroomer.h"
+#include "midi_streamview.h"
+#include "midi_region_view.h"
+#include "midi_time_axis.h"
+#include "piano_roll_header.h"
 #include "playlist_selector.h"
 #include "plugin_selector.h"
 #include "plugin_ui.h"
 #include "point_selection.h"
 #include "prompter.h"
-#include "public_editor.h"
 #include "region_view.h"
 #include "rgb_macros.h"
 #include "selection.h"
 #include "simplerect.h"
-#include "midi_streamview.h"
 #include "utils.h"
-#include "midi_scroomer.h"
-#include "piano_roll_header.h"
-#include "ghostregion.h"
 
-#include <ardour/midi_track.h>
+#include "ardour/midi_track.h"
 
 #include "i18n.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, boost::shared_ptr<Route> rt, Canvas& canvas)
-       : AxisView(sess) // FIXME: won't compile without this, why??
+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)
        , _range_scroomer(0)
        , _piano_roll_header(0)
        , _note_mode(Sustained)
-       , _note_mode_item(NULL)
-       , _percussion_mode_item(NULL)
-       , _midi_expander("MIDI")
+       , _note_mode_item(0)
+       , _percussion_mode_item(0)
+       , _color_mode(MeterColors)
+       , _meter_color_mode_item(0)
+       , _channel_color_mode_item(0)
+       , _track_color_mode_item(0)
+       , _step_edit_item (0)
+       , _midi_thru_item (0)
+       , default_channel_menu (0)
+       , controller_menu (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();
@@ -110,16 +136,21 @@ MidiTimeAxisView::MidiTimeAxisView (PublicEditor& ed, Session& sess, boost::shar
 
        /* 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, 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);
@@ -129,27 +160,65 @@ MidiTimeAxisView::MidiTimeAxisView (PublicEditor& ed, Session& sess, boost::shar
                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->RegionViewAdded.connect (sigc::mem_fun(*this, &MidiTimeAxisView::region_view_added));
                _view->attach ();
        }
-               
-       // add channel selector expander
-       HBox *channel_selector_box = manage(new HBox());
-       channel_selector_box->pack_start(_channel_selector, SHRINK, 0);
-       _midi_expander.add(*channel_selector_box);
-       _midi_expander.property_expanded().signal_changed().connect(
-                       mem_fun(this, &MidiTimeAxisView::channel_selector_toggled));
-       controls_vbox.pack_end(_midi_expander, SHRINK, 0);
+
+       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(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);
+
+       midi_controls_hbox->pack_start(_channel_selector, true, false);
+       if (!patch_manager.all_models().empty()) {
+               _midi_controls_box.pack_start(_model_selector, true, false);
+               _midi_controls_box.pack_start(_custom_device_mode_selector, true, false);
+       }
+
+       _midi_controls_box.pack_start(*midi_controls_hbox, true, true);
+
+       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(diskstream->get_channel_mode(),
+                       diskstream->get_channel_mask());
        _channel_selector.mode_changed.connect(
-               mem_fun(*midi_track()->midi_diskstream(), &MidiDiskstream::set_channel_mode));
+               sigc::mem_fun(*midi_track()->midi_diskstream(), &MidiDiskstream::set_channel_mode));
+       _channel_selector.mode_changed.connect(
+               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));
+               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));
+               if (_percussion_mode_item) {
+                       _percussion_mode_item->set_active (_note_mode == Percussive);
+               }
+       }
 }
 
 MidiTimeAxisView::~MidiTimeAxisView ()
@@ -159,6 +228,30 @@ MidiTimeAxisView::~MidiTimeAxisView ()
 
        delete _range_scroomer;
        _range_scroomer = 0;
+
+       delete controller_menu;
+}
+
+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;
+               _custom_device_mode_selector.append_text(*i);
+       }
+
+       _custom_device_mode_selector.set_active(0);
+}
+
+void MidiTimeAxisView::custom_device_mode_changed()
+{
+       _midi_patch_settings_changed.emit(_model_selector.get_active_text(),
+                       _custom_device_mode_selector.get_active_text());
 }
 
 MidiStreamView*
@@ -171,11 +264,9 @@ guint32
 MidiTimeAxisView::show_at (double y, int& nth, Gtk::VBox *parent)
 {
        ensure_xml_node ();
-       xml_node->add_property ("shown_editor", "yes");
-               
+       xml_node->add_property ("shown-editor", "yes");
+
        guint32 ret = TimeAxisView::show_at (y, nth, parent);
-       _piano_roll_header->show();
-       _range_scroomer->show();
        return ret;
 }
 
@@ -183,11 +274,35 @@ void
 MidiTimeAxisView::hide ()
 {
        ensure_xml_node ();
-       xml_node->add_property ("shown_editor", "no");
+       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();
+       } else {
+               _midi_controls_box.hide();
+       }
+
+       if (height >= KEYBOARD_MIN_HEIGHT) {
+               if (is_track() && _range_scroomer)
+                       _range_scroomer->show();
+               if (is_track() && _piano_roll_header)
+                       _piano_roll_header->show();
+       } else {
+               if (is_track() && _range_scroomer)
+                       _range_scroomer->hide();
+               if (is_track() && _piano_roll_header)
+                       _piano_roll_header->hide();
+       }
+}
+
 void
 MidiTimeAxisView::append_extra_display_menu_items ()
 {
@@ -199,20 +314,65 @@ MidiTimeAxisView::append_extra_display_menu_items ()
        Menu *range_menu = manage(new Menu);
        MenuList& range_items = range_menu->items();
        range_menu->set_name ("ArdourContextMenu");
-       
-       RadioMenuItem::Group range_group;
 
-       range_items.push_back (RadioMenuElem (range_group, _("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 (RadioMenuElem (range_group, _("Fit Contents"), bind (
-                       mem_fun(*this, &MidiTimeAxisView::set_note_range),
-                       MidiStreamView::ContentsRange)));
 
-       ((Gtk::CheckMenuItem&)range_items.back()).set_active(true);
+       range_items.push_back (MenuElem (_("Fit Contents"), sigc::bind (
+                       sigc::mem_fun(*this, &MidiTimeAxisView::set_note_range),
+                       MidiStreamView::ContentsRange)));
 
        items.push_back (MenuElem (_("Note range"), *range_menu));
+       items.push_back (MenuElem (_("Note mode"), *build_note_mode_menu()));
+       items.push_back (MenuElem (_("Default Channel"), *build_def_channel_menu()));
+
+       items.push_back (CheckMenuElem (_("MIDI Thru"), sigc::mem_fun(*this, &MidiTimeAxisView::toggle_midi_thru)));
+       _midi_thru_item = dynamic_cast<CheckMenuItem*>(&items.back());
+}
+
+Gtk::Menu*
+MidiTimeAxisView::build_def_channel_menu ()
+{
+       using namespace Menu_Helpers;
+
+       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,
+                                                           sigc::bind (sigc::mem_fun (*this, &MidiTimeAxisView::set_default_channel), i)));
+               item = dynamic_cast<RadioMenuItem*>(&def_channel_items.back());
+               item->set_active ((i == defchn));
+       }
+
+       return default_channel_menu;
+}
+
+void
+MidiTimeAxisView::set_default_channel (int chn)
+{
+       midi_track()->set_default_channel (chn);
+}
+
+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
@@ -224,14 +384,304 @@ MidiTimeAxisView::build_automation_action_menu ()
 
        MenuList& automation_items = automation_action_menu->items();
        
-       automation_items.push_back (SeparatorElem());
+       uint16_t selected_channels = _channel_selector.get_selected_channels();
+
+       if (selected_channels !=  0) {
+
+               automation_items.push_back (SeparatorElem());
+
+               /* these 3 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, _("Program PropertyChange"), MidiPgmChangeAutomation, MIDI_CMD_PGM_CHANGE);
+               add_channel_command_menu_item (automation_items, _("Bender"), MidiPitchBenderAutomation, MIDI_CMD_BENDER);
+               add_channel_command_menu_item (automation_items, _("Pressure"), MidiChannelPressureAutomation, MIDI_CMD_CHANNEL_PRESSURE);
+               
+               /* 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 ();
+               detach_menu (*controller_menu);
+               
+               automation_items.push_back (SeparatorElem());
+               automation_items.push_back (MenuElem (_("Controllers"), *controller_menu));
+       } else {
+               automation_items.push_back (MenuElem (string_compose ("<i>%1</i>", _("No MIDI Channels selected"))));
+       }
+               
+}
+
+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());
+                       RouteAutomationNode* node = automation_track (fully_qualified_param);
+
+                       if (node && node->menu_item) {
+                               node->menu_item->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.
+        */
 
-       automation_items.push_back (MenuElem (_("Controller..."), 
-                                                  mem_fun(*this, &MidiTimeAxisView::add_controller_track)));
+       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)));
+                               
+                               RouteAutomationNode* node = automation_track (fully_qualified_param);
+                               bool visible = false;
+                               
+                               if (node) {
+                                       if (node->track->marked_for_display()) {
+                                               visible = true;
+                                       }
+                               }
+                               
+                               CheckMenuItem* cmi = static_cast<CheckMenuItem*>(&chn_items.back());
+                               if (node) {
+                                       node->menu_item = cmi;
+                               }
+
+                               cmi->set_active (visible);
+
+                               parameter_menu_map[fully_qualified_param] = cmi;
+                       }
+               }
+               
+               /* 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)));
+                               
+                               RouteAutomationNode* node = automation_track (fully_qualified_param);
+                               bool visible = false;
+                               
+                               if (node) {
+                                       if (node->track->marked_for_display()) {
+                                               visible = true;
+                                       }
+                               }
+                               
+                               CheckMenuItem* cmi = static_cast<CheckMenuItem*>(&items.back());
+                               if (node) {
+                                       node->menu_item = cmi;
+                               }
+
+                               cmi->set_active (visible);
+                               
+                               parameter_menu_map[fully_qualified_param] = cmi;
+
+                               /* 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 */
+
+       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 (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)));
+
+                                               RouteAutomationNode* node = automation_track (fully_qualified_param);
+                                               bool visible = false;
+                                               
+                                               if (node) {
+                                                       if (node->track->marked_for_display()) {
+                                                               visible = true;
+                                                       }
+                                               }
+                                               
+                                               CheckMenuItem* cmi = static_cast<CheckMenuItem*>(&chn_items.back());
+
+                                               if (node) {
+                                                       node->menu_item = 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));
+
+                       } 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 (_route->describe_parameter (fully_qualified_param),
+                                                                                   sigc::bind (sigc::mem_fun (*this, &RouteTimeAxisView::toggle_automation_track),
+                                                                                               fully_qualified_param)));
+                                               
+                                               RouteAutomationNode* node = automation_track (fully_qualified_param);
+                                               bool visible = false;
+                                               
+                                               if (node) {
+                                                       if (node->track->marked_for_display()) {
+                                                               visible = true;
+                                                       }
+                                               }
+                                               
+                                               CheckMenuItem* cmi = static_cast<CheckMenuItem*>(&ctl_items.back());
+                                               if (node) {
+                                                       node->menu_item = 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));
+       }
 }
 
 Gtk::Menu*
-MidiTimeAxisView::build_mode_menu()
+MidiTimeAxisView::build_note_mode_menu()
 {
        using namespace Menu_Helpers;
 
@@ -241,36 +691,78 @@ MidiTimeAxisView::build_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);
 
        return mode_menu;
 }
-       
+
+Gtk::Menu*
+MidiTimeAxisView::build_color_mode_menu()
+{
+       using namespace Menu_Helpers;
+
+       Menu* mode_menu = manage (new Menu);
+       MenuList& items = mode_menu->items();
+       mode_menu->set_name ("ArdourContextMenu");
+
+       RadioMenuItem::Group mode_group;
+       items.push_back (RadioMenuElem (mode_group, _("Meter Colors"),
+                               sigc::bind (sigc::mem_fun (*this, &MidiTimeAxisView::set_color_mode), MeterColors)));
+       _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)));
+       _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)));
+       _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)
 {
        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();
        }
 }
 
+void
+MidiTimeAxisView::set_color_mode(ColorMode mode)
+{
+       if (_color_mode != mode) {
+               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();
+       }
+}
 
 void
 MidiTimeAxisView::set_note_range(MidiStreamView::VisibleNoteRange range)
 {
-       //if (midi_view()->note_range() != range) {
+       if (!_ignore_signals)
                midi_view()->set_note_range(range);
-               midi_view()->redisplay_diskstream();
-       //}
 }
 
 
@@ -287,81 +779,69 @@ MidiTimeAxisView::update_range()
 }
 
 void
-MidiTimeAxisView::show_existing_automation ()
+MidiTimeAxisView::show_all_automation ()
 {
        if (midi_track()) {
-               const set<Parameter> params = midi_track()->midi_diskstream()->
+               const set<Evoral::Parameter> params = midi_track()->midi_diskstream()->
                                midi_playlist()->contained_automation();
 
-               for (set<Parameter>::const_iterator i = params.begin(); i != params.end(); ++i)
+               for (set<Evoral::Parameter>::const_iterator i = params.begin(); i != params.end(); ++i) {
                        create_automation_child(*i, true);
+               }
        }
 
-       RouteTimeAxisView::show_existing_automation ();
+       RouteTimeAxisView::show_all_automation ();
 }
 
-/** Prompt for a controller with a dialog and add an automation track for it
- */
 void
-MidiTimeAxisView::add_controller_track()
+MidiTimeAxisView::show_existing_automation ()
 {
-       int response;
-       Parameter param;
+       if (midi_track()) {
+               const set<Evoral::Parameter> params = midi_track()->midi_diskstream()->
+                               midi_playlist()->contained_automation();
 
-       {
-               AddMidiCCTrackDialog dialog;
-               dialog.set_transient_for(editor);
-               response = dialog.run();
-               
-               if (response == Gtk::RESPONSE_ACCEPT)
-                       param = dialog.parameter();
+               for (set<Evoral::Parameter>::const_iterator i = params.begin(); i != params.end(); ++i) {
+                       create_automation_child(*i, true);
+               }
        }
 
-       if (response == Gtk::RESPONSE_ACCEPT)
-               create_automation_child(param, true);
+       RouteTimeAxisView::show_existing_automation ();
 }
 
+/** Hide an automation track for the given parameter (pitch bend, channel pressure).
+ */
 void
-MidiTimeAxisView::create_automation_child (Parameter param, bool show)
-{
-       if (
-                       param.type() == MidiCCAutomation ||
-                       param.type() == MidiPgmChangeAutomation ||
-                       param.type() == MidiPitchBenderAutomation ||
-                       param.type() == MidiChannelAftertouchAutomation
-          ) {
-       
-               /* FIXME: don't create AutomationList for track itself
-                * (not actually needed or used, since the automation is region-ey) */
+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 */
 
-               boost::shared_ptr<AutomationControl> c = _route->control(param);
+       if (param.type() == NullAutomation) {
+               cerr << "WARNING: Attempt to create NullAutomation child, ignoring" << endl;
+               return;
+       }
 
-               if (!c) {
-                       boost::shared_ptr<AutomationList> al(new ARDOUR::AutomationList(param,
-                                               param.min(), param.max(), (param.max() - param.min() / 2)));
-                       c = boost::shared_ptr<AutomationControl>(_route->control_factory(al));
-                       _route->add_control(c);
-               }
+       AutomationTracks::iterator existing = _automation_tracks.find (param);
+       if (existing != _automation_tracks.end()) {
+               return;
+       }
 
-               AutomationTracks::iterator existing = _automation_tracks.find(param);
-               if (existing != _automation_tracks.end())
-                       return;
-
-               boost::shared_ptr<AutomationTimeAxisView> track(new AutomationTimeAxisView (_session,
-                               _route, _route, c,
-                               editor,
-                               *this,
-                               true,
-                               parent_canvas,
-                               _route->describe_parameter(param)));
-               
-               add_automation_child(param, track, show);
+       boost::shared_ptr<AutomationControl> c = _route->get_control (param);
 
-       } else {
-               error << "MidiTimeAxisView: unknown automation child " << param.to_string() << endmsg;
-       }
+       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);
 }
 
+
 void
 MidiTimeAxisView::route_active_changed ()
 {
@@ -380,7 +860,7 @@ MidiTimeAxisView::route_active_changed ()
        } else {
 
                throw; // wha?
-               
+
                if (_route->active()) {
                        controls_ebox.set_name ("BusControlsBaseUnselected");
                        controls_base_selected_name = "BusControlsBaseSelected";
@@ -393,24 +873,237 @@ MidiTimeAxisView::route_active_changed ()
        }
 }
 
-void 
-MidiTimeAxisView::channel_selector_toggled()
+void
+MidiTimeAxisView::start_step_editing ()
 {
-       static uint32_t previous_height;
-       
-       if(_midi_expander.property_expanded()) {
+       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;
+       }
+
+       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;
 
-               previous_height = current_height();
+       buf = new uint8_t[bufsize];
 
-               if (previous_height < TimeAxisView::hLargest) {
-                       set_height (TimeAxisView::hLarge);
+       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;
+                       }
+               }
+
+       }
+}
+
+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"));
+        playlist()->clear_history ();
+
+       framepos_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());
+
+       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, start);
+       _session->add_command (new StatefulDiffCommand (playlist()));
+
+       real_editor->commit_reversible_command();
+
+       return region;
+}
+
+void
+MidiTimeAxisView::add_note_selection (uint8_t note)
+{
+       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::add_note_selection_region_view), note, chn_mask));
        } else {
+               _view->foreach_selected_regionview (sigc::bind (sigc::mem_fun (*this, &MidiTimeAxisView::add_note_selection_region_view), note, chn_mask));
+       }
+}
+
+void
+MidiTimeAxisView::extend_note_selection (uint8_t note)
+{
+       if (!_editor.internal_editing()) {
+               return;
+       }
+
+       uint16_t chn_mask = _channel_selector.get_selected_channels();
 
-               set_height (previous_height);
+       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::toggle_note_selection (uint8_t note)
+{
+       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::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));
+       }
+}
+
+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);
+}
 
+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);
+}
+
+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);
+}
+
+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);
+                       RouteAutomationNode* node = automation_track (fully_qualified_param);
+
+                       if (!node) {
+                               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 = node->track->set_visibility (false) || changed;
+                       } else {
+                               changed = node->track->set_visibility (true) || changed;
+                       }
+               }
+       }
+
+       no_redraw = false;
+
+       /* TODO: Bender, PgmChange, Pressure */
+
+       /* invalidate the controller menu, so that we rebuilt it next time */
+       delete controller_menu;
+       controller_menu = 0;
+
+       if (changed) {
+               _route->gui_changed ("track_height", this);
+       }
+}