fix message in startup wizard re: alpha
[ardour.git] / gtk2_ardour / midi_region_view.cc
index 215f7c34da5fd6d769eea5d0b7b509b0eeb67053..00bdb94dce74911508c11846a94b7a0811c3cd2c 100644 (file)
@@ -1,6 +1,6 @@
 /*
-    Copyright (C) 2001-2007 Paul Davis
-    Author: Dave Robillard
+    Copyright (C) 2001-2011 Paul Davis
+    Author: David Robillard
 
     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++/signal.h>
 
+#include "pbd/memento_command.h"
+#include "pbd/stateful_diff_command.h"
+
 #include "ardour/playlist.h"
 #include "ardour/tempo.h"
 #include "ardour/midi_region.h"
 #include "ardour/midi_source.h"
-#include "ardour/midi_diskstream.h"
 #include "ardour/midi_model.h"
 #include "ardour/midi_patch_manager.h"
+#include "ardour/session.h"
 
 #include "evoral/Parameter.hpp"
+#include "evoral/MIDIParameters.hpp"
 #include "evoral/Control.hpp"
+#include "evoral/midi_util.h"
 
 #include "automation_region_view.h"
 #include "automation_time_axis.h"
 #include "canvas-hit.h"
 #include "canvas-note.h"
-#include "canvas-program-change.h"
+#include "canvas_patch_change.h"
+#include "debug.h"
+#include "editor.h"
+#include "editor_drag.h"
 #include "ghostregion.h"
 #include "gui_thread.h"
 #include "keyboard.h"
+#include "midi_channel_dialog.h"
 #include "midi_cut_buffer.h"
+#include "midi_list_editor.h"
 #include "midi_region_view.h"
 #include "midi_streamview.h"
 #include "midi_time_axis.h"
-#include "midi_time_axis.h"
 #include "midi_util.h"
+#include "note_player.h"
 #include "public_editor.h"
+#include "rgb_macros.h"
 #include "selection.h"
 #include "simpleline.h"
 #include "streamview.h"
 #include "utils.h"
+#include "mouse_cursors.h"
+#include "patch_change_dialog.h"
+#include "verbose_cursor.h"
 
 #include "i18n.h"
 
-using namespace sigc;
 using namespace ARDOUR;
 using namespace PBD;
 using namespace Editing;
 using namespace ArdourCanvas;
+using Gtkmm2ext::Keyboard;
+
+PBD::Signal1<void, MidiRegionView *> MidiRegionView::SelectionCleared;
+
+#define MIDI_BP_ZERO ((Config->get_first_midi_bank_is_zero())?0:1)
 
 MidiRegionView::MidiRegionView (ArdourCanvas::Group *parent, RouteTimeAxisView &tv,
-               boost::shared_ptr<MidiRegion> r, double spu, Gdk::Color const & basic_color)
+                                boost::shared_ptr<MidiRegion> r, double spu, Gdk::Color const & basic_color)
        : RegionView (parent, tv, r, spu, basic_color)
        , _force_channel(-1)
        , _last_channel_selection(0xFFFF)
-       , _default_note_length(1.0)
        , _current_range_min(0)
        , _current_range_max(0)
        , _model_name(string())
        , _custom_device_mode(string())
        , _active_notes(0)
-       , _note_group(new ArdourCanvas::Group(*parent))
-       , _delta_command(NULL)
+       , _note_group(new ArdourCanvas::Group(*group))
+       , _note_diff_command (0)
+       , _ghost_note(0)
+       , _drag_rect (0)
+       , _step_edit_cursor (0)
+       , _step_edit_cursor_width (1.0)
+       , _step_edit_cursor_position (0.0)
+       , _channel_selection_scoped_note (0)
+       , _temporary_note_group (0)
        , _mouse_state(None)
        , _pressed_button(0)
+       , _sort_needed (true)
+       , _optimization_iterator (_events.end())
+       , _list_editor (0)
+       , _no_sound_notes (false)
+       , _last_event_x (0)
+       , _last_event_y (0)
+       , _pre_enter_cursor (0)
 {
        _note_group->raise_to_top();
+       PublicEditor::DropDownKeys.connect (sigc::mem_fun (*this, &MidiRegionView::drop_down_keys));
+
+       Config->ParameterChanged.connect (*this, invalidator (*this), ui_bind (&MidiRegionView::parameter_changed, this, _1), gui_context());
+       connect_to_diskstream ();
+
+       SelectionCleared.connect (_selection_cleared_connection, invalidator (*this), ui_bind (&MidiRegionView::selection_cleared, this, _1), gui_context ());
 }
 
 MidiRegionView::MidiRegionView (ArdourCanvas::Group *parent, RouteTimeAxisView &tv,
-               boost::shared_ptr<MidiRegion> r, double spu, Gdk::Color& basic_color,
-               TimeAxisViewItem::Visibility visibility)
+                                boost::shared_ptr<MidiRegion> r, double spu, Gdk::Color& basic_color,
+                                TimeAxisViewItem::Visibility visibility)
        : RegionView (parent, tv, r, spu, basic_color, false, visibility)
        , _force_channel(-1)
        , _last_channel_selection(0xFFFF)
-       , _default_note_length(1.0)
        , _model_name(string())
        , _custom_device_mode(string())
        , _active_notes(0)
        , _note_group(new ArdourCanvas::Group(*parent))
-       , _delta_command(NULL)
+       , _note_diff_command (0)
+       , _ghost_note(0)
+       , _drag_rect (0)
+       , _step_edit_cursor (0)
+       , _step_edit_cursor_width (1.0)
+       , _step_edit_cursor_position (0.0)
+       , _channel_selection_scoped_note (0)
+       , _temporary_note_group (0)
        , _mouse_state(None)
        , _pressed_button(0)
-       
+       , _sort_needed (true)
+       , _optimization_iterator (_events.end())
+       , _list_editor (0)
+       , _no_sound_notes (false)
+       , _last_event_x (0)
+       , _last_event_y (0)
 {
        _note_group->raise_to_top();
+       PublicEditor::DropDownKeys.connect (sigc::mem_fun (*this, &MidiRegionView::drop_down_keys));
+
+       connect_to_diskstream ();
+
+       SelectionCleared.connect (_selection_cleared_connection, invalidator (*this), ui_bind (&MidiRegionView::selection_cleared, this, _1), gui_context ());
 }
 
+void
+MidiRegionView::parameter_changed (std::string const & p)
+{
+       if (p == "diplay-first-midi-bank-as-zero") {
+               if (_enable_display) {
+                       redisplay_model();
+               }
+       }
+}
 
 MidiRegionView::MidiRegionView (const MidiRegionView& other)
        : sigc::trackable(other)
        , RegionView (other)
        , _force_channel(-1)
        , _last_channel_selection(0xFFFF)
-       , _default_note_length(1.0)
        , _model_name(string())
        , _custom_device_mode(string())
        , _active_notes(0)
        , _note_group(new ArdourCanvas::Group(*get_canvas_group()))
-       , _delta_command(NULL)
+       , _note_diff_command (0)
+       , _ghost_note(0)
+       , _drag_rect (0)
+       , _step_edit_cursor (0)
+       , _step_edit_cursor_width (1.0)
+       , _step_edit_cursor_position (0.0)
+       , _channel_selection_scoped_note (0)
+       , _temporary_note_group (0)
        , _mouse_state(None)
        , _pressed_button(0)
+       , _sort_needed (true)
+       , _optimization_iterator (_events.end())
+       , _list_editor (0)
+       , _no_sound_notes (false)
+       , _last_event_x (0)
+       , _last_event_y (0)
 {
        Gdk::Color c;
        int r,g,b,a;
 
        UINT_TO_RGBA (other.fill_color, &r, &g, &b, &a);
        c.set_rgb_p (r/255.0, g/255.0, b/255.0);
-       
+
        init (c, false);
 }
 
@@ -133,14 +207,26 @@ MidiRegionView::MidiRegionView (const MidiRegionView& other, boost::shared_ptr<M
        : RegionView (other, boost::shared_ptr<Region> (region))
        , _force_channel(-1)
        , _last_channel_selection(0xFFFF)
-       , _default_note_length(1.0)
        , _model_name(string())
        , _custom_device_mode(string())
        , _active_notes(0)
        , _note_group(new ArdourCanvas::Group(*get_canvas_group()))
-       , _delta_command(NULL)
+       , _note_diff_command (0)
+       , _ghost_note(0)
+       , _drag_rect (0)
+       , _step_edit_cursor (0)
+       , _step_edit_cursor_width (1.0)
+       , _step_edit_cursor_position (0.0)
+       , _channel_selection_scoped_note (0)
+       , _temporary_note_group (0)
        , _mouse_state(None)
        , _pressed_button(0)
+       , _sort_needed (true)
+       , _optimization_iterator (_events.end())
+       , _list_editor (0)
+       , _no_sound_notes (false)
+       , _last_event_x (0)
+       , _last_event_y (0)
 {
        Gdk::Color c;
        int r,g,b,a;
@@ -154,6 +240,12 @@ MidiRegionView::MidiRegionView (const MidiRegionView& other, boost::shared_ptr<M
 void
 MidiRegionView::init (Gdk::Color const & basic_color, bool wfd)
 {
+       PublicEditor::DropDownKeys.connect (sigc::mem_fun (*this, &MidiRegionView::drop_down_keys));
+
+       CanvasNoteEvent::CanvasNoteEventDeleted.connect (note_delete_connection, MISSING_INVALIDATOR,
+                                                        ui_bind (&MidiRegionView::maybe_remove_deleted_note_from_selection, this, _1),
+                                                        gui_context());
+
        if (wfd) {
                midi_region()->midi_source(0)->load_model();
        }
@@ -169,9 +261,9 @@ MidiRegionView::init (Gdk::Color const & basic_color, bool wfd)
 
        region_muted ();
        region_sync_changed ();
-       region_resized (BoundsChanged);
+       region_resized (ARDOUR::bounds_change);
        region_locked ();
-       
+
        reset_width_dependent_items (_pixel_width);
 
        set_colors ();
@@ -179,511 +271,694 @@ MidiRegionView::init (Gdk::Color const & basic_color, bool wfd)
        _enable_display = true;
        if (_model) {
                if (wfd) {
-                       redisplay_model();
+                       display_model (_model);
                }
-               _model->ContentsChanged.connect(sigc::mem_fun(this, &MidiRegionView::redisplay_model));
        }
 
        group->raise_to_top();
-       group->signal_event().connect (mem_fun (this, &MidiRegionView::canvas_event), false);
+       group->signal_event().connect(
+               sigc::mem_fun(this, &MidiRegionView::canvas_event), false);
 
        midi_view()->signal_channel_mode_changed().connect(
-                       mem_fun(this, &MidiRegionView::midi_channel_mode_changed));
-       
+               sigc::mem_fun(this, &MidiRegionView::midi_channel_mode_changed));
+
        midi_view()->signal_midi_patch_settings_changed().connect(
-                       mem_fun(this, &MidiRegionView::midi_patch_settings_changed));
+               sigc::mem_fun(this, &MidiRegionView::midi_patch_settings_changed));
+
+       trackview.editor().SnapChanged.connect(snap_changed_connection, invalidator(*this),
+                                              ui_bind(&MidiRegionView::snap_changed, this),
+                                              gui_context());
+
+       Config->ParameterChanged.connect (*this, invalidator (*this), ui_bind (&MidiRegionView::parameter_changed, this, _1), gui_context());
+       connect_to_diskstream ();
+
+       SelectionCleared.connect (_selection_cleared_connection, invalidator (*this), ui_bind (&MidiRegionView::selection_cleared, this, _1), gui_context ());
+}
+
+const boost::shared_ptr<ARDOUR::MidiRegion>
+MidiRegionView::midi_region() const
+{
+       return boost::dynamic_pointer_cast<ARDOUR::MidiRegion>(_region);
+}
+
+void
+MidiRegionView::connect_to_diskstream ()
+{
+       midi_view()->midi_track()->DataRecorded.connect(
+               *this, invalidator(*this),
+               ui_bind(&MidiRegionView::data_recorded, this, _1),
+               gui_context());
 }
 
 bool
 MidiRegionView::canvas_event(GdkEvent* ev)
 {
-       PublicEditor& editor (trackview.editor());
+       switch (ev->type) {
+       case GDK_ENTER_NOTIFY:
+       case GDK_LEAVE_NOTIFY:
+               _last_event_x = ev->crossing.x;
+               _last_event_y = ev->crossing.y;
+               break;
+       case GDK_MOTION_NOTIFY:
+               _last_event_x = ev->motion.x;
+               _last_event_y = ev->motion.y;
+               break;
+       default:
+               break;
+       }
 
-       if (!editor.internal_editing()) {
+       if (!trackview.editor().internal_editing()) {
                return false;
        }
 
-       static double drag_start_x, drag_start_y;
-       static double last_x, last_y;
-       double event_x, event_y;
-       nframes64_t event_frame = 0;
-
-       static ArdourCanvas::SimpleRect* drag_rect = NULL;
-
        switch (ev->type) {
+       case GDK_SCROLL:
+               return scroll (&ev->scroll);
+
        case GDK_KEY_PRESS:
-               if (ev->key.keyval == GDK_Shift_L || ev->key.keyval == GDK_Control_L) {
-                       _mouse_state = SelectTouchDragging;
-                       return true;
-               } else if (ev->key.keyval == GDK_Escape) {
-                       clear_selection();
-                       _mouse_state = None;
-               }
-               return false;
+               return key_press (&ev->key);
 
        case GDK_KEY_RELEASE:
-               if (ev->key.keyval == GDK_Delete) {
-                       delete_selection();
-                       apply_command();
-                       return true;
-               } else if (ev->key.keyval == GDK_Shift_L || ev->key.keyval == GDK_Control_L) {
-                       _mouse_state = None;
-                       return true;
-               }
-               return false;
+               return key_release (&ev->key);
 
        case GDK_BUTTON_PRESS:
-               if (_mouse_state != SelectTouchDragging && ev->button.button == 1) {
-                       _pressed_button = ev->button.button;
-                       _mouse_state = Pressed;
-                       return true;
-               }
-               _pressed_button = ev->button.button;
-               return true;
+               return button_press (&ev->button);
 
        case GDK_2BUTTON_PRESS:
                return true;
 
+       case GDK_BUTTON_RELEASE:
+               return button_release (&ev->button);
+
        case GDK_ENTER_NOTIFY:
-               /* FIXME: do this on switch to note tool, too, if the pointer is already in */
-               Keyboard::magic_widget_grab_focus();
-               group->grab_focus();
-               break;
+               return enter_notify (&ev->crossing);
+
+       case GDK_LEAVE_NOTIFY:
+               return leave_notify (&ev->crossing);
 
        case GDK_MOTION_NOTIFY:
-               event_x = ev->motion.x;
-               event_y = ev->motion.y;
-               group->w2i(event_x, event_y);
-
-               // convert event_x to global frame
-               event_frame = trackview.editor().pixel_to_frame(event_x) + _region->position();
-               trackview.editor().snap_to(event_frame);
-               // convert event_frame back to local coordinates relative to position
-               event_frame -= _region->position();
-
-               switch (_mouse_state) {
-               case Pressed: // Drag start
-
-                       // Select drag start
-                       if (_pressed_button == 1 && editor.current_mouse_mode() == MouseRange) {
-                               group->grab(GDK_POINTER_MOTION_MASK | GDK_BUTTON_RELEASE_MASK,
-                                               Gdk::Cursor(Gdk::FLEUR), ev->motion.time);
-                               last_x = event_x;
-                               last_y = event_y;
-                               drag_start_x = event_x;
-                               drag_start_y = event_y;
-
-                               drag_rect = new ArdourCanvas::SimpleRect(*group);
-                               drag_rect->property_x1() = event_x;
-                               drag_rect->property_y1() = event_y;
-                               drag_rect->property_x2() = event_x;
-                               drag_rect->property_y2() = event_y;
-                               drag_rect->property_outline_what() = 0xFF;
-                               drag_rect->property_outline_color_rgba()
-                                       = ARDOUR_UI::config()->canvasvar_MidiSelectRectOutline.get();
-                               drag_rect->property_fill_color_rgba()
-                                       = ARDOUR_UI::config()->canvasvar_MidiSelectRectFill.get();
-
-                               _mouse_state = SelectRectDragging;
-                               return true;
+               return motion (&ev->motion);
 
-                       // Add note drag start
-                       } else if (editor.current_mouse_mode() == MouseObject) {
-                               group->grab(GDK_POINTER_MOTION_MASK | GDK_BUTTON_RELEASE_MASK,
-                                               Gdk::Cursor(Gdk::FLEUR), ev->motion.time);
-                               last_x = event_x;
-                               last_y = event_y;
-                               drag_start_x = event_x;
-                               drag_start_y = event_y;
-
-                               drag_rect = new ArdourCanvas::SimpleRect(*group);
-                               drag_rect->property_x1() = trackview.editor().frame_to_pixel(event_frame);
-
-                               drag_rect->property_y1() = midi_stream_view()->note_to_y(
-                                               midi_stream_view()->y_to_note(event_y));
-                               drag_rect->property_x2() = event_x;
-                               drag_rect->property_y2() = drag_rect->property_y1()
-                                                        + floor(midi_stream_view()->note_height());
-                               drag_rect->property_outline_what() = 0xFF;
-                               drag_rect->property_outline_color_rgba() = 0xFFFFFF99;
-                               drag_rect->property_fill_color_rgba()    = 0xFFFFFF66;
-
-                               _mouse_state = AddDragging;
-                               return true;
-                       }
+       default:
+               break;
+       }
 
-                       return false;
+       return false;
+}
 
-               case SelectRectDragging: // Select drag motion
-               case AddDragging: // Add note drag motion
-                       if (ev->motion.is_hint) {
-                               int t_x;
-                               int t_y;
-                               GdkModifierType state;
-                               gdk_window_get_pointer(ev->motion.window, &t_x, &t_y, &state);
-                               event_x = t_x;
-                               event_y = t_y;
-                       }
+void
+MidiRegionView::remove_ghost_note ()
+{
+       delete _ghost_note;
+       _ghost_note = 0;
+}
 
-                       if (_mouse_state == AddDragging)
-                               event_x = trackview.editor().frame_to_pixel(event_frame);
+bool
+MidiRegionView::enter_notify (GdkEventCrossing* ev)
+{
+       trackview.editor().MouseModeChanged.connect (
+               _mouse_mode_connection, invalidator (*this), ui_bind (&MidiRegionView::mouse_mode_changed, this), gui_context ()
+               );
 
-                       if (drag_rect) {
-                               if (event_x > drag_start_x)
-                                       drag_rect->property_x2() = event_x;
-                               else
-                                       drag_rect->property_x1() = event_x;
-                       }
+       if (trackview.editor().current_mouse_mode() == MouseRange) {
+               create_ghost_note (ev->x, ev->y);
+       }
 
-                       if (drag_rect && _mouse_state == SelectRectDragging) {
-                               if (event_y > drag_start_y)
-                                       drag_rect->property_y2() = event_y;
-                               else
-                                       drag_rect->property_y1() = event_y;
+       if (!trackview.editor().internal_editing()) {
+               Keyboard::magic_widget_drop_focus();
+       } else {
+               Keyboard::magic_widget_grab_focus();
+               group->grab_focus();
+       }
 
-                               update_drag_selection(drag_start_x, event_x, drag_start_y, event_y);
-                       }
+       return false;
+}
 
-                       last_x = event_x;
-                       last_y = event_y;
+bool
+MidiRegionView::leave_notify (GdkEventCrossing*)
+{
+       _mouse_mode_connection.disconnect ();
 
-               case SelectTouchDragging:
-                       return false;
+       trackview.editor().verbose_cursor()->hide ();
+       remove_ghost_note ();
 
-               default:
-                       break;
-               }
-               break;
+       return false;
+}
 
-       case GDK_BUTTON_RELEASE:
-               event_x = ev->motion.x;
-               event_y = ev->motion.y;
-               group->w2i(event_x, event_y);
-               group->ungrab(ev->button.time);
-               event_frame = trackview.editor().pixel_to_frame(event_x);
+void
+MidiRegionView::mouse_mode_changed ()
+{
+       if (trackview.editor().current_mouse_mode() == MouseRange && trackview.editor().internal_editing()) {
+               create_ghost_note (_last_event_x, _last_event_y);
+       } else {
+               remove_ghost_note ();
+               trackview.editor().verbose_cursor()->hide ();
+       }
 
-               if (_pressed_button != 1) {
-                       return false;
-               }
-                       
-               switch (_mouse_state) {
-               case Pressed: // Clicked
-                       switch (editor.current_mouse_mode()) {
-                       case MouseRange:
-                       case MouseTimeFX:
-                               clear_selection();
-                               break;
-                       case MouseObject:
-                               create_note_at(event_x, event_y, _default_note_length);
-                       default: break;
-                       }
-                       _mouse_state = None;
-                       break;
-               case SelectRectDragging: // Select drag done
-                       _mouse_state = None;
-                       delete drag_rect;
-                       drag_rect = NULL;
-                       break;
-               case AddDragging: // Add drag done
-                       _mouse_state = None;
-                       if (drag_rect->property_x2() > drag_rect->property_x1() + 2) {
-                               const double x      = drag_rect->property_x1();
-                               const double length = trackview.editor().pixel_to_frame(
-                                                       drag_rect->property_x2() - drag_rect->property_x1());
-                                       
-                               create_note_at(x, drag_rect->property_y1(), frames_to_beats(length));
-                       }
+       if (!trackview.editor().internal_editing()) {
+               Keyboard::magic_widget_drop_focus();
+       } else {
+               Keyboard::magic_widget_grab_focus();
+               group->grab_focus();
+       }
+}
 
-                       delete drag_rect;
-                       drag_rect = NULL;
-               default: break;
-               }
+bool
+MidiRegionView::button_press (GdkEventButton* ev)
+{
+       if (ev->button != 1) {
+               return false;
+       }
+
+       _last_x = ev->x;
+       _last_y = ev->y;
+
+       group->w2i (_last_x, _last_y);
+
+       if (_mouse_state != SelectTouchDragging) {
 
-       default: break;
+               _pressed_button = ev->button;
+               _mouse_state = Pressed;
+
+               return true;
        }
 
-       return false;
-}
+       _pressed_button = ev->button;
 
+       return true;
+}
 
-/** Add a note to the model, and the view, at a canvas (click) coordinate.
- * \param x horizontal position in pixels
- * \param y vertical position in pixels
- * \param length duration of the note in beats */
-void
-MidiRegionView::create_note_at(double x, double y, double length)
+bool
+MidiRegionView::button_release (GdkEventButton* ev)
 {
-       MidiTimeAxisView* const mtv = dynamic_cast<MidiTimeAxisView*>(&trackview);
-       MidiStreamView* const view = mtv->midi_view();
+       double event_x, event_y;
 
-       double note = midi_stream_view()->y_to_note(y);
+       if (ev->button != 1) {
+               return false;
+       }
 
-       assert(note >= 0.0);
-       assert(note <= 127.0);
+       event_x = ev->x;
+       event_y = ev->y;
 
-       // Start of note in frames relative to region start
-       nframes64_t start_frames = snap_frame_to_frame(trackview.editor().pixel_to_frame(x));
-       assert(start_frames >= 0);
+       group->w2i(event_x, event_y);
+       group->ungrab(ev->time);
 
-       // Snap length
-       length = frames_to_beats(
-                       snap_frame_to_frame(start_frames + beats_to_frames(length)) - start_frames);
+       PublicEditor& editor = trackview.editor ();
 
-       const boost::shared_ptr<NoteType> new_note(new NoteType(0,
-                       frames_to_beats(start_frames + _region->start()), length,
-                       (uint8_t)note, 0x40));
+       switch (_mouse_state) {
+       case Pressed: // Clicked
 
-       view->update_note_range(new_note->note());
+               switch (editor.current_mouse_mode()) {
+               case MouseObject:
+               case MouseTimeFX:
+                       {
+                               clear_selection();
 
-       MidiModel::DeltaCommand* cmd = _model->new_delta_command("add note");
-       cmd->add(new_note);
-       _model->apply_command(trackview.session(), cmd);
-}
+                               if (Keyboard::is_insert_note_event(ev)) {
 
+                                       double event_x, event_y;
 
-void
-MidiRegionView::clear_events()
-{
-       clear_selection();
+                                       event_x = ev->x;
+                                       event_y = ev->y;
+                                       group->w2i(event_x, event_y);
 
-       MidiGhostRegion* gr;
-       for (std::vector<GhostRegion*>::iterator g = ghosts.begin(); g != ghosts.end(); ++g) {
-               if ((gr = dynamic_cast<MidiGhostRegion*>(*g)) != 0) {
-                       gr->clear_events();
-               }
-       }
+                                       bool success;
+                                       Evoral::MusicalTime beats = editor.get_grid_type_as_beats (success, editor.pixel_to_frame (event_x));
 
-       for (Events::iterator i = _events.begin(); i != _events.end(); ++i) {
-               delete *i;
-       }
+                                       if (!success) {
+                                               beats = 1;
+                                       }
 
-       _events.clear();
-       _pgm_changes.clear();
-       _sys_exes.clear();
-}
+                                       create_note_at (event_x, event_y, beats, true, true);
+                               }
 
+                               break;
+                       }
+               case MouseRange:
+                       {
+                               bool success;
+                               Evoral::MusicalTime beats = editor.get_grid_type_as_beats (success, editor.pixel_to_frame (event_x));
 
-void
-MidiRegionView::display_model(boost::shared_ptr<MidiModel> model)
-{
-       _model = model;
-       if (_enable_display) {
-               redisplay_model();
-       }
-}
-       
-       
-void
-MidiRegionView::start_delta_command(string name)
-{
-       if (!_delta_command) {
-               _delta_command = _model->new_delta_command(name);
-       }
-}
+                               if (!success) {
+                                       beats = 1;
+                               }
 
-void
-MidiRegionView::command_add_note(const boost::shared_ptr<NoteType> note, bool selected, bool show_velocity)
-{
-       if (_delta_command) {
-               _delta_command->add(note);
-       }
-       if (selected) {
-               _marked_for_selection.insert(note);
-       }
-       if (show_velocity) {
-               _marked_for_velocity.insert(note);
-       }
-}
+                               create_note_at (event_x, event_y, beats, true, true);
 
-void
-MidiRegionView::command_remove_note(ArdourCanvas::CanvasNoteEvent* ev)
-{
-       if (_delta_command && ev->note()) {
-               _delta_command->remove(ev->note());
-       }
-}
-       
-void
-MidiRegionView::apply_command()
-{
-       if (!_delta_command) {
-               return;
-       }
+                               break;
+                       }
+               default:
+                       break;
+               }
 
-       // Mark all selected notes for selection when model reloads
-       for (Selection::iterator i = _selection.begin(); i != _selection.end(); ++i) {
-               _marked_for_selection.insert((*i)->note());
-       }
-       
-       _model->apply_command(trackview.session(), _delta_command);
-       _delta_command = NULL; 
-       midi_view()->midi_track()->diskstream()->playlist_modified();
+               _mouse_state = None;
+               break;
 
-       _marked_for_selection.clear();
-       _marked_for_velocity.clear();
-}
-       
+       case SelectRectDragging: // Select drag done
+               editor.drags()->end_grab ((GdkEvent *) ev);
+               _mouse_state = None;
+               break;
 
-void
-MidiRegionView::abort_command()
-{
-       delete _delta_command;
-       _delta_command = NULL;
-       clear_selection();
-}
+       case AddDragging: // Add drag done
 
+               _mouse_state = None;
 
-void
-MidiRegionView::redisplay_model()
-{
-       // Don't redisplay the model if we're currently recording and displaying that
-       if (_active_notes) {
-               return;
-       }
+               if (Keyboard::is_insert_note_event(ev) || trackview.editor().current_mouse_mode() == MouseRange) {
 
-       if (_model) {
-               clear_events();
-               _model->read_lock();
-               
-               MidiModel::Notes notes = _model->notes();
-               
-               for (size_t i = 0; i < _model->n_notes(); ++i) {
-                       add_note(_model->note_at(i));
+                       if (_drag_rect->property_x2() > _drag_rect->property_x1() + 2) {
+
+                               const double x  = _drag_rect->property_x1();
+                               const double length = trackview.editor().pixel_to_frame (_drag_rect->property_x2() - _drag_rect->property_x1());
+
+                               create_note_at (x, _drag_rect->property_y1(), region_frames_to_region_beats(length), true, false);
+                       }
                }
-               
-               display_sysexes();
 
-               display_program_changes();
+               delete _drag_rect;
+               _drag_rect = 0;
 
-               _model->read_unlock();
+               create_ghost_note (ev->x, ev->y);
 
-       } else {
-               cerr << "MidiRegionView::redisplay_model called without a model" << endmsg;
+       default:
+               break;
        }
+
+       return false;
 }
 
-void
-MidiRegionView::display_program_changes()
+bool
+MidiRegionView::motion (GdkEventMotion* ev)
 {
-       boost::shared_ptr<Evoral::Control> control = _model->control(MidiPgmChangeAutomation);
-       if (!control) {
-               return;
-       }
+       double event_x, event_y;
+       framepos_t event_frame = 0;
 
-       Glib::Mutex::Lock lock (control->list()->lock());
+       event_x = ev->x;
+       event_y = ev->y;
+       group->w2i(event_x, event_y);
 
-       uint8_t channel = control->parameter().channel();
+       PublicEditor& editor = trackview.editor ();
+       
+       // convert event_x to global frame
+       framecnt_t grid_frames;
+       event_frame = snap_frame_to_grid_underneath (editor.pixel_to_frame (event_x), grid_frames);
 
-       for (AutomationList::const_iterator event = control->list()->begin();
-                       event != control->list()->end(); ++event) {
-               double event_time     = (*event)->when;
-               double program_number = floor((*event)->value + 0.5);
+       if (!_ghost_note && editor.current_mouse_mode() != MouseRange
+           && Keyboard::modifier_state_contains (ev->state, Keyboard::insert_note_modifier())
+           && _mouse_state != AddDragging) {
 
-               // Get current value of bank select MSB at time of the program change
-               Evoral::Parameter bank_select_msb(MidiCCAutomation, channel, MIDI_CTL_MSB_BANK);
-               boost::shared_ptr<Evoral::Control> msb_control = _model->control(bank_select_msb);
-               uint8_t msb = 0;
-               if (msb_control != 0) {
-                       msb = uint8_t(floor(msb_control->get_float(true, event_time) + 0.5));
-               }
+               create_ghost_note (ev->x, ev->y);
+       } else if (_ghost_note && editor.current_mouse_mode() != MouseRange
+                  && Keyboard::modifier_state_contains (ev->state, Keyboard::insert_note_modifier())) {
 
-               // Get current value of bank select LSB at time of the program change
-               Evoral::Parameter bank_select_lsb(MidiCCAutomation, channel, MIDI_CTL_LSB_BANK);
-               boost::shared_ptr<Evoral::Control> lsb_control = _model->control(bank_select_lsb);
-               uint8_t lsb = 0;
-               if (lsb_control != 0) {
-                       lsb = uint8_t(floor(lsb_control->get_float(true, event_time) + 0.5));
-               }
+               update_ghost_note (ev->x, ev->y);
+       } else if (_ghost_note && editor.current_mouse_mode() != MouseRange) {
 
-               MIDI::Name::PatchPrimaryKey patch_key(msb, lsb, program_number);
+               delete _ghost_note;
+               _ghost_note = 0;
 
-               boost::shared_ptr<MIDI::Name::Patch> patch = 
-                       MIDI::Name::MidiPatchManager::instance().find_patch(
-                                       _model_name, _custom_device_mode, channel, patch_key);
+               editor.verbose_cursor()->hide ();
+       } else if (_ghost_note && editor.current_mouse_mode() == MouseRange) {
+               update_ghost_note (ev->x, ev->y);
+       }
 
-               PCEvent program_change(event_time, uint8_t(program_number), channel);
+       /* any motion immediately hides velocity text that may have been visible */
 
-               if (patch != 0) {
-                       add_pgm_change(program_change, patch->name());
-               } else {
-                       char buf[4];
-                       snprintf(buf, 4, "%d", int(program_number));
-                       add_pgm_change(program_change, buf);
-               }
+       for (Selection::iterator i = _selection.begin(); i != _selection.end(); ++i) {
+               (*i)->hide_velocity ();
        }
-}
 
-void 
-MidiRegionView::display_sysexes()
-{
-       for (MidiModel::SysExes::const_iterator i = _model->sysexes().begin(); i != _model->sysexes().end(); ++i) {
-               ARDOUR::MidiModel::TimeType time = (*i)->time();
-               assert(time >= 0);
+       switch (_mouse_state) {
+       case Pressed: // Maybe start a drag, if we've moved a bit
+
+               if (fabs (event_x - _last_x) < 1 && fabs (event_y - _last_y) < 1) {
+                       /* no appreciable movement since the button was pressed */
+                       return false;
+               }
+
+               if (_pressed_button == 1 && editor.current_mouse_mode() == MouseObject
+                   && !Keyboard::modifier_state_contains (ev->state, Keyboard::insert_note_modifier())) {
+
+                       editor.drags()->set (new MidiRubberbandSelectDrag (dynamic_cast<Editor *> (&editor), this), (GdkEvent *) ev);
+                       _mouse_state = SelectRectDragging;
+                       return true;
+
+               } else if (editor.internal_editing()) {
+                       // Add note drag start
+
+                       group->grab(GDK_POINTER_MOTION_MASK | GDK_BUTTON_RELEASE_MASK,
+                                   Gdk::Cursor(Gdk::FLEUR), ev->time);
+
+                       _last_x = event_x;
+                       _last_y = event_y;
+                       _drag_start_x = event_x;
+                       _drag_start_y = event_y;
+
+                       _drag_rect = new ArdourCanvas::SimpleRect(*group);
+                       _drag_rect->property_x1() = editor.frame_to_pixel(event_frame);
+
+                       _drag_rect->property_y1() = midi_stream_view()->note_to_y(
+                               midi_stream_view()->y_to_note(event_y));
+                       _drag_rect->property_x2() = editor.frame_to_pixel(event_frame);
+                       
+                       _drag_rect->property_y2() = _drag_rect->property_y1()
+                               + floor(midi_stream_view()->note_height());
+                       _drag_rect->property_outline_what() = 0xFF;
+                       _drag_rect->property_outline_color_rgba() = 0xFFFFFF99;
+                       _drag_rect->property_fill_color_rgba()    = 0xFFFFFF66;
+
+                       _mouse_state = AddDragging;
+                       
+                       delete _ghost_note;
+                       _ghost_note = 0;
+
+                       editor.verbose_cursor()->hide ();
+
+                       return true;
+               }
+
+               return false;
+
+       case SelectRectDragging:
+               editor.drags()->motion_handler ((GdkEvent *) ev, false);
+               break;
                
-               ostringstream str;
-               str << hex;
-               for (uint32_t b = 0; b < (*i)->size(); ++b) {
-                       str << int((*i)->buffer()[b]);
-                       if (b != (*i)->size() -1) {
-                               str << " ";
+       case AddDragging: // Add note drag motion
+
+               if (ev->is_hint) {
+                       int t_x;
+                       int t_y;
+                       GdkModifierType state;
+                       gdk_window_get_pointer(ev->window, &t_x, &t_y, &state);
+                       event_x = t_x;
+                       event_y = t_y;
+               }
+
+               if (_mouse_state == AddDragging) {
+                       event_x = editor.frame_to_pixel(event_frame);
+
+                       if (editor.snap_mode() == SnapNormal) {
+                               /* event_frame will have been snapped to the start of the note we are under;
+                                  it's more intuitive if we use the end of that note here
+                               */
+                               event_x = editor.frame_to_pixel (event_frame + grid_frames);
+                       } else {
+                               event_x = editor.frame_to_pixel (event_frame);
                        }
+                       
                }
-               string text = str.str();
-               
-               ArdourCanvas::Group* const group = (ArdourCanvas::Group*)get_canvas_group();
-               const double x = trackview.editor().frame_to_pixel(beats_to_frames(time));
-               
-               double height = midi_stream_view()->contents_height();
-               
-               boost::shared_ptr<CanvasSysEx> sysex = boost::shared_ptr<CanvasSysEx>(
-                               new CanvasSysEx(*this, *group, text, height, x, 1.0));
-               
-               // Show unless program change is beyond the region bounds
-               if (time - _region->start() >= _region->length() || time < _region->start()) {
-                       sysex->hide();
-               } else {
-                       sysex->show();
+
+               if (_drag_rect) {
+
+                       if (event_x > _drag_start_x) {
+                               _drag_rect->property_x2() = event_x;
+                       }
+                       else {
+                               _drag_rect->property_x1() = event_x;
+                       }
                }
-               
-               _sys_exes.push_back(sysex);
+
+               _last_x = event_x;
+               _last_y = event_y;
+
+       case SelectTouchDragging:
+               return false;
+
+       default:
+               break;
        }
+
+       return false;
 }
 
 
-MidiRegionView::~MidiRegionView ()
+bool
+MidiRegionView::scroll (GdkEventScroll* ev)
 {
-       in_destructor = true;
+       if (_selection.empty()) {
+               return false;
+       }
 
-       RegionViewGoingAway (this); /* EMIT_SIGNAL */
+       if (Keyboard::modifier_state_equals (ev->state, Keyboard::PrimaryModifier)) {
+               /* XXX: bit of a hack; allow PrimaryModifier scroll through so that
+                  it still works for zoom.
+               */
+               return false;
+       }
 
-       if (_active_notes) {
-               end_write();
+       trackview.editor().verbose_cursor()->hide ();
+
+       bool fine = !Keyboard::modifier_state_equals (ev->state, Keyboard::SecondaryModifier);
+
+       if (ev->direction == GDK_SCROLL_UP) {
+               change_velocities (true, fine, false);
+       } else if (ev->direction == GDK_SCROLL_DOWN) {
+               change_velocities (false, fine, false);
        }
+       return true;
+}
 
-       _selection.clear();
-       clear_events();
-       delete _note_group;
-       delete _delta_command;
+bool
+MidiRegionView::key_press (GdkEventKey* ev)
+{
+       /* since GTK bindings are generally activated on press, and since
+          detectable auto-repeat is the name of the game and only sends
+          repeated presses, carry out key actions at key press, not release.
+       */
+
+       bool unmodified = Keyboard::no_modifier_keys_pressed (ev);
+       
+       if (unmodified && (ev->keyval == GDK_Alt_L || ev->keyval == GDK_Alt_R)) {
+               _mouse_state = SelectTouchDragging;
+               return true;
+
+       } else if (ev->keyval == GDK_Escape && unmodified) {
+               clear_selection();
+               _mouse_state = None;
+
+       } else if (unmodified && (ev->keyval == GDK_comma || ev->keyval == GDK_period)) {
+
+               bool start = (ev->keyval == GDK_comma);
+               bool end = (ev->keyval == GDK_period);
+               bool shorter = Keyboard::modifier_state_contains (ev->state, Keyboard::PrimaryModifier);
+               bool fine = Keyboard::modifier_state_contains (ev->state, Keyboard::SecondaryModifier);
+
+               change_note_lengths (fine, shorter, 0.0, start, end);
+
+               return true;
+
+       } else if (ev->keyval == GDK_Delete && unmodified) {
+
+               delete_selection();
+               return true;
+
+       } else if (ev->keyval == GDK_Tab) {
+
+               if (Keyboard::modifier_state_contains (ev->state, Keyboard::PrimaryModifier)) {
+                       goto_previous_note (Keyboard::modifier_state_contains (ev->state, Keyboard::TertiaryModifier));
+               } else {
+                       goto_next_note (Keyboard::modifier_state_contains (ev->state, Keyboard::TertiaryModifier));
+               }
+               return true;
+
+       } else if (ev->keyval == GDK_ISO_Left_Tab) {
+
+               /* Shift-TAB generates ISO Left Tab, for some reason */
+
+               if (Keyboard::modifier_state_contains (ev->state, Keyboard::PrimaryModifier)) {
+                       goto_previous_note (Keyboard::modifier_state_contains (ev->state, Keyboard::TertiaryModifier));
+               } else {
+                       goto_next_note (Keyboard::modifier_state_contains (ev->state, Keyboard::TertiaryModifier));
+               }
+               return true;
+
+
+
+       } else if (ev->keyval == GDK_Up) {
+
+               bool allow_smush = Keyboard::modifier_state_contains (ev->state, Keyboard::TertiaryModifier);
+               bool fine = !Keyboard::modifier_state_contains (ev->state, Keyboard::SecondaryModifier);
+
+               if (Keyboard::modifier_state_contains (ev->state, Keyboard::PrimaryModifier)) {
+                       change_velocities (true, fine, allow_smush);
+               } else {
+                       transpose (true, fine, allow_smush);
+               }
+               return true;
+
+       } else if (ev->keyval == GDK_Down) {
+
+               bool allow_smush = Keyboard::modifier_state_contains (ev->state, Keyboard::TertiaryModifier);
+               bool fine = !Keyboard::modifier_state_contains (ev->state, Keyboard::SecondaryModifier);
+
+               if (Keyboard::modifier_state_contains (ev->state, Keyboard::PrimaryModifier)) {
+                       change_velocities (false, fine, allow_smush);
+               } else {
+                       transpose (false, fine, allow_smush);
+               }
+               return true;
+
+       } else if (ev->keyval == GDK_Left && unmodified) {
+
+               nudge_notes (false);
+               return true;
+
+       } else if (ev->keyval == GDK_Right && unmodified) {
+
+               nudge_notes (true);
+               return true;
+
+       } else if (ev->keyval == GDK_c && unmodified) {
+               channel_edit ();
+               return true;
+       }
+
+       return false;
+}
+
+bool
+MidiRegionView::key_release (GdkEventKey* ev)
+{
+       if ((_mouse_state == SelectTouchDragging) && (ev->keyval == GDK_Alt_L || ev->keyval == GDK_Alt_R)) {
+               _mouse_state = None;
+               return true;
+       }
+       return false;
 }
 
 void
-MidiRegionView::region_resized (Change what_changed)
+MidiRegionView::channel_edit ()
 {
-       RegionView::region_resized(what_changed);
+       bool first = true;
+       uint8_t current_channel = 0;
+
+       if (_selection.empty()) {
+               return;
+       }
        
-       if (what_changed & ARDOUR::PositionChanged) {
-               set_duration(_region->length(), 0);
-               if (_enable_display) {
-                       redisplay_model();
+       for (Selection::iterator i = _selection.begin(); i != _selection.end(); ++i) {
+               if (first) {
+                       current_channel = (*i)->note()->channel ();
+                       first = false;
                }
-       } 
+       }
+
+       MidiChannelDialog channel_dialog (current_channel);
+       int ret = channel_dialog.run ();
+
+       switch (ret) {
+       case Gtk::RESPONSE_OK:
+               break;
+       default:
+               return;
+       }
+
+       uint8_t new_channel = channel_dialog.active_channel ();
+
+       start_note_diff_command (_("channel edit"));
+
+       for (Selection::iterator i = _selection.begin(); i != _selection.end(); ) {
+               Selection::iterator next = i;
+               ++next;
+               change_note_channel (*i, new_channel);
+               i = next;
+       }
+
+       apply_diff ();
 }
 
 void
-MidiRegionView::reset_width_dependent_items (double pixel_width)
+MidiRegionView::show_list_editor ()
 {
-       RegionView::reset_width_dependent_items(pixel_width);
-       assert(_pixel_width == pixel_width);
+       if (!_list_editor) {
+               _list_editor = new MidiListEditor (trackview.session(), midi_region());
+       }
+       _list_editor->present ();
+}
+
+/** Add a note to the model, and the view, at a canvas (click) coordinate.
+ * \param x horizontal position in pixels
+ * \param y vertical position in pixels
+ * \param length duration of the note in beats, which will be snapped to the grid
+ * \param sh true to make the note 1 frame shorter than the snapped version of \a length.
+ * \param snap_x true to snap x to the grid, otherwise false.
+ */
+void
+MidiRegionView::create_note_at (double x, double y, double length, bool sh, bool snap_x)
+{
+       MidiTimeAxisView* const mtv = dynamic_cast<MidiTimeAxisView*>(&trackview);
+       MidiStreamView* const view = mtv->midi_view();
+
+       double note = view->y_to_note(y);
+
+       assert(note >= 0.0);
+       assert(note <= 127.0);
+
+       // Start of note in frames relative to region start
+       framepos_t start_frames = trackview.editor().pixel_to_frame (x);
+       if (snap_x) {
+               framecnt_t grid_frames;
+               start_frames = snap_frame_to_grid_underneath (start_frames, grid_frames);
+       }
+       assert(start_frames >= 0);
+
+       // Snap length
+       length = region_frames_to_region_beats(
+               snap_frame_to_frame (start_frames + region_beats_to_region_frames(length)) - start_frames);
+
+       assert (length != 0);
+
+       if (sh) {
+               length = region_frames_to_region_beats (region_beats_to_region_frames (length) - 1);
+       }
+
+       const boost::shared_ptr<NoteType> new_note (new NoteType (mtv->get_channel_for_add (),
+                                                                 region_frames_to_region_beats(start_frames + _region->start()), length,
+                                                                 (uint8_t)note, 0x40));
+
+       if (_model->contains (new_note)) {
+               return;
+       }
+
+       view->update_note_range(new_note->note());
+
+       MidiModel::NoteDiffCommand* cmd = _model->new_note_diff_command("add note");
+       cmd->add (new_note);
+       _model->apply_command(*trackview.session(), cmd);
+
+       play_midi_note (new_note);
+}
+
+void
+MidiRegionView::clear_events()
+{
+       clear_selection();
+
+       MidiGhostRegion* gr;
+       for (std::vector<GhostRegion*>::iterator g = ghosts.begin(); g != ghosts.end(); ++g) {
+               if ((gr = dynamic_cast<MidiGhostRegion*>(*g)) != 0) {
+                       gr->clear_events();
+               }
+       }
+
+       for (Events::iterator i = _events.begin(); i != _events.end(); ++i) {
+               delete *i;
+       }
+
+       _events.clear();
+       _patch_changes.clear();
+       _sys_exes.clear();
+       _optimization_iterator = _events.end();
+}
+
+void
+MidiRegionView::display_model(boost::shared_ptr<MidiModel> model)
+{
+       _model = model;
+
+       content_connection.disconnect ();
+       _model->ContentsChanged.connect (content_connection, invalidator (*this), boost::bind (&MidiRegionView::redisplay_model, this), gui_context());
+
+       clear_events ();
 
        if (_enable_display) {
                redisplay_model();
@@ -691,1065 +966,2725 @@ MidiRegionView::reset_width_dependent_items (double pixel_width)
 }
 
 void
-MidiRegionView::set_height (double height)
+MidiRegionView::start_note_diff_command (string name)
 {
-       static const double FUDGE = 2.0;
-       const double old_height = _height;
-       RegionView::set_height(height);
-       _height = height - FUDGE;
-       
-       apply_note_range(midi_stream_view()->lowest_note(),
-                        midi_stream_view()->highest_note(),
-                        height != old_height + FUDGE);
-       
-       if (name_pixbuf) {
-               name_pixbuf->raise_to_top();
+       if (!_note_diff_command) {
+               _note_diff_command = _model->new_note_diff_command (name);
+       }
+}
+
+void
+MidiRegionView::note_diff_add_note (const boost::shared_ptr<NoteType> note, bool selected, bool show_velocity)
+{
+       if (_note_diff_command) {
+               _note_diff_command->add (note);
+       }
+       if (selected) {
+               _marked_for_selection.insert(note);
+       }
+       if (show_velocity) {
+               _marked_for_velocity.insert(note);
+       }
+}
+
+void
+MidiRegionView::note_diff_remove_note (ArdourCanvas::CanvasNoteEvent* ev)
+{
+       if (_note_diff_command && ev->note()) {
+               _note_diff_command->remove(ev->note());
+       }
+}
+
+void
+MidiRegionView::note_diff_add_change (ArdourCanvas::CanvasNoteEvent* ev,
+                                      MidiModel::NoteDiffCommand::Property property,
+                                      uint8_t val)
+{
+       if (_note_diff_command) {
+               _note_diff_command->change (ev->note(), property, val);
+       }
+}
+
+void
+MidiRegionView::note_diff_add_change (ArdourCanvas::CanvasNoteEvent* ev,
+                                      MidiModel::NoteDiffCommand::Property property,
+                                      Evoral::MusicalTime val)
+{
+       if (_note_diff_command) {
+               _note_diff_command->change (ev->note(), property, val);
+       }
+}
+
+void
+MidiRegionView::apply_diff (bool as_subcommand)
+{
+       bool add_or_remove;
+
+       if (!_note_diff_command) {
+               return;
+       }
+
+       if ((add_or_remove = _note_diff_command->adds_or_removes())) {
+               // Mark all selected notes for selection when model reloads
+               for (Selection::iterator i = _selection.begin(); i != _selection.end(); ++i) {
+                       _marked_for_selection.insert((*i)->note());
+               }
+       }
+
+       if (as_subcommand) {
+               _model->apply_command_as_subcommand (*trackview.session(), _note_diff_command);
+       } else {
+               _model->apply_command (*trackview.session(), _note_diff_command);
+       }
+
+       _note_diff_command = 0;
+       midi_view()->midi_track()->playlist_modified();
+
+       if (add_or_remove) {
+               _marked_for_selection.clear();
+       }
+
+       _marked_for_velocity.clear();
+}
+
+void
+MidiRegionView::abort_command()
+{
+       delete _note_diff_command;
+       _note_diff_command = 0;
+       clear_selection();
+}
+
+CanvasNoteEvent*
+MidiRegionView::find_canvas_note (boost::shared_ptr<NoteType> note)
+{
+       if (_optimization_iterator != _events.end()) {
+               ++_optimization_iterator;
+       }
+
+       if (_optimization_iterator != _events.end() && (*_optimization_iterator)->note() == note) {
+               return *_optimization_iterator;
+       }
+
+       for (_optimization_iterator = _events.begin(); _optimization_iterator != _events.end(); ++_optimization_iterator) {
+               if ((*_optimization_iterator)->note() == note) {
+                       return *_optimization_iterator;
+               }
+       }
+
+       return 0;
+}
+
+void
+MidiRegionView::get_events (Events& e, Evoral::Sequence<Evoral::MusicalTime>::NoteOperator op, uint8_t val, int chan_mask)
+{
+       MidiModel::Notes notes;
+       _model->get_notes (notes, op, val, chan_mask);
+
+       for (MidiModel::Notes::iterator n = notes.begin(); n != notes.end(); ++n) {
+               CanvasNoteEvent* cne = find_canvas_note (*n);
+               if (cne) {
+                       e.push_back (cne);
+               }
+       }
+}
+
+void
+MidiRegionView::redisplay_model()
+{
+       // Don't redisplay the model if we're currently recording and displaying that
+       if (_active_notes) {
+               return;
+       }
+
+       if (!_model) {
+               return;
+       }
+
+       for (Events::iterator i = _events.begin(); i != _events.end(); ++i) {
+               (*i)->invalidate ();
+       }
+
+       MidiModel::ReadLock lock(_model->read_lock());
+
+       MidiModel::Notes& notes (_model->notes());
+       _optimization_iterator = _events.begin();
+
+       for (MidiModel::Notes::iterator n = notes.begin(); n != notes.end(); ++n) {
+
+               boost::shared_ptr<NoteType> note (*n);
+               CanvasNoteEvent* cne;
+               bool visible;
+
+               if (note_in_region_range (note, visible)) {
+
+                       if ((cne = find_canvas_note (note)) != 0) {
+
+                               cne->validate ();
+
+                               CanvasNote* cn;
+                               CanvasHit* ch;
+
+                               if ((cn = dynamic_cast<CanvasNote*>(cne)) != 0) {
+                                       update_note (cn);
+                               } else if ((ch = dynamic_cast<CanvasHit*>(cne)) != 0) {
+                                       update_hit (ch);
+                               }
+
+                               if (visible) {
+                                       cne->show ();
+                               } else {
+                                       cne->hide ();
+                               }
+
+                       } else {
+
+                               add_note (note, visible);
+                       }
+
+               } else {
+
+                       if ((cne = find_canvas_note (note)) != 0) {
+                               cne->validate ();
+                               cne->hide ();
+                       }
+               }
+       }
+
+
+       /* remove note items that are no longer valid */
+
+       for (Events::iterator i = _events.begin(); i != _events.end(); ) {
+               if (!(*i)->valid ()) {
+
+                       for (vector<GhostRegion*>::iterator j = ghosts.begin(); j != ghosts.end(); ++j) {
+                               MidiGhostRegion* gr = dynamic_cast<MidiGhostRegion*> (*j);
+                               if (gr) {
+                                       gr->remove_note (*i);
+                               }
+                       }
+                       
+                       delete *i;
+                       i = _events.erase (i);
+                       
+               } else {
+                       ++i;
+               }
+       }
+
+       _patch_changes.clear();
+       _sys_exes.clear();
+
+       display_sysexes();
+       display_patch_changes ();
+
+       _marked_for_selection.clear ();
+       _marked_for_velocity.clear ();
+
+       /* we may have caused _events to contain things out of order (e.g. if a note
+          moved earlier or later). we don't generally need them in time order, but
+          make a note that a sort is required for those cases that require it.
+       */
+
+       _sort_needed = true;
+}
+
+void
+MidiRegionView::display_patch_changes ()
+{
+       MidiTimeAxisView* const mtv = dynamic_cast<MidiTimeAxisView*>(&trackview);
+       uint16_t chn_mask = mtv->channel_selector().get_selected_channels();
+
+       for (uint8_t i = 0; i < 16; ++i) {
+               if (chn_mask & (1<<i)) {
+                       display_patch_changes_on_channel (i);
+               }
+               /* TODO gray-out patch instad of not displaying it */
+       }
+}
+
+void
+MidiRegionView::display_patch_changes_on_channel (uint8_t channel)
+{
+       for (MidiModel::PatchChanges::const_iterator i = _model->patch_changes().begin(); i != _model->patch_changes().end(); ++i) {
+
+               if ((*i)->channel() != channel) {
+                       continue;
+               }
+
+               MIDI::Name::PatchPrimaryKey patch_key ((*i)->bank_msb (), (*i)->bank_lsb (), (*i)->program ());
+
+               boost::shared_ptr<MIDI::Name::Patch> patch =
+                       MIDI::Name::MidiPatchManager::instance().find_patch(
+                               _model_name, _custom_device_mode, channel, patch_key);
+
+               if (patch != 0) {
+                       add_canvas_patch_change (*i, patch->name());
+               } else {
+                       char buf[16];
+                       /* program and bank numbers are zero-based: convert to one-based: MIDI_BP_ZERO */
+                       snprintf (buf, 16, "%d %d", (*i)->program() + MIDI_BP_ZERO , (*i)->bank() + MIDI_BP_ZERO);
+                       add_canvas_patch_change (*i, buf);
+               }
+       }
+}
+
+void
+MidiRegionView::display_sysexes()
+{
+       for (MidiModel::SysExes::const_iterator i = _model->sysexes().begin(); i != _model->sysexes().end(); ++i) {
+               Evoral::MusicalTime time = (*i)->time();
+               assert(time >= 0);
+
+               ostringstream str;
+               str << hex;
+               for (uint32_t b = 0; b < (*i)->size(); ++b) {
+                       str << int((*i)->buffer()[b]);
+                       if (b != (*i)->size() -1) {
+                               str << " ";
+                       }
+               }
+               string text = str.str();
+
+               const double x = trackview.editor().frame_to_pixel(source_beats_to_absolute_frames(time));
+
+               double height = midi_stream_view()->contents_height();
+
+               boost::shared_ptr<CanvasSysEx> sysex = boost::shared_ptr<CanvasSysEx>(
+                       new CanvasSysEx(*this, *_note_group, text, height, x, 1.0));
+
+               // Show unless patch change is beyond the region bounds
+               if (time - _region->start() >= _region->length() || time < _region->start()) {
+                       sysex->hide();
+               } else {
+                       sysex->show();
+               }
+
+               _sys_exes.push_back(sysex);
+       }
+}
+
+
+MidiRegionView::~MidiRegionView ()
+{
+       in_destructor = true;
+
+       trackview.editor().verbose_cursor()->hide ();
+
+       note_delete_connection.disconnect ();
+
+       delete _list_editor;
+
+       RegionViewGoingAway (this); /* EMIT_SIGNAL */
+
+       if (_active_notes) {
+               end_write();
+       }
+
+       _selection.clear();
+       clear_events();
+
+       delete _note_group;
+       delete _note_diff_command;
+       delete _step_edit_cursor;
+       delete _temporary_note_group;
+}
+
+void
+MidiRegionView::region_resized (const PropertyChange& what_changed)
+{
+       RegionView::region_resized(what_changed);
+
+       if (what_changed.contains (ARDOUR::Properties::position)) {
+               set_duration(_region->length(), 0);
+               if (_enable_display) {
+                       redisplay_model();
+               }
+       }
+}
+
+void
+MidiRegionView::reset_width_dependent_items (double pixel_width)
+{
+       RegionView::reset_width_dependent_items(pixel_width);
+       assert(_pixel_width == pixel_width);
+
+       if (_enable_display) {
+               redisplay_model();
+       }
+
+       move_step_edit_cursor (_step_edit_cursor_position);
+       set_step_edit_cursor_width (_step_edit_cursor_width);
+}
+
+void
+MidiRegionView::set_height (double height)
+{
+       static const double FUDGE = 2.0;
+       const double old_height = _height;
+       RegionView::set_height(height);
+       _height = height - FUDGE;
+
+       apply_note_range(midi_stream_view()->lowest_note(),
+                        midi_stream_view()->highest_note(),
+                        height != old_height + FUDGE);
+
+       if (name_pixbuf) {
+               name_pixbuf->raise_to_top();
+       }
+
+       for (PatchChanges::iterator x = _patch_changes.begin(); x != _patch_changes.end(); ++x) {
+               (*x)->set_height (midi_stream_view()->contents_height());
+       }
+
+       if (_step_edit_cursor) {
+               _step_edit_cursor->property_y2() = midi_stream_view()->contents_height();
+       }
+}
+
+
+/** Apply the current note range from the stream view
+ * by repositioning/hiding notes as necessary
+ */
+void
+MidiRegionView::apply_note_range (uint8_t min, uint8_t max, bool force)
+{
+       if (!_enable_display) {
+               return;
+       }
+
+       if (!force && _current_range_min == min && _current_range_max == max) {
+               return;
+       }
+
+       _current_range_min = min;
+       _current_range_max = max;
+
+       for (Events::const_iterator i = _events.begin(); i != _events.end(); ++i) {
+               CanvasNoteEvent* event = *i;
+               boost::shared_ptr<NoteType> note (event->note());
+
+               if (note->note() < _current_range_min ||
+                   note->note() > _current_range_max) {
+                       event->hide();
+               } else {
+                       event->show();
+               }
+
+               if (CanvasNote* cnote = dynamic_cast<CanvasNote*>(event)) {
+
+                       const double y1 = midi_stream_view()->note_to_y(note->note());
+                       const double y2 = y1 + floor(midi_stream_view()->note_height());
+
+                       cnote->property_y1() = y1;
+                       cnote->property_y2() = y2;
+
+               } else if (CanvasHit* chit = dynamic_cast<CanvasHit*>(event)) {
+
+                       const double diamond_size = update_hit (chit);
+
+                       chit->set_height (diamond_size);
+               }
+       }
+}
+
+GhostRegion*
+MidiRegionView::add_ghost (TimeAxisView& tv)
+{
+       CanvasNote* note;
+
+       double unit_position = _region->position () / samples_per_unit;
+       MidiTimeAxisView* mtv = dynamic_cast<MidiTimeAxisView*>(&tv);
+       MidiGhostRegion* ghost;
+
+       if (mtv && mtv->midi_view()) {
+               /* if ghost is inserted into midi track, use a dedicated midi ghost canvas group
+                  to allow having midi notes on top of note lines and waveforms.
+               */
+               ghost = new MidiGhostRegion (*mtv->midi_view(), trackview, unit_position);
+       } else {
+               ghost = new MidiGhostRegion (tv, trackview, unit_position);
+       }
+
+       for (Events::iterator i = _events.begin(); i != _events.end(); ++i) {
+               if ((note = dynamic_cast<CanvasNote*>(*i)) != 0) {
+                       ghost->add_note(note);
+               }
+       }
+
+       ghost->set_height ();
+       ghost->set_duration (_region->length() / samples_per_unit);
+       ghosts.push_back (ghost);
+
+       GhostRegion::CatchDeletion.connect (*this, invalidator (*this), ui_bind (&RegionView::remove_ghost, this, _1), gui_context());
+
+       return ghost;
+}
+
+
+/** Begin tracking note state for successive calls to add_event
+ */
+void
+MidiRegionView::begin_write()
+{
+       assert(!_active_notes);
+       _active_notes = new CanvasNote*[128];
+       for (unsigned i=0; i < 128; ++i) {
+               _active_notes[i] = 0;
+       }
+}
+
+
+/** Destroy note state for add_event
+ */
+void
+MidiRegionView::end_write()
+{
+       delete[] _active_notes;
+       _active_notes = 0;
+       _marked_for_selection.clear();
+       _marked_for_velocity.clear();
+}
+
+
+/** Resolve an active MIDI note (while recording).
+ */
+void
+MidiRegionView::resolve_note(uint8_t note, double end_time)
+{
+       if (midi_view()->note_mode() != Sustained) {
+               return;
+       }
+
+       if (_active_notes && _active_notes[note]) {
+
+               /* XXX is end_time really region-centric? I think so, because
+                  this is a new region that we're recording, so source zero is
+                  the same as region zero
+               */
+               const framepos_t end_time_frames = region_beats_to_region_frames(end_time);
+
+               _active_notes[note]->property_x2() = trackview.editor().frame_to_pixel(end_time_frames);
+               _active_notes[note]->property_outline_what() = (guint32) 0xF; // all edges
+               _active_notes[note] = 0;
+       }
+}
+
+
+/** Extend active notes to rightmost edge of region (if length is changed)
+ */
+void
+MidiRegionView::extend_active_notes()
+{
+       if (!_active_notes) {
+               return;
+       }
+
+       for (unsigned i=0; i < 128; ++i) {
+               if (_active_notes[i]) {
+                       _active_notes[i]->property_x2() = trackview.editor().frame_to_pixel(_region->length());
+               }
+       }
+}
+
+
+void
+MidiRegionView::play_midi_note(boost::shared_ptr<NoteType> note)
+{
+       if (_no_sound_notes || !trackview.editor().sound_notes()) {
+               return;
+       }
+
+       RouteUI* route_ui = dynamic_cast<RouteUI*> (&trackview);
+
+       if (!route_ui || !route_ui->midi_track()) {
+               return;
+       }
+
+       NotePlayer* np = new NotePlayer (route_ui->midi_track());
+       np->add (note);
+       np->play ();
+}
+
+void
+MidiRegionView::play_midi_chord (vector<boost::shared_ptr<NoteType> > notes)
+{
+       if (_no_sound_notes || !trackview.editor().sound_notes()) {
+               return;
+       }
+
+       RouteUI* route_ui = dynamic_cast<RouteUI*> (&trackview);
+
+       if (!route_ui || !route_ui->midi_track()) {
+               return;
+       }
+
+       NotePlayer* np = new NotePlayer (route_ui->midi_track());
+
+       for (vector<boost::shared_ptr<NoteType> >::iterator n = notes.begin(); n != notes.end(); ++n) {
+               np->add (*n);
+       }
+
+       np->play ();
+}
+
+
+bool
+MidiRegionView::note_in_region_range (const boost::shared_ptr<NoteType> note, bool& visible) const
+{
+       const framepos_t note_start_frames = source_beats_to_region_frames (note->time());
+       bool outside = (note_start_frames  < 0) || (note_start_frames > _region->last_frame());
+
+       visible = (note->note() >= midi_stream_view()->lowest_note()) &&
+               (note->note() <= midi_stream_view()->highest_note());
+
+       return !outside;
+}
+
+/** Update a canvas note's size from its model note.
+ *  @param ev Canvas note to update.
+ *  @param update_ghost_regions true to update the note in any ghost regions that we have, otherwise false.
+ */
+void
+MidiRegionView::update_note (CanvasNote* ev, bool update_ghost_regions)
+{
+       boost::shared_ptr<NoteType> note = ev->note();
+
+       const double x = trackview.editor().frame_to_pixel (source_beats_to_region_frames (note->time()));
+       const double y1 = midi_stream_view()->note_to_y(note->note());
+
+       ev->property_x1() = x;
+       ev->property_y1() = y1;
+
+       /* trim note display to not overlap the end of its region */
+
+       if (note->length() > 0) {
+               const framepos_t note_end_frames = min (source_beats_to_region_frames (note->end_time()), _region->length());
+               ev->property_x2() = trackview.editor().frame_to_pixel (note_end_frames);
+       } else {
+               ev->property_x2() = trackview.editor().frame_to_pixel (_region->length());
+       }
+
+       ev->property_y2() = y1 + floor(midi_stream_view()->note_height());
+
+       if (note->length() == 0) {
+               if (_active_notes) {
+                       assert(note->note() < 128);
+                       // If this note is already active there's a stuck note,
+                       // finish the old note rectangle
+                       if (_active_notes[note->note()]) {
+                               CanvasNote* const old_rect = _active_notes[note->note()];
+                               boost::shared_ptr<NoteType> old_note = old_rect->note();
+                               old_rect->property_x2() = x;
+                               old_rect->property_outline_what() = (guint32) 0xF;
+                       }
+                       _active_notes[note->note()] = ev;
+               }
+               /* outline all but right edge */
+               ev->property_outline_what() = (guint32) (0x1 & 0x4 & 0x8);
+       } else {
+               /* outline all edges */
+               ev->property_outline_what() = (guint32) 0xF;
+       }
+
+       if (update_ghost_regions) {
+               for (std::vector<GhostRegion*>::iterator i = ghosts.begin(); i != ghosts.end(); ++i) {
+                       MidiGhostRegion* gr = dynamic_cast<MidiGhostRegion*> (*i);
+                       if (gr) {
+                               gr->update_note (ev);
+                       }
+               }
+       }
+}
+
+double
+MidiRegionView::update_hit (CanvasHit* ev)
+{
+       boost::shared_ptr<NoteType> note = ev->note();
+
+       const framepos_t note_start_frames = source_beats_to_region_frames(note->time());
+       const double x = trackview.editor().frame_to_pixel(note_start_frames);
+       const double diamond_size = midi_stream_view()->note_height() / 2.0;
+       const double y = midi_stream_view()->note_to_y(note->note()) + ((diamond_size-2) / 4.0);
+
+       ev->move_to (x, y);
+
+       return diamond_size;
+}
+
+/** Add a MIDI note to the view (with length).
+ *
+ * If in sustained mode, notes with length 0 will be considered active
+ * notes, and resolve_note should be called when the corresponding note off
+ * event arrives, to properly display the note.
+ */
+void
+MidiRegionView::add_note(const boost::shared_ptr<NoteType> note, bool visible)
+{
+       CanvasNoteEvent* event = 0;
+
+       assert(note->time() >= 0);
+       assert(midi_view()->note_mode() == Sustained || midi_view()->note_mode() == Percussive);
+
+       //ArdourCanvas::Group* const group = (ArdourCanvas::Group*) get_canvas_group();
+
+       if (midi_view()->note_mode() == Sustained) {
+
+               CanvasNote* ev_rect = new CanvasNote(*this, *_note_group, note);
+
+               update_note (ev_rect);
+
+               event = ev_rect;
+
+               MidiGhostRegion* gr;
+
+               for (std::vector<GhostRegion*>::iterator g = ghosts.begin(); g != ghosts.end(); ++g) {
+                       if ((gr = dynamic_cast<MidiGhostRegion*>(*g)) != 0) {
+                               gr->add_note(ev_rect);
+                       }
+               }
+
+       } else if (midi_view()->note_mode() == Percussive) {
+
+               const double diamond_size = midi_stream_view()->note_height() / 2.0;
+
+               CanvasHit* ev_diamond = new CanvasHit (*this, *_note_group, diamond_size, note);
+
+               update_hit (ev_diamond);
+
+               event = ev_diamond;
+
+       } else {
+               event = 0;
+       }
+
+       if (event) {
+               if (_marked_for_selection.find(note) != _marked_for_selection.end()) {
+                       note_selected(event, true);
+               }
+
+               if (_marked_for_velocity.find(note) != _marked_for_velocity.end()) {
+                       event->show_velocity();
+               }
+
+               event->on_channel_selection_change(_last_channel_selection);
+               _events.push_back(event);
+
+               if (visible) {
+                       event->show();
+               } else {
+                       event->hide ();
+               }
+       }
+
+       MidiTimeAxisView* const mtv = dynamic_cast<MidiTimeAxisView*>(&trackview);
+       MidiStreamView* const view = mtv->midi_view();
+
+       view->update_note_range (note->note());
+}
+
+void
+MidiRegionView::step_add_note (uint8_t channel, uint8_t number, uint8_t velocity,
+                               Evoral::MusicalTime pos, Evoral::MusicalTime len)
+{
+       boost::shared_ptr<NoteType> new_note (new NoteType (channel, pos, len, number, velocity));
+
+       /* potentially extend region to hold new note */
+
+       framepos_t end_frame = source_beats_to_absolute_frames (new_note->end_time());
+       framepos_t region_end = _region->last_frame();
+
+       if (end_frame > region_end) {
+               _region->set_length (end_frame - _region->position());
+       }
+
+       MidiTimeAxisView* const mtv = dynamic_cast<MidiTimeAxisView*>(&trackview);
+       MidiStreamView* const view = mtv->midi_view();
+
+       view->update_note_range(new_note->note());
+
+       _marked_for_selection.clear ();
+       clear_selection ();
+
+       start_note_diff_command (_("step add"));
+       note_diff_add_note (new_note, true, false);
+       apply_diff();
+
+       // last_step_edit_note = new_note;
+}
+
+void
+MidiRegionView::step_sustain (Evoral::MusicalTime beats)
+{
+       change_note_lengths (false, false, beats, false, true);
+}
+
+void
+MidiRegionView::add_canvas_patch_change (MidiModel::PatchChangePtr patch, const string& displaytext)
+{
+       assert (patch->time() >= 0);
+
+       const double x = trackview.editor().frame_to_pixel (source_beats_to_region_frames (patch->time()));
+
+       double const height = midi_stream_view()->contents_height();
+
+       boost::shared_ptr<CanvasPatchChange> patch_change = boost::shared_ptr<CanvasPatchChange>(
+               new CanvasPatchChange(*this, *_note_group,
+                                     displaytext,
+                                     height,
+                                     x, 1.0,
+                                     _model_name,
+                                     _custom_device_mode,
+                                     patch)
+                         );
+
+       // Show unless patch change is beyond the region bounds
+       if (patch->time() - _region->start() >= _region->length() || patch->time() < _region->start()) {
+               patch_change->hide();
+       } else {
+               patch_change->show();
+       }
+
+       _patch_changes.push_back (patch_change);
+}
+
+void
+MidiRegionView::get_patch_key_at (Evoral::MusicalTime time, uint8_t channel, MIDI::Name::PatchPrimaryKey& key)
+{
+       MidiModel::PatchChanges::iterator i = _model->patch_change_lower_bound (time);
+       while (i != _model->patch_changes().end() && (*i)->channel() != channel) {
+               ++i;
+       }
+
+       if (i != _model->patch_changes().end()) {
+               key.msb = (*i)->bank_msb ();
+               key.lsb = (*i)->bank_lsb ();
+               key.program_number = (*i)->program ();
+       } else {
+               key.msb = key.lsb = key.program_number = 0;
+       }
+
+       assert (key.is_sane());
+}
+
+
+void
+MidiRegionView::change_patch_change (CanvasPatchChange& pc, const MIDI::Name::PatchPrimaryKey& new_patch)
+{
+       MidiModel::PatchChangeDiffCommand* c = _model->new_patch_change_diff_command (_("alter patch change"));
+
+       if (pc.patch()->program() != new_patch.program_number) {
+               c->change_program (pc.patch (), new_patch.program_number);
+       }
+
+       int const new_bank = (new_patch.msb << 7) | new_patch.lsb;
+       if (pc.patch()->bank() != new_bank) {
+               c->change_bank (pc.patch (), new_bank);
+       }
+
+       _model->apply_command (*trackview.session(), c);
+
+       _patch_changes.clear ();
+       display_patch_changes ();
+}
+
+void
+MidiRegionView::change_patch_change (MidiModel::PatchChangePtr old_change, const Evoral::PatchChange<Evoral::MusicalTime> & new_change)
+{
+       MidiModel::PatchChangeDiffCommand* c = _model->new_patch_change_diff_command (_("alter patch change"));
+
+       if (old_change->time() != new_change.time()) {
+               c->change_time (old_change, new_change.time());
+       }
+
+       if (old_change->channel() != new_change.channel()) {
+               c->change_channel (old_change, new_change.channel());
+       }
+
+       if (old_change->program() != new_change.program()) {
+               c->change_program (old_change, new_change.program());
+       }
+
+       if (old_change->bank() != new_change.bank()) {
+               c->change_bank (old_change, new_change.bank());
+       }
+
+       _model->apply_command (*trackview.session(), c);
+
+       _patch_changes.clear ();
+       display_patch_changes ();
+}
+
+/** Add a patch change to the region.
+ *  @param t Time in frames relative to region position
+ *  @param patch Patch to add; time and channel are ignored (time is converted from t, and channel comes from
+ *  MidiTimeAxisView::get_channel_for_add())
+ */
+void
+MidiRegionView::add_patch_change (framecnt_t t, Evoral::PatchChange<Evoral::MusicalTime> const & patch)
+{
+       MidiTimeAxisView* const mtv = dynamic_cast<MidiTimeAxisView*>(&trackview);
+
+       MidiModel::PatchChangeDiffCommand* c = _model->new_patch_change_diff_command (_("add patch change"));
+       c->add (MidiModel::PatchChangePtr (
+                       new Evoral::PatchChange<Evoral::MusicalTime> (
+                               absolute_frames_to_source_beats (_region->position() + t),
+                               mtv->get_channel_for_add(), patch.program(), patch.bank()
+                               )
+                       )
+               );
+
+       _model->apply_command (*trackview.session(), c);
+
+       _patch_changes.clear ();
+       display_patch_changes ();
+}
+
+void
+MidiRegionView::move_patch_change (CanvasPatchChange& pc, Evoral::MusicalTime t)
+{
+       MidiModel::PatchChangeDiffCommand* c = _model->new_patch_change_diff_command (_("move patch change"));
+       c->change_time (pc.patch (), t);
+       _model->apply_command (*trackview.session(), c);
+
+       _patch_changes.clear ();
+       display_patch_changes ();
+}
+
+void
+MidiRegionView::delete_patch_change (CanvasPatchChange* pc)
+{
+       MidiModel::PatchChangeDiffCommand* c = _model->new_patch_change_diff_command (_("delete patch change"));
+       c->remove (pc->patch ());
+       _model->apply_command (*trackview.session(), c);
+
+       _patch_changes.clear ();
+       display_patch_changes ();
+}
+
+void
+MidiRegionView::previous_patch (CanvasPatchChange& patch)
+{
+       if (patch.patch()->program() < 127) {
+               MIDI::Name::PatchPrimaryKey key;
+               get_patch_key_at (patch.patch()->time(), patch.patch()->channel(), key);
+               key.program_number++;
+               change_patch_change (patch, key);
+       }
+}
+
+void
+MidiRegionView::next_patch (CanvasPatchChange& patch)
+{
+       if (patch.patch()->program() > 0) {
+               MIDI::Name::PatchPrimaryKey key;
+               get_patch_key_at (patch.patch()->time(), patch.patch()->channel(), key);
+               key.program_number--;
+               change_patch_change (patch, key);
+       }
+}
+
+void
+MidiRegionView::previous_bank (CanvasPatchChange& patch)
+{
+       if (patch.patch()->program() < 127) {
+               MIDI::Name::PatchPrimaryKey key;
+               get_patch_key_at (patch.patch()->time(), patch.patch()->channel(), key);
+               if (key.lsb > 0) {
+                       key.lsb--;
+                       change_patch_change (patch, key);
+               } else {
+                       if (key.msb > 0) {
+                               key.lsb = 127;
+                               key.msb--;
+                               change_patch_change (patch, key);
+                       }
+               }
+       }
+}
+
+void
+MidiRegionView::next_bank (CanvasPatchChange& patch)
+{
+       if (patch.patch()->program() > 0) {
+               MIDI::Name::PatchPrimaryKey key;
+               get_patch_key_at (patch.patch()->time(), patch.patch()->channel(), key);
+               if (key.lsb < 127) {
+                       key.lsb++;
+                       change_patch_change (patch, key);
+               } else {
+                       if (key.msb < 127) {
+                               key.lsb = 0;
+                               key.msb++;
+                               change_patch_change (patch, key);
+                       }
+               }
+       }
+}
+
+void
+MidiRegionView::maybe_remove_deleted_note_from_selection (CanvasNoteEvent* cne)
+{
+       if (_selection.empty()) {
+               return;
+       }
+
+       _selection.erase (cne);
+}
+
+void
+MidiRegionView::delete_selection()
+{
+       if (_selection.empty()) {
+               return;
+       }
+
+       start_note_diff_command (_("delete selection"));
+
+       for (Selection::iterator i = _selection.begin(); i != _selection.end(); ++i) {
+               if ((*i)->selected()) {
+                       _note_diff_command->remove((*i)->note());
+               }
+       }
+
+       _selection.clear();
+
+       apply_diff ();
+}
+
+void
+MidiRegionView::delete_note (boost::shared_ptr<NoteType> n)
+{
+       start_note_diff_command (_("delete note"));
+       _note_diff_command->remove (n);
+       apply_diff ();
+
+       trackview.editor().verbose_cursor()->hide ();
+}
+
+void
+MidiRegionView::clear_selection_except (ArdourCanvas::CanvasNoteEvent* ev, bool signal)
+{
+       for (Selection::iterator i = _selection.begin(); i != _selection.end(); ) {
+               if ((*i) != ev) {
+                       Selection::iterator tmp = i;
+                       ++tmp;
+
+                       (*i)->set_selected (false);
+                       (*i)->hide_velocity ();
+                       _selection.erase (i);
+                       
+                       i = tmp;
+               } else {
+                       ++i;
+               }
+       }
+
+       /* this does not change the status of this regionview w.r.t the editor
+          selection.
+       */
+
+       if (signal) {
+               SelectionCleared (this); /* EMIT SIGNAL */
+       }
+}
+
+void
+MidiRegionView::unique_select(ArdourCanvas::CanvasNoteEvent* ev)
+{
+       clear_selection_except (ev);
+
+       /* don't bother with checking to see if we should remove this
+          regionview from the editor selection, since we're about to add
+          another note, and thus put/keep this regionview in the editor
+          selection anyway.
+       */
+
+       if (!ev->selected()) {
+               add_to_selection (ev);
+       }
+}
+
+void
+MidiRegionView::select_all_notes ()
+{
+       clear_selection ();
+
+       for (Events::iterator i = _events.begin(); i != _events.end(); ++i) {
+               add_to_selection (*i);
+       }
+}
+
+void
+MidiRegionView::select_range (framepos_t start, framepos_t end)
+{
+       clear_selection ();
+
+       for (Events::iterator i = _events.begin(); i != _events.end(); ++i) {
+               framepos_t t = source_beats_to_absolute_frames((*i)->note()->time());
+               if (t >= start && t <= end) {
+                       add_to_selection (*i);
+               }
+       }
+}
+
+void
+MidiRegionView::invert_selection ()
+{
+       for (Events::iterator i = _events.begin(); i != _events.end(); ++i) {
+               if ((*i)->selected()) {
+                       remove_from_selection(*i);
+               } else {
+                       add_to_selection (*i);
+               }
+       }
+}
+
+void
+MidiRegionView::select_matching_notes (uint8_t notenum, uint16_t channel_mask, bool add, bool extend)
+{
+       uint8_t low_note = 127;
+       uint8_t high_note = 0;
+       MidiModel::Notes& notes (_model->notes());
+       _optimization_iterator = _events.begin();
+
+       if (!add) {
+               clear_selection ();
+       }
+
+       if (extend && _selection.empty()) {
+               extend = false;
+       }
+
+       if (extend) {
+
+               /* scan existing selection to get note range */
+
+               for (Selection::iterator i = _selection.begin(); i != _selection.end(); ++i) {
+                       if ((*i)->note()->note() < low_note) {
+                               low_note = (*i)->note()->note();
+                       }
+                       if ((*i)->note()->note() > high_note) {
+                               high_note = (*i)->note()->note();
+                       }
+               }
+
+               low_note = min (low_note, notenum);
+               high_note = max (high_note, notenum);
+       }
+
+       _no_sound_notes = true;
+
+       for (MidiModel::Notes::iterator n = notes.begin(); n != notes.end(); ++n) {
+
+               boost::shared_ptr<NoteType> note (*n);
+               CanvasNoteEvent* cne;
+               bool select = false;
+
+               if (((1 << note->channel()) & channel_mask) != 0) {
+                       if (extend) {
+                               if ((note->note() >= low_note && note->note() <= high_note)) {
+                                       select = true;
+                               }
+                       } else if (note->note() == notenum) {
+                               select = true;
+                       }
+               }
+
+               if (select) {
+                       if ((cne = find_canvas_note (note)) != 0) {
+                               // extend is false because we've taken care of it,
+                               // since it extends by time range, not pitch.
+                               note_selected (cne, add, false);
+                       }
+               }
+
+               add = true; // we need to add all remaining matching notes, even if the passed in value was false (for "set")
+
+       }
+
+       _no_sound_notes = false;
+}
+
+void
+MidiRegionView::toggle_matching_notes (uint8_t notenum, uint16_t channel_mask)
+{
+       MidiModel::Notes& notes (_model->notes());
+       _optimization_iterator = _events.begin();
+
+       for (MidiModel::Notes::iterator n = notes.begin(); n != notes.end(); ++n) {
+
+               boost::shared_ptr<NoteType> note (*n);
+               CanvasNoteEvent* cne;
+
+               if (note->note() == notenum && (((0x0001 << note->channel()) & channel_mask) != 0)) {
+                       if ((cne = find_canvas_note (note)) != 0) {
+                               if (cne->selected()) {
+                                       note_deselected (cne);
+                               } else {
+                                       note_selected (cne, true, false);
+                               }
+                       }
+               }
+       }
+}
+
+void
+MidiRegionView::note_selected (ArdourCanvas::CanvasNoteEvent* ev, bool add, bool extend)
+{
+       if (!add) {
+               clear_selection_except (ev);
+               if (!_selection.empty()) {
+                       PublicEditor& editor (trackview.editor());
+                       editor.get_selection().add (this);
+               }
+       }
+
+       if (!extend) {
+
+               if (!ev->selected()) {
+                       add_to_selection (ev);
+               }
+
+       } else {
+               /* find end of latest note selected, select all between that and the start of "ev" */
+
+               Evoral::MusicalTime earliest = Evoral::MaxMusicalTime;
+               Evoral::MusicalTime latest = 0;
+
+               for (Selection::iterator i = _selection.begin(); i != _selection.end(); ++i) {
+                       if ((*i)->note()->end_time() > latest) {
+                               latest = (*i)->note()->end_time();
+                       }
+                       if ((*i)->note()->time() < earliest) {
+                               earliest = (*i)->note()->time();
+                       }
+               }
+
+               if (ev->note()->end_time() > latest) {
+                       latest = ev->note()->end_time();
+               }
+
+               if (ev->note()->time() < earliest) {
+                       earliest = ev->note()->time();
+               }
+
+               for (Events::iterator i = _events.begin(); i != _events.end(); ++i) {
+
+                       /* find notes entirely within OR spanning the earliest..latest range */
+
+                       if (((*i)->note()->time() >= earliest && (*i)->note()->end_time() <= latest) ||
+                           ((*i)->note()->time() <= earliest && (*i)->note()->end_time() >= latest)) {
+                               add_to_selection (*i);
+                       }
+
+               }
+       }
+}
+
+void
+MidiRegionView::note_deselected(ArdourCanvas::CanvasNoteEvent* ev)
+{
+       remove_from_selection (ev);
+}
+
+void
+MidiRegionView::update_drag_selection(double x1, double x2, double y1, double y2, bool extend)
+{
+       if (x1 > x2) {
+               swap (x1, x2);
+       }
+
+       if (y1 > y2) {
+               swap (y1, y2);
+       }
+
+       // TODO: Make this faster by storing the last updated selection rect, and only
+       // adjusting things that are in the area that appears/disappeared.
+       // We probably need a tree to be able to find events in O(log(n)) time.
+
+       for (Events::iterator i = _events.begin(); i != _events.end(); ++i) {
+
+               /* check if any corner of the note is inside the rect
+
+                  Notes:
+                  1) this is computing "touched by", not "contained by" the rect.
+                  2) this does not require that events be sorted in time.
+               */
+
+               const double ix1 = (*i)->x1();
+               const double ix2 = (*i)->x2();
+               const double iy1 = (*i)->y1();
+               const double iy2 = (*i)->y2();
+
+               if ((ix1 >= x1 && ix1 <= x2 && iy1 >= y1 && iy1 <= y2) ||
+                   (ix1 >= x1 && ix1 <= x2 && iy2 >= y1 && iy2 <= y2) ||
+                   (ix2 >= x1 && ix2 <= x2 && iy1 >= y1 && iy1 <= y2) ||
+                   (ix2 >= x1 && ix2 <= x2 && iy2 >= y1 && iy2 <= y2)) {
+
+                       // Inside rectangle
+                       if (!(*i)->selected()) {
+                               add_to_selection (*i);
+                       }
+               } else if ((*i)->selected() && !extend) {
+                       // Not inside rectangle
+                       remove_from_selection (*i);
+               }
+       }
+}
+
+void
+MidiRegionView::remove_from_selection (CanvasNoteEvent* ev)
+{
+       Selection::iterator i = _selection.find (ev);
+
+       if (i != _selection.end()) {
+               _selection.erase (i);
+       }
+
+       ev->set_selected (false);
+       ev->hide_velocity ();
+
+       if (_selection.empty()) {
+               PublicEditor& editor (trackview.editor());
+               editor.get_selection().remove (this);
+       }
+}
+
+void
+MidiRegionView::add_to_selection (CanvasNoteEvent* ev)
+{
+       bool add_mrv_selection = false;
+
+       if (_selection.empty()) {
+               add_mrv_selection = true;
+       }
+
+       if (_selection.insert (ev).second) {
+               ev->set_selected (true);
+               play_midi_note ((ev)->note());
+       }
+
+       if (add_mrv_selection) {
+               PublicEditor& editor (trackview.editor());
+               editor.get_selection().add (this);
+       }
+}
+
+void
+MidiRegionView::move_selection(double dx, double dy, double cumulative_dy)
+{
+       typedef vector<boost::shared_ptr<NoteType> > PossibleChord;
+       PossibleChord to_play;
+       Evoral::MusicalTime earliest = Evoral::MaxMusicalTime;
+
+       for (Selection::iterator i = _selection.begin(); i != _selection.end(); ++i) {
+               if ((*i)->note()->time() < earliest) {
+                       earliest = (*i)->note()->time();
+               }
+       }
+
+       for (Selection::iterator i = _selection.begin(); i != _selection.end(); ++i) {
+               if (Evoral::musical_time_equal ((*i)->note()->time(), earliest)) {
+                       to_play.push_back ((*i)->note());
+               }
+               (*i)->move_event(dx, dy);
+       }
+
+       if (dy && !_selection.empty() && !_no_sound_notes && trackview.editor().sound_notes()) {
+
+               if (to_play.size() > 1) {
+
+                       PossibleChord shifted;
+
+                       for (PossibleChord::iterator n = to_play.begin(); n != to_play.end(); ++n) {
+                               boost::shared_ptr<NoteType> moved_note (new NoteType (**n));
+                               moved_note->set_note (moved_note->note() + cumulative_dy);
+                               shifted.push_back (moved_note);
+                       }
+
+                       play_midi_chord (shifted);
+
+               } else if (!to_play.empty()) {
+
+                       boost::shared_ptr<NoteType> moved_note (new NoteType (*to_play.front()));
+                       moved_note->set_note (moved_note->note() + cumulative_dy);
+                       play_midi_note (moved_note);
+               }
+       }
+}
+
+void
+MidiRegionView::note_dropped(CanvasNoteEvent *, frameoffset_t dt, int8_t dnote)
+{
+       assert (!_selection.empty());
+
+       uint8_t lowest_note_in_selection  = 127;
+       uint8_t highest_note_in_selection = 0;
+       uint8_t highest_note_difference = 0;
+
+       // find highest and lowest notes first
+
+       for (Selection::iterator i = _selection.begin(); i != _selection.end(); ++i) {
+               uint8_t pitch = (*i)->note()->note();
+               lowest_note_in_selection  = std::min(lowest_note_in_selection,  pitch);
+               highest_note_in_selection = std::max(highest_note_in_selection, pitch);
+       }
+
+       /*
+         cerr << "dnote: " << (int) dnote << endl;
+         cerr << "lowest note (streamview): " << int(midi_stream_view()->lowest_note())
+         << " highest note (streamview): " << int(midi_stream_view()->highest_note()) << endl;
+         cerr << "lowest note (selection): " << int(lowest_note_in_selection) << " highest note(selection): "
+         << int(highest_note_in_selection) << endl;
+         cerr << "selection size: " << _selection.size() << endl;
+         cerr << "Highest note in selection: " << (int) highest_note_in_selection << endl;
+       */
+
+       // Make sure the note pitch does not exceed the MIDI standard range
+       if (highest_note_in_selection + dnote > 127) {
+               highest_note_difference = highest_note_in_selection - 127;
+       }
+
+       start_note_diff_command (_("move notes"));
+
+       for (Selection::iterator i = _selection.begin(); i != _selection.end() ; ++i) {
+
+               Evoral::MusicalTime new_time = absolute_frames_to_source_beats (source_beats_to_absolute_frames ((*i)->note()->time()) + dt);
+
+               if (new_time < 0) {
+                       continue;
+               }
+
+               note_diff_add_change (*i, MidiModel::NoteDiffCommand::StartTime, new_time);
+
+               uint8_t original_pitch = (*i)->note()->note();
+               uint8_t new_pitch      = original_pitch + dnote - highest_note_difference;
+
+               // keep notes in standard midi range
+               clamp_to_0_127(new_pitch);
+
+               lowest_note_in_selection  = std::min(lowest_note_in_selection,  new_pitch);
+               highest_note_in_selection = std::max(highest_note_in_selection, new_pitch);
+
+               note_diff_add_change (*i, MidiModel::NoteDiffCommand::NoteNumber, new_pitch);
+       }
+
+       apply_diff();
+
+       // care about notes being moved beyond the upper/lower bounds on the canvas
+       if (lowest_note_in_selection  < midi_stream_view()->lowest_note() ||
+           highest_note_in_selection > midi_stream_view()->highest_note()) {
+               midi_stream_view()->set_note_range(MidiStreamView::ContentsRange);
+       }
+}
+
+/** @param x Pixel relative to the region position.
+ *  @return Snapped frame relative to the region position.
+ */
+framepos_t
+MidiRegionView::snap_pixel_to_frame(double x)
+{
+       PublicEditor& editor (trackview.editor());
+       return snap_frame_to_frame (editor.pixel_to_frame (x));
+}
+
+/** @param x Pixel relative to the region position.
+ *  @return Snapped pixel relative to the region position.
+ */
+double
+MidiRegionView::snap_to_pixel(double x)
+{
+       return (double) trackview.editor().frame_to_pixel(snap_pixel_to_frame(x));
+}
+
+double
+MidiRegionView::get_position_pixels()
+{
+       framepos_t region_frame = get_position();
+       return trackview.editor().frame_to_pixel(region_frame);
+}
+
+double
+MidiRegionView::get_end_position_pixels()
+{
+       framepos_t frame = get_position() + get_duration ();
+       return trackview.editor().frame_to_pixel(frame);
+}
+
+framepos_t
+MidiRegionView::source_beats_to_absolute_frames(double beats) const
+{
+       /* the time converter will return the frame corresponding to `beats'
+          relative to the start of the source. The start of the source
+          is an implied position given by region->position - region->start
+       */
+       const framepos_t source_start = _region->position() - _region->start();
+       return  source_start +  _source_relative_time_converter.to (beats);
+}
+
+double
+MidiRegionView::absolute_frames_to_source_beats(framepos_t frames) const
+{
+       /* the `frames' argument needs to be converted into a frame count
+          relative to the start of the source before being passed in to the
+          converter.
+       */
+       const framepos_t source_start = _region->position() - _region->start();
+       return  _source_relative_time_converter.from (frames - source_start);
+}
+
+framepos_t
+MidiRegionView::region_beats_to_region_frames(double beats) const
+{
+       return _region_relative_time_converter.to(beats);
+}
+
+double
+MidiRegionView::region_frames_to_region_beats(framepos_t frames) const
+{
+       return _region_relative_time_converter.from(frames);
+}
+
+void
+MidiRegionView::begin_resizing (bool /*at_front*/)
+{
+       _resize_data.clear();
+
+       for (Selection::iterator i = _selection.begin(); i != _selection.end(); ++i) {
+               CanvasNote *note = dynamic_cast<CanvasNote *> (*i);
+
+               // only insert CanvasNotes into the map
+               if (note) {
+                       NoteResizeData *resize_data = new NoteResizeData();
+                       resize_data->canvas_note = note;
+
+                       // create a new SimpleRect from the note which will be the resize preview
+                       SimpleRect *resize_rect = new SimpleRect(
+                               *_note_group, note->x1(), note->y1(), note->x2(), note->y2());
+
+                       // calculate the colors: get the color settings
+                       uint32_t fill_color = UINT_RGBA_CHANGE_A(
+                               ARDOUR_UI::config()->canvasvar_MidiNoteSelected.get(),
+                               128);
+
+                       // make the resize preview notes more transparent and bright
+                       fill_color = UINT_INTERPOLATE(fill_color, 0xFFFFFF40, 0.5);
+
+                       // calculate color based on note velocity
+                       resize_rect->property_fill_color_rgba() = UINT_INTERPOLATE(
+                               CanvasNoteEvent::meter_style_fill_color(note->note()->velocity(), note->selected()),
+                               fill_color,
+                               0.85);
+
+                       resize_rect->property_outline_color_rgba() = CanvasNoteEvent::calculate_outline(
+                               ARDOUR_UI::config()->canvasvar_MidiNoteSelected.get());
+
+                       resize_data->resize_rect = resize_rect;
+                       _resize_data.push_back(resize_data);
+               }
        }
 }
 
-
-/** Apply the current note range from the stream view
- * by repositioning/hiding notes as necessary
+/** Update resizing notes while user drags.
+ * @param primary `primary' note for the drag; ie the one that is used as the reference in non-relative mode.
+ * @param at_front which end of the note (true == note on, false == note off)
+ * @param delta_x change in mouse position since the start of the drag
+ * @param relative true if relative resizing is taking place, false if absolute resizing.  This only makes
+ * a difference when multiple notes are being resized; in relative mode, each note's length is changed by the
+ * amount of the drag.  In non-relative mode, all selected notes are set to have the same start or end point
+ * as the \a primary note.
  */
 void
-MidiRegionView::apply_note_range (uint8_t min, uint8_t max, bool force)
+MidiRegionView::update_resizing (ArdourCanvas::CanvasNoteEvent* primary, bool at_front, double delta_x, bool relative)
 {
-       if (!_enable_display) {
-               return;
-       }
+       bool cursor_set = false;
 
-       if (!force && _current_range_min == min && _current_range_max == max) {
-               return;
-       }
-       
-       _current_range_min = min;
-       _current_range_max = max;
+       for (std::vector<NoteResizeData *>::iterator i = _resize_data.begin(); i != _resize_data.end(); ++i) {
+               SimpleRect* resize_rect = (*i)->resize_rect;
+               CanvasNote* canvas_note = (*i)->canvas_note;
+               double current_x;
 
-       for (Events::const_iterator i = _events.begin(); i != _events.end(); ++i) {
-               CanvasNoteEvent* event = *i;
-               Item* item = dynamic_cast<Item*>(event);
-               assert(item);
-               if (event && event->note()) {
-                       if (event->note()->note() < _current_range_min
-                                       || event->note()->note() > _current_range_max) {
-                               if (canvas_item_visible(item)) {
-                                       item->hide();
-                               }
+               if (at_front) {
+                       if (relative) {
+                               current_x = canvas_note->x1() + delta_x;
                        } else {
-                               if (!canvas_item_visible(item)) {
-                                       item->show();
-                               }
+                               current_x = primary->x1() + delta_x;
+                       }
+               } else {
+                       if (relative) {
+                               current_x = canvas_note->x2() + delta_x;
+                       } else {
+                               current_x = primary->x2() + delta_x;
+                       }
+               }
+
+               if (at_front) {
+                       resize_rect->property_x1() = snap_to_pixel(current_x);
+                       resize_rect->property_x2() = canvas_note->x2();
+               } else {
+                       resize_rect->property_x2() = snap_to_pixel(current_x);
+                       resize_rect->property_x1() = canvas_note->x1();
+               }
+
+               if (!cursor_set) {
+                       double beats;
+
+                       beats = snap_pixel_to_frame (current_x);
+                       beats = region_frames_to_region_beats (beats);
 
-                               if (CanvasNote* note = dynamic_cast<CanvasNote*>(event)) {
-                                       const double y1 = midi_stream_view()->note_to_y(event->note()->note());
-                                       const double y2 = y1 + floor(midi_stream_view()->note_height());
-
-                                       note->property_y1() = y1;
-                                       note->property_y2() = y2;
-                               } else if (CanvasHit* hit = dynamic_cast<CanvasHit*>(event)) {
-                                       double x = trackview.editor().frame_to_pixel(
-                                                       beats_to_frames(event->note()->time()) - _region->start());
-                                       const double diamond_size = midi_stream_view()->note_height() / 2.0;
-                                       double y = midi_stream_view()->note_to_y(event->note()->note()) 
-                                                        + ((diamond_size-2.0) / 4.0);
-                                       
-                                       hit->set_height(diamond_size);
-                                       hit->move(x-hit->x1(), y-hit->y1());
-                                       hit->show();
+                       double len;
+
+                       if (at_front) {
+                               if (beats < canvas_note->note()->end_time()) {
+                                       len = canvas_note->note()->time() - beats;
+                                       len += canvas_note->note()->length();
+                               } else {
+                                       len = 0;
+                               }
+                       } else {
+                               if (beats >= canvas_note->note()->time()) {
+                                       len = beats - canvas_note->note()->time();
+                               } else {
+                                       len = 0;
                                }
                        }
+
+                       char buf[16];
+                       snprintf (buf, sizeof (buf), "%.3g beats", len);
+                       show_verbose_cursor (buf, 0, 0);
+
+                       cursor_set = true;
                }
+
        }
-       
 }
 
-GhostRegion*
-MidiRegionView::add_ghost (TimeAxisView& tv)
+
+/** Finish resizing notes when the user releases the mouse button.
+ *  Parameters the same as for \a update_resizing().
+ */
+void
+MidiRegionView::commit_resizing (ArdourCanvas::CanvasNoteEvent* primary, bool at_front, double delta_x, bool relative)
 {
-       CanvasNote* note;
+       start_note_diff_command (_("resize notes"));
 
-       double unit_position = _region->position () / samples_per_unit;
-       MidiTimeAxisView* mtv = dynamic_cast<MidiTimeAxisView*>(&tv);
-       MidiGhostRegion* ghost;
+       for (std::vector<NoteResizeData *>::iterator i = _resize_data.begin(); i != _resize_data.end(); ++i) {
+               CanvasNote*  canvas_note = (*i)->canvas_note;
+               SimpleRect*  resize_rect = (*i)->resize_rect;
 
-       if (mtv && mtv->midi_view()) {
-               /* if ghost is inserted into midi track, use a dedicated midi ghost canvas group
-                  to allow having midi notes on top of note lines and waveforms.
+               /* Get the new x position for this resize, which is in pixels relative
+                * to the region position.
                 */
-               ghost = new MidiGhostRegion (*mtv->midi_view(), trackview, unit_position);
-       } else {
-               ghost = new MidiGhostRegion (tv, trackview, unit_position);
-       }
+               
+               double current_x;
 
-       ghost->set_height ();
-       ghost->set_duration (_region->length() / samples_per_unit);
-       ghosts.push_back (ghost);
+               if (at_front) {
+                       if (relative) {
+                               current_x = canvas_note->x1() + delta_x;
+                       } else {
+                               current_x = primary->x1() + delta_x;
+                       }
+               } else {
+                       if (relative) {
+                               current_x = canvas_note->x2() + delta_x;
+                       } else {
+                               current_x = primary->x2() + delta_x;
+                       }
+               }
 
-       for (Events::iterator i = _events.begin(); i != _events.end(); ++i) {
-               if ((note = dynamic_cast<CanvasNote*>(*i)) != 0) {
-                       ghost->add_note(note);
+               /* Convert that to a frame within the source */
+               current_x = snap_pixel_to_frame (current_x) + _region->start ();
+
+               /* and then to beats */
+               current_x = region_frames_to_region_beats (current_x);
+
+               if (at_front && current_x < canvas_note->note()->end_time()) {
+                       note_diff_add_change (canvas_note, MidiModel::NoteDiffCommand::StartTime, current_x);
+
+                       double len = canvas_note->note()->time() - current_x;
+                       len += canvas_note->note()->length();
+
+                       if (len > 0) {
+                               /* XXX convert to beats */
+                               note_diff_add_change (canvas_note, MidiModel::NoteDiffCommand::Length, len);
+                       }
                }
-       }
 
-       ghost->GoingAway.connect (mem_fun(*this, &MidiRegionView::remove_ghost));
+               if (!at_front) {
+                       double len = current_x - canvas_note->note()->time();
 
-       return ghost;
-}
+                       if (len > 0) {
+                               /* XXX convert to beats */
+                               note_diff_add_change (canvas_note, MidiModel::NoteDiffCommand::Length, len);
+                       }
+               }
+
+               delete resize_rect;
+               delete (*i);
+       }
 
+       _resize_data.clear();
+       apply_diff();
+}
 
-/** Begin tracking note state for successive calls to add_event
- */
 void
-MidiRegionView::begin_write()
+MidiRegionView::change_note_velocity(CanvasNoteEvent* event, int8_t velocity, bool relative)
 {
-       assert(!_active_notes);
-       _active_notes = new CanvasNote*[128];
-       for (unsigned i=0; i < 128; ++i) {
-               _active_notes[i] = NULL;
+       uint8_t new_velocity;
+
+       if (relative) {
+               new_velocity = event->note()->velocity() + velocity;
+               clamp_to_0_127(new_velocity);
+       } else {
+               new_velocity = velocity;
        }
-}
 
+       event->set_selected (event->selected()); // change color
 
-/** Destroy note state for add_event
- */
-void
-MidiRegionView::end_write()
-{
-       delete[] _active_notes;
-       _active_notes = NULL;
-       _marked_for_selection.clear();
-       _marked_for_velocity.clear();
+       note_diff_add_change (event, MidiModel::NoteDiffCommand::Velocity, new_velocity);
 }
 
-
-/** Resolve an active MIDI note (while recording).
- */
 void
-MidiRegionView::resolve_note(uint8_t note, double end_time)
+MidiRegionView::change_note_note (CanvasNoteEvent* event, int8_t note, bool relative)
 {
-       if (midi_view()->note_mode() != Sustained) {
-               return;
-       }
+       uint8_t new_note;
 
-       if (_active_notes && _active_notes[note]) {
-               const nframes64_t end_time_frames = beats_to_frames(end_time);
-               _active_notes[note]->property_x2() = trackview.editor().frame_to_pixel(end_time_frames);
-               _active_notes[note]->property_outline_what() = (guint32) 0xF; // all edges
-               _active_notes[note] = NULL;
+       if (relative) {
+               new_note = event->note()->note() + note;
+       } else {
+               new_note = note;
        }
-}
 
+       clamp_to_0_127 (new_note);
+       note_diff_add_change (event, MidiModel::NoteDiffCommand::NoteNumber, new_note);
+}
 
-/** Extend active notes to rightmost edge of region (if length is changed)
- */
 void
-MidiRegionView::extend_active_notes()
+MidiRegionView::trim_note (CanvasNoteEvent* event, Evoral::MusicalTime front_delta, Evoral::MusicalTime end_delta)
 {
-       if (!_active_notes) {
-               return;
+       bool change_start = false;
+       bool change_length = false;
+       Evoral::MusicalTime new_start = 0;
+       Evoral::MusicalTime new_length = 0;
+
+       /* NOTE: the semantics of the two delta arguments are slightly subtle:
+
+          front_delta: if positive - move the start of the note later in time (shortening it)
+          if negative - move the start of the note earlier in time (lengthening it)
+
+          end_delta:   if positive - move the end of the note later in time (lengthening it)
+          if negative - move the end of the note earlier in time (shortening it)
+       */
+
+       if (front_delta) {
+               if (front_delta < 0) {
+
+                       if (event->note()->time() < -front_delta) {
+                               new_start = 0;
+                       } else {
+                               new_start = event->note()->time() + front_delta; // moves earlier
+                       }
+
+                       /* start moved toward zero, so move the end point out to where it used to be.
+                          Note that front_delta is negative, so this increases the length.
+                       */
+
+                       new_length = event->note()->length() - front_delta;
+                       change_start = true;
+                       change_length = true;
+
+               } else {
+
+                       Evoral::MusicalTime new_pos = event->note()->time() + front_delta;
+
+                       if (new_pos < event->note()->end_time()) {
+                               new_start = event->note()->time() + front_delta;
+                               /* start moved toward the end, so move the end point back to where it used to be */
+                               new_length = event->note()->length() - front_delta;
+                               change_start = true;
+                               change_length = true;
+                       }
+               }
+
        }
 
-       for (unsigned i=0; i < 128; ++i) {
-               if (_active_notes[i]) {
-                       _active_notes[i]->property_x2() = trackview.editor().frame_to_pixel(_region->length());
+       if (end_delta) {
+               bool can_change = true;
+               if (end_delta < 0) {
+                       if (event->note()->length() < -end_delta) {
+                               can_change = false;
+                       }
+               }
+
+               if (can_change) {
+                       new_length = event->note()->length() + end_delta;
+                       change_length = true;
                }
        }
+
+       if (change_start) {
+               note_diff_add_change (event, MidiModel::NoteDiffCommand::StartTime, new_start);
+       }
+
+       if (change_length) {
+               note_diff_add_change (event, MidiModel::NoteDiffCommand::Length, new_length);
+       }
 }
 
-void 
-MidiRegionView::play_midi_note(boost::shared_ptr<NoteType> note)
+void
+MidiRegionView::change_note_channel (CanvasNoteEvent* event, int8_t chn, bool relative)
 {
-       if (!trackview.editor().sound_notes()) {
-               return;
+       uint8_t new_channel;
+
+       if (relative) {
+               if (chn < 0.0) {
+                       if (event->note()->channel() < -chn) {
+                               new_channel = 0;
+                       } else {
+                               new_channel = event->note()->channel() + chn;
+                       }
+               } else {
+                       new_channel = event->note()->channel() + chn;
+               }
+       } else {
+               new_channel = (uint8_t) chn;
        }
 
-       RouteUI* route_ui = dynamic_cast<RouteUI*> (&trackview);
-       assert(route_ui);
-       
-       route_ui->midi_track()->write_immediate_event(
-                       note->on_event().size(), note->on_event().buffer());
-       
-       const double note_length_beats = (note->off_event().time() - note->on_event().time());
-       nframes_t note_length_ms = beats_to_frames(note_length_beats)
-                       * (1000 / (double)route_ui->session().nominal_frame_rate());
-       Glib::signal_timeout().connect(bind(mem_fun(this, &MidiRegionView::play_midi_note_off), note),
-                       note_length_ms, G_PRIORITY_DEFAULT);
+       note_diff_add_change (event, MidiModel::NoteDiffCommand::Channel, new_channel);
 }
 
-bool
-MidiRegionView::play_midi_note_off(boost::shared_ptr<NoteType> note)
+void
+MidiRegionView::change_note_time (CanvasNoteEvent* event, Evoral::MusicalTime delta, bool relative)
 {
-       RouteUI* route_ui = dynamic_cast<RouteUI*> (&trackview);
-       assert(route_ui);
-       
-       route_ui->midi_track()->write_immediate_event(
-                       note->off_event().size(), note->off_event().buffer());
+       Evoral::MusicalTime new_time;
 
-       return false;
+       if (relative) {
+               if (delta < 0.0) {
+                       if (event->note()->time() < -delta) {
+                               new_time = 0;
+                       } else {
+                               new_time = event->note()->time() + delta;
+                       }
+               } else {
+                       new_time = event->note()->time() + delta;
+               }
+       } else {
+               new_time = delta;
+       }
+
+       note_diff_add_change (event, MidiModel::NoteDiffCommand::StartTime, new_time);
 }
 
-bool
-MidiRegionView::note_in_visible_range(const boost::shared_ptr<NoteType> note) const
+void
+MidiRegionView::change_note_length (CanvasNoteEvent* event, Evoral::MusicalTime t)
 {
-       const nframes64_t note_start_frames = beats_to_frames(note->time());
-       bool outside = (note_start_frames - _region->start() >= _region->length())
-                       || (note_start_frames < _region->start())
-                       || (note->note() < midi_stream_view()->lowest_note())
-                       || (note->note() > midi_stream_view()->highest_note());
-       return !outside;
+       note_diff_add_change (event, MidiModel::NoteDiffCommand::Length, t);
 }
 
-/** Add a MIDI note to the view (with length).
- *
- * If in sustained mode, notes with length 0 will be considered active
- * notes, and resolve_note should be called when the corresponding note off
- * event arrives, to properly display the note.
- */
 void
-MidiRegionView::add_note(const boost::shared_ptr<NoteType> note)
+MidiRegionView::change_velocities (bool up, bool fine, bool allow_smush)
 {
-       assert(note->time() >= 0);
-       assert(midi_view()->note_mode() == Sustained || midi_view()->note_mode() == Percussive);
-       
-       const nframes64_t note_start_frames = beats_to_frames(note->time());
-       const nframes64_t note_end_frames   = beats_to_frames(note->end_time());
+       int8_t delta;
 
-       ArdourCanvas::Group* const group = (ArdourCanvas::Group*)get_canvas_group();
+       if (_selection.empty()) {
+               return;
+       }
 
-       CanvasNoteEvent* event = 0;
-       
-       const double x = trackview.editor().frame_to_pixel(note_start_frames - _region->start());
-       
-       if (midi_view()->note_mode() == Sustained) {
-               const double y1 = midi_stream_view()->note_to_y(note->note());
-               const double note_endpixel = 
-                       trackview.editor().frame_to_pixel(note_end_frames - _region->start());
-               
-               CanvasNote* ev_rect = new CanvasNote(*this, *group, note);
-               ev_rect->property_x1() = x;
-               ev_rect->property_y1() = y1;
-               if (note->length() > 0) {
-                       ev_rect->property_x2() = note_endpixel;
-               } else {
-                       ev_rect->property_x2() = trackview.editor().frame_to_pixel(_region->length());
-               }
-               ev_rect->property_y2() = y1 + floor(midi_stream_view()->note_height());
-
-               if (note->length() == 0) {
-                       if (_active_notes) {
-                               assert(note->note() < 128);
-                               // If this note is already active there's a stuck note,
-                               // finish the old note rectangle
-                               if (_active_notes[note->note()]) {
-                                       CanvasNote* const old_rect = _active_notes[note->note()];
-                                       boost::shared_ptr<NoteType> old_note = old_rect->note();
-                                       old_rect->property_x2() = x;
-                                       old_rect->property_outline_what() = (guint32) 0xF;
-                               }
-                               _active_notes[note->note()] = ev_rect;
-                       }
-                       /* outline all but right edge */
-                       ev_rect->property_outline_what() = (guint32) (0x1 & 0x4 & 0x8);
-               } else {
-                       /* outline all edges */
-                       ev_rect->property_outline_what() = (guint32) 0xF;
-               }
+       if (fine) {
+               delta = 1;
+       } else {
+               delta = 10;
+       }
 
-               event = ev_rect;
+       if (!up) {
+               delta = -delta;
+       }
 
-               MidiGhostRegion* gr;
-               for (std::vector<GhostRegion*>::iterator g = ghosts.begin(); g != ghosts.end(); ++g) {
-                       if ((gr = dynamic_cast<MidiGhostRegion*>(*g)) != 0) {
-                               gr->add_note(ev_rect);
+       if (!allow_smush) {
+               for (Selection::iterator i = _selection.begin(); i != _selection.end(); ++i) {
+                       if ((*i)->note()->velocity() + delta == 0 || (*i)->note()->velocity() + delta == 127) {
+                               return;
                        }
                }
+       }
 
-       } else if (midi_view()->note_mode() == Percussive) {
-               const double diamond_size = midi_stream_view()->note_height() / 2.0;
-               const double y = midi_stream_view()->note_to_y(note->note()) + ((diamond_size-2) / 4.0);
+       start_note_diff_command (_("change velocities"));
 
-               CanvasHit* ev_diamond = new CanvasHit(*this, *group, diamond_size, note);
-               ev_diamond->move(x, y);
-               event = ev_diamond;
-       } else {
-               event = 0;
+       for (Selection::iterator i = _selection.begin(); i != _selection.end();) {
+               Selection::iterator next = i;
+               ++next;
+               change_note_velocity (*i, delta, true);
+               i = next;
        }
 
-       if (event) {
-               if (_marked_for_selection.find(note) != _marked_for_selection.end()) {
-                       note_selected(event, true);
-               }
-               if (_marked_for_velocity.find(note) != _marked_for_velocity.end()) {
-                       event->show_velocity();
-               }
-               event->on_channel_selection_change(_last_channel_selection);
-               _events.push_back(event);
-               if (note_in_visible_range(note)) {
-                       event->show();
-               } else {
-                       event->hide();
-               }
-       }
-}
+       apply_diff();
 
-void
-MidiRegionView::add_pgm_change(PCEvent& program, const string& displaytext)
-{
-       assert(program.time >= 0);
-       
-       ArdourCanvas::Group* const group = (ArdourCanvas::Group*)get_canvas_group();
-       const double x = trackview.editor().frame_to_pixel(beats_to_frames(program.time));
-       
-       double height = midi_stream_view()->contents_height();
-       
-       boost::shared_ptr<CanvasProgramChange> pgm_change = boost::shared_ptr<CanvasProgramChange>(
-                       new CanvasProgramChange(*this, *group,
-                                       displaytext, 
-                                       height, 
-                                       x, 1.0, 
-                                       _model_name, 
-                                       _custom_device_mode, 
-                                       program.time, program.channel, program.value));
-       
-       // Show unless program change is beyond the region bounds
-       if (program.time - _region->start() >= _region->length() || program.time < _region->start()) {
-               pgm_change->hide();
-       } else {
-               pgm_change->show();
+       if (!_selection.empty()) {
+               char buf[24];
+               snprintf (buf, sizeof (buf), "Vel %d",
+                         (int) (*_selection.begin())->note()->velocity());
+               show_verbose_cursor (buf, 10, 10);
        }
-       
-       _pgm_changes.push_back(pgm_change);
 }
 
+
 void
-MidiRegionView::get_patch_key_at(double time, uint8_t channel, MIDI::Name::PatchPrimaryKey& key)
+MidiRegionView::transpose (bool up, bool fine, bool allow_smush)
 {
-       cerr << "getting patch key at " << time << " for channel " << channel << endl;
-       Evoral::Parameter bank_select_msb(MidiCCAutomation, channel, MIDI_CTL_MSB_BANK);
-       boost::shared_ptr<Evoral::Control> msb_control = _model->control(bank_select_msb);
-       float msb = -1.0;
-       if (msb_control != 0) {
-               msb = int(msb_control->get_float(true, time));
-               cerr << "got msb " << msb;
+       if (_selection.empty()) {
+               return;
        }
 
-       Evoral::Parameter bank_select_lsb(MidiCCAutomation, channel, MIDI_CTL_LSB_BANK);
-       boost::shared_ptr<Evoral::Control> lsb_control = _model->control(bank_select_lsb);
-       float lsb = -1.0;
-       if (lsb_control != 0) {
-               lsb = lsb_control->get_float(true, time);
-               cerr << " got lsb " << lsb;
-       }
-       
-       Evoral::Parameter program_change(MidiPgmChangeAutomation, channel, 0);
-       boost::shared_ptr<Evoral::Control> program_control = _model->control(program_change);
-       float program_number = -1.0;
-       if (program_control != 0) {
-               program_number = program_control->get_float(true, time);
-               cerr << " got program " << program_number << endl;
+       int8_t delta;
+
+       if (fine) {
+               delta = 1;
+       } else {
+               delta = 12;
        }
-       
-       key.msb = (int) floor(msb + 0.5);
-       key.lsb = (int) floor(lsb + 0.5);
-       key.program_number = (int) floor(program_number + 0.5);
-       assert(key.is_sane());
-}
 
+       if (!up) {
+               delta = -delta;
+       }
 
-void 
-MidiRegionView::alter_program_change(PCEvent& old_program, const MIDI::Name::PatchPrimaryKey& new_patch)
-{
-       // TODO: Get the real event here and alter them at the original times
-       Evoral::Parameter bank_select_msb(MidiCCAutomation, old_program.channel, MIDI_CTL_MSB_BANK);
-       boost::shared_ptr<Evoral::Control> msb_control = _model->control(bank_select_msb);
-       if (msb_control != 0) {
-               msb_control->set_float(float(new_patch.msb), true, old_program.time);
+       if (!allow_smush) {
+               for (Selection::iterator i = _selection.begin(); i != _selection.end(); ++i) {
+                       if (!up) {
+                               if ((int8_t) (*i)->note()->note() + delta <= 0) {
+                                       return;
+                               }
+                       } else {
+                               if ((int8_t) (*i)->note()->note() + delta > 127) {
+                                       return;
+                               }
+                       }
+               }
        }
 
-       // TODO: Get the real event here and alter them at the original times
-       Evoral::Parameter bank_select_lsb(MidiCCAutomation, old_program.channel, MIDI_CTL_LSB_BANK);
-       boost::shared_ptr<Evoral::Control> lsb_control = _model->control(bank_select_lsb);
-       if (lsb_control != 0) {
-               lsb_control->set_float(float(new_patch.lsb), true, old_program.time);
+       start_note_diff_command (_("transpose"));
+
+       for (Selection::iterator i = _selection.begin(); i != _selection.end(); ) {
+               Selection::iterator next = i;
+               ++next;
+               change_note_note (*i, delta, true);
+               i = next;
        }
-       
-       Evoral::Parameter program_change(MidiPgmChangeAutomation, old_program.channel, 0);
-       boost::shared_ptr<Evoral::Control> program_control = _model->control(program_change);
-       
-       assert(program_control != 0);
-       program_control->set_float(float(new_patch.program_number), true, old_program.time);
-       
-       redisplay_model();
+
+       apply_diff ();
 }
 
 void
-MidiRegionView::program_selected(CanvasProgramChange& program, const MIDI::Name::PatchPrimaryKey& new_patch)
+MidiRegionView::change_note_lengths (bool fine, bool shorter, Evoral::MusicalTime delta, bool start, bool end)
 {
-       PCEvent program_change_event(program.event_time(), program.program(), program.channel());
-       alter_program_change(program_change_event, new_patch);
-}
+       if (delta == 0.0) {
+               if (fine) {
+                       delta = 1.0/128.0;
+               } else {
+                       /* grab the current grid distance */
+                       bool success;
+                       delta = trackview.editor().get_grid_type_as_beats (success, _region->position());
+                       if (!success) {
+                               /* XXX cannot get grid type as beats ... should always be possible ... FIX ME */
+                               cerr << "Grid type not available as beats - TO BE FIXED\n";
+                               return;
+                       }
+               }
+       }
 
-void 
-MidiRegionView::previous_program(CanvasProgramChange& program)
-{
-       MIDI::Name::PatchPrimaryKey key;
-       get_patch_key_at(program.event_time(), program.channel(), key);
-       
-       boost::shared_ptr<MIDI::Name::Patch> patch = 
-               MIDI::Name::MidiPatchManager::instance().previous_patch(
-                               _model_name,
-                               _custom_device_mode, 
-                               program.channel(), 
-                               key);
-       
-       PCEvent program_change_event(program.event_time(), program.program(), program.channel());
-       if (patch) {
-               alter_program_change(program_change_event, patch->patch_primary_key());
+       if (shorter) {
+               delta = -delta;
        }
-}
 
-void 
-MidiRegionView::next_program(CanvasProgramChange& program)
-{
-       MIDI::Name::PatchPrimaryKey key;
-       get_patch_key_at(program.event_time(), program.channel(), key);
-       
-       boost::shared_ptr<MIDI::Name::Patch> patch = 
-               MIDI::Name::MidiPatchManager::instance().next_patch(
-                               _model_name,
-                               _custom_device_mode, 
-                               program.channel(), 
-                               key);   
+       start_note_diff_command (_("change note lengths"));
+
+       for (Selection::iterator i = _selection.begin(); i != _selection.end(); ) {
+               Selection::iterator next = i;
+               ++next;
 
-       PCEvent program_change_event(program.event_time(), program.program(), program.channel());
-       if (patch) {
-               alter_program_change(program_change_event, patch->patch_primary_key());
+               /* note the negation of the delta for start */
+
+               trim_note (*i, (start ? -delta : 0), (end ? delta : 0));
+               i = next;
        }
+
+       apply_diff ();
+
 }
 
 void
-MidiRegionView::delete_selection()
+MidiRegionView::nudge_notes (bool forward)
 {
        if (_selection.empty()) {
                return;
        }
 
-       if (!_delta_command) {
-               _delta_command = _model->new_delta_command("delete selection");
-       }
+       /* pick a note as the point along the timeline to get the nudge distance.
+          its not necessarily the earliest note, so we may want to pull the notes out
+          into a vector and sort before using the first one.
+       */
 
-       for (Selection::iterator i = _selection.begin(); i != _selection.end(); ++i) {
-               if ((*i)->selected()) {
-                       _delta_command->remove((*i)->note());
+       framepos_t ref_point = source_beats_to_absolute_frames ((*(_selection.begin()))->note()->time());
+       framepos_t unused;
+       framepos_t distance;
+
+       if (trackview.editor().snap_mode() == Editing::SnapOff) {
+
+               /* grid is off - use nudge distance */
+
+               distance = trackview.editor().get_nudge_distance (ref_point, unused);
+
+       } else {
+
+               /* use grid */
+
+               framepos_t next_pos = ref_point;
+
+               if (forward) {
+                       if (max_framepos - 1 < next_pos) {
+                               next_pos += 1;
+                       }
+               } else {
+                       if (next_pos == 0) {
+                               return;
+                       }
+                       next_pos -= 1;
                }
+
+               trackview.editor().snap_to (next_pos, (forward ? 1 : -1), false);
+               distance = ref_point - next_pos;
        }
 
-       _selection.clear();
+       if (distance == 0) {
+               return;
+       }
+
+       Evoral::MusicalTime delta = region_frames_to_region_beats (fabs (distance));
+
+       if (!forward) {
+               delta = -delta;
+       }
+
+       start_note_diff_command (_("nudge"));
+
+       for (Selection::iterator i = _selection.begin(); i != _selection.end(); ) {
+               Selection::iterator next = i;
+               ++next;
+               change_note_time (*i, delta, true);
+               i = next;
+       }
+
+       apply_diff ();
 }
 
 void
-MidiRegionView::clear_selection_except(ArdourCanvas::CanvasNoteEvent* ev)
+MidiRegionView::change_channel(uint8_t channel)
 {
+       start_note_diff_command(_("change channel"));
        for (Selection::iterator i = _selection.begin(); i != _selection.end(); ++i) {
-               if ((*i)->selected() && (*i) != ev) {
-                       (*i)->selected(false);
-                       (*i)->hide_velocity();
-               }
+               note_diff_add_change (*i, MidiModel::NoteDiffCommand::Channel, channel);
        }
 
-       _selection.clear();
+       apply_diff();
 }
 
+
 void
-MidiRegionView::unique_select(ArdourCanvas::CanvasNoteEvent* ev)
+MidiRegionView::note_entered(ArdourCanvas::CanvasNoteEvent* ev)
 {
-       for (Selection::iterator i = _selection.begin(); i != _selection.end(); ) {
+       Editor* editor = dynamic_cast<Editor*>(&trackview.editor());
 
-               Selection::iterator tmp = i;
-               ++tmp;
+       _pre_enter_cursor = editor->get_canvas_cursor ();
 
-               if ((*i) != ev) {
-                       remove_from_selection (*i);
-               } 
-
-               i = tmp;
+       if (_mouse_state == SelectTouchDragging) {
+               note_selected (ev, true);
        }
 
-       if (!ev->selected()) {
-               add_to_selection (ev);
-       }
+       show_verbose_cursor (ev->note ());
 }
 
 void
-MidiRegionView::note_selected(ArdourCanvas::CanvasNoteEvent* ev, bool add)
+MidiRegionView::note_left (ArdourCanvas::CanvasNoteEvent*)
 {
-       if (!add) {
-               clear_selection_except(ev);
+       Editor* editor = dynamic_cast<Editor*>(&trackview.editor());
+
+       for (Selection::iterator i = _selection.begin(); i != _selection.end(); ++i) {
+               (*i)->hide_velocity ();
        }
 
-       if (!ev->selected()) {
-               add_to_selection (ev);
+       editor->verbose_cursor()->hide ();
+
+       if (_pre_enter_cursor) {
+               editor->set_canvas_cursor (_pre_enter_cursor);
+               _pre_enter_cursor = 0;
        }
 }
 
-
 void
-MidiRegionView::note_deselected(ArdourCanvas::CanvasNoteEvent* ev, bool add)
+MidiRegionView::patch_entered (ArdourCanvas::CanvasPatchChange* ev)
 {
-       if (!add) {
-               clear_selection_except(ev);
-       }
+       ostringstream s;
+       /* XXX should get patch name if we can */
+       s << _("Bank:") << (ev->patch()->bank() + MIDI_BP_ZERO) << '\n' << _("Program:") << ((int) ev->patch()->program()) + MIDI_BP_ZERO << '\n' << _("Channel:") << ((int) ev->patch()->channel() + 1);
+       show_verbose_cursor (s.str(), 10, 20);
+}
 
-       remove_from_selection (ev);
+void
+MidiRegionView::patch_left (ArdourCanvas::CanvasPatchChange *)
+{
+       trackview.editor().verbose_cursor()->hide ();
 }
 
+void
+MidiRegionView::note_mouse_position (float x_fraction, float /*y_fraction*/, bool can_set_cursor)
+{
+       Editor* editor = dynamic_cast<Editor*>(&trackview.editor());
+
+       if (x_fraction > 0.0 && x_fraction < 0.25) {
+               editor->set_canvas_cursor (editor->cursors()->left_side_trim);
+       } else if (x_fraction >= 0.75 && x_fraction < 1.0) {
+               editor->set_canvas_cursor (editor->cursors()->right_side_trim);
+       } else {
+               if (_pre_enter_cursor && can_set_cursor) {
+                       editor->set_canvas_cursor (_pre_enter_cursor);
+               }
+       }
+}
 
 void
-MidiRegionView::update_drag_selection(double x1, double x2, double y1, double y2)
+MidiRegionView::set_frame_color()
 {
-       const double last_y = std::min(y1, y2);
-       const double y      = std::max(y1, y2);
+       uint32_t f;
 
-       // TODO: Make this faster by storing the last updated selection rect, and only
-       // adjusting things that are in the area that appears/disappeared.
-       // We probably need a tree to be able to find events in O(log(n)) time.
+       TimeAxisViewItem::set_frame_color ();
 
-#ifndef NDEBUG
-       double last_x1 = 0.0;
-#endif
+       if (!frame) {
+               return;
+       }
 
-       if (x1 < x2) {
-               for (Events::iterator i = _events.begin(); i != _events.end(); ++i) {
-#ifndef NDEBUG
-                       // Events should always be sorted by increasing x1() here
-                       assert((*i)->x1() >= last_x1);
-                       last_x1 = (*i)->x1();
-#endif
-                       if ((*i)->x1() >= x1 && (*i)->x1() <= x2 && (*i)->y1() >= last_y && (*i)->y1() <= y) {
-                               // Inside rectangle
-                               add_to_selection (*i);
-                       } else if ((*i)->selected()) {
-                               // Not inside rectangle
-                               remove_from_selection (*i);
-                       }
-               }
+       if (_selected) {
+               f = ARDOUR_UI::config()->canvasvar_SelectedFrameBase.get();
+       } else if (high_enough_for_name) {
+               f= ARDOUR_UI::config()->canvasvar_MidiFrameBase.get();
        } else {
-               for (Events::iterator i = _events.begin(); i != _events.end(); ++i) {
-#ifndef NDEBUG
-                       // Events should always be sorted by increasing x1() here
-                       assert((*i)->x1() >= last_x1);
-                       last_x1 = (*i)->x1();
-#endif
-                       if ((*i)->x2() <= x1 && (*i)->x2() >= x2 && (*i)->y1() >= last_y && (*i)->y1() <= y) {
-                               // Inside rectangle
-                               add_to_selection (*i);
-                       } else if ((*i)->selected()) {
-                               // Not inside rectangle
-                               remove_from_selection (*i);
-                       }
-               }
+               f = fill_color;
+       }
+
+       if (!rect_visible) {
+               f = UINT_RGBA_CHANGE_A (f, 0);
        }
+
+       frame->property_fill_color_rgba() = f;
 }
 
 void
-MidiRegionView::remove_from_selection (CanvasNoteEvent* ev)
+MidiRegionView::midi_channel_mode_changed(ChannelMode mode, uint16_t mask)
 {
-       Selection::iterator i = _selection.find (ev);
+       switch (mode) {
+       case AllChannels:
+       case FilterChannels:
+               _force_channel = -1;
+               break;
+       case ForceChannel:
+               _force_channel = mask;
+               mask = 0xFFFF; // Show all notes as active (below)
+       };
 
-       if (i != _selection.end()) {
-               _selection.erase (i);
+       // Update notes for selection
+       for (Events::iterator i = _events.begin(); i != _events.end(); ++i) {
+               (*i)->on_channel_selection_change(mask);
        }
 
-       ev->selected (false);
-       ev->hide_velocity ();
-       
-       if (_selection.empty()) {
-               PublicEditor& editor (trackview.editor());
-               editor.get_selection().remove (this);
-       }
+       _last_channel_selection = mask;
+
+       _patch_changes.clear ();
+       display_patch_changes ();
 }
 
 void
-MidiRegionView::add_to_selection (CanvasNoteEvent* ev)
+MidiRegionView::midi_patch_settings_changed(std::string model, std::string custom_device_mode)
 {
-       bool add_mrv_selection = false;
+       _model_name         = model;
+       _custom_device_mode = custom_device_mode;
+       redisplay_model();
+}
 
+void
+MidiRegionView::cut_copy_clear (Editing::CutCopyOp op)
+{
        if (_selection.empty()) {
-               add_mrv_selection = true;
+               return;
        }
 
-       if (_selection.insert (ev).second) {
-               ev->selected (true);
-               play_midi_note ((ev)->note());
+       PublicEditor& editor (trackview.editor());
+
+       switch (op) {
+       case Delete:
+               /* XXX what to do ? */
+               break;
+       case Cut:
+       case Copy:
+               editor.get_cut_buffer().add (selection_as_cut_buffer());
+               break;
+       default:
+               break;
        }
 
-       if (add_mrv_selection) {
-               PublicEditor& editor (trackview.editor());
-               editor.get_selection().add (this);
+       if (op != Copy) {
+
+               start_note_diff_command();
+
+               for (Selection::iterator i = _selection.begin(); i != _selection.end(); ++i) {
+                       switch (op) {
+                       case Copy:
+                               break;
+                       case Delete:
+                       case Cut:
+                       case Clear:
+                               note_diff_remove_note (*i);
+                               break;
+                       }
+               }
+
+               apply_diff();
        }
 }
 
-void
-MidiRegionView::move_selection(double dx, double dy)
+MidiCutBuffer*
+MidiRegionView::selection_as_cut_buffer () const
 {
+       Notes notes;
+
        for (Selection::iterator i = _selection.begin(); i != _selection.end(); ++i) {
-               (*i)->move_event(dx, dy);
+               NoteType* n = (*i)->note().get();
+               notes.insert (boost::shared_ptr<NoteType> (new NoteType (*n)));
        }
+
+       MidiCutBuffer* cb = new MidiCutBuffer (trackview.session());
+       cb->set (notes);
+
+       return cb;
 }
 
+/** This method handles undo */
 void
-MidiRegionView::note_dropped(CanvasNoteEvent* ev, double dt, uint8_t dnote)
+MidiRegionView::paste (framepos_t pos, float times, const MidiCutBuffer& mcb)
 {
-       // TODO: This would be faster/nicer with a MoveCommand that doesn't need to copy...
-       if (_selection.find(ev) == _selection.end()) {
+       if (mcb.empty()) {
                return;
        }
 
-       uint8_t lowest_note_in_selection  = midi_stream_view()->lowest_note();
-       uint8_t highest_note_in_selection = midi_stream_view()->highest_note();
-       uint8_t highest_note_difference = 0;
+       DEBUG_TRACE (DEBUG::CutNPaste, string_compose ("MIDI paste @ %1 times %2\n", pos, times));
 
-       // find highest and lowest notes first
-       for (Selection::iterator i = _selection.begin(); i != _selection.end(); ++i) {
-               uint8_t pitch = (*i)->note()->note();
-               lowest_note_in_selection  = std::min(lowest_note_in_selection,  pitch);
-               highest_note_in_selection = std::max(highest_note_in_selection, pitch);
-       }
-       
-       /*
-       cerr << "dnote: " << (int) dnote << endl;
-       cerr << "lowest note (streamview): " << int(midi_stream_view()->lowest_note()) 
-            << " highest note (streamview): " << int(midi_stream_view()->highest_note()) << endl;
-       cerr << "lowest note (selection): " << int(lowest_note_in_selection) << " highest note(selection): " 
-            << int(highest_note_in_selection) << endl;
-       cerr << "selection size: " << _selection.size() << endl;
-       cerr << "Highest note in selection: " << (int) highest_note_in_selection << endl;
-       */
-       
-       // Make sure the note pitch does not exceed the MIDI standard range
-       if (dnote <= 127 && (highest_note_in_selection + dnote > 127)) {
-               highest_note_difference = highest_note_in_selection - 127;
-       }
-       
-       start_delta_command(_("move notes"));
+       trackview.session()->begin_reversible_command (_("paste"));
 
-       for (Selection::iterator i = _selection.begin(); i != _selection.end() ; ) {
-               Selection::iterator next = i;
-               ++next;
+       start_note_diff_command (_("paste"));
 
-               const boost::shared_ptr<NoteType> copy(new NoteType(*(*i)->note().get()));
+       Evoral::MusicalTime beat_delta;
+       Evoral::MusicalTime paste_pos_beats;
+       Evoral::MusicalTime duration;
+       Evoral::MusicalTime end_point = 0;
 
-               nframes64_t start_frames = beats_to_frames((*i)->note()->time());
-               if (dt >= 0) {
-                       start_frames += snap_frame_to_frame(trackview.editor().pixel_to_frame(dt));
-               } else {
-                       start_frames -= snap_frame_to_frame(trackview.editor().pixel_to_frame(-dt));
-               }
+       duration = (*mcb.notes().rbegin())->end_time() - (*mcb.notes().begin())->time();
+       paste_pos_beats = region_frames_to_region_beats (pos - _region->position());
+       beat_delta = (*mcb.notes().begin())->time() - paste_pos_beats;
+       paste_pos_beats = 0;
 
-               copy->set_time(frames_to_beats(start_frames));
+       DEBUG_TRACE (DEBUG::CutNPaste, string_compose ("Paste data spans from %1 to %2 (%3) ; paste pos beats = %4 (based on %5 - %6 ; beat delta = %7\n",
+                                                      (*mcb.notes().begin())->time(),
+                                                      (*mcb.notes().rbegin())->end_time(),
+                                                      duration, pos, _region->position(),
+                                                      paste_pos_beats, beat_delta));
 
-               uint8_t original_pitch = (*i)->note()->note();
-               uint8_t new_pitch      = original_pitch + dnote - highest_note_difference;
-               
-               // keep notes in standard midi range
-               clamp_to_0_127(new_pitch);
-               
-               // keep original pitch if note is dragged outside valid midi range
-               if ((original_pitch != 0 && new_pitch == 0)
-                               || (original_pitch != 127 && new_pitch == 127)) {
-                       new_pitch = original_pitch;
-               }
+       clear_selection ();
 
-               lowest_note_in_selection  = std::min(lowest_note_in_selection,  new_pitch);
-               highest_note_in_selection = std::max(highest_note_in_selection, new_pitch);
+       for (int n = 0; n < (int) times; ++n) {
 
-               copy->set_note(new_pitch);
-               
-               command_remove_note(*i);
-               command_add_note(copy, (*i)->selected());
+               for (Notes::const_iterator i = mcb.notes().begin(); i != mcb.notes().end(); ++i) {
 
-               i = next;
-       }
+                       boost::shared_ptr<NoteType> copied_note (new NoteType (*((*i).get())));
+                       copied_note->set_time (paste_pos_beats + copied_note->time() - beat_delta);
 
-       apply_command();
-       
-       // care about notes being moved beyond the upper/lower bounds on the canvas
-       if (lowest_note_in_selection  < midi_stream_view()->lowest_note() ||
-                       highest_note_in_selection > midi_stream_view()->highest_note()) {
-               midi_stream_view()->set_note_range(MidiStreamView::ContentsRange);
+                       /* make all newly added notes selected */
+
+                       note_diff_add_note (copied_note, true);
+                       end_point = copied_note->end_time();
+               }
+
+               paste_pos_beats += duration;
        }
-}
 
-nframes64_t
-MidiRegionView::snap_pixel_to_frame(double x)
-{
-       PublicEditor& editor = trackview.editor();
-       // x is region relative, convert it to global absolute frames
-       nframes64_t frame = editor.pixel_to_frame(x) + _region->position();
-       editor.snap_to(frame);
-       return frame - _region->position(); // convert back to region relative
-}
+       /* if we pasted past the current end of the region, extend the region */
 
-nframes64_t
-MidiRegionView::snap_frame_to_frame(nframes64_t x)
-{
-       PublicEditor& editor = trackview.editor();
-       // x is region relative, convert it to global absolute frames
-       nframes64_t frame = x + _region->position();
-       editor.snap_to(frame);
-       return frame - _region->position(); // convert back to region relative
-}
+       framepos_t end_frame = source_beats_to_absolute_frames (end_point);
+       framepos_t region_end = _region->position() + _region->length() - 1;
 
-double
-MidiRegionView::snap_to_pixel(double x)
-{
-       return (double) trackview.editor().frame_to_pixel(snap_pixel_to_frame(x));
-}
+       if (end_frame > region_end) {
+
+               DEBUG_TRACE (DEBUG::CutNPaste, string_compose ("Paste extended region from %1 to %2\n", region_end, end_frame));
+
+               _region->clear_changes ();
+               _region->set_length (end_frame);
+               trackview.session()->add_command (new StatefulDiffCommand (_region));
+       }
 
-double
-MidiRegionView::get_position_pixels()
-{
-       nframes64_t region_frame = get_position();
-       return trackview.editor().frame_to_pixel(region_frame);
-}
+       apply_diff (true);
 
-nframes64_t
-MidiRegionView::beats_to_frames(double beats) const
-{
-       return _time_converter.to(beats);
+       trackview.session()->commit_reversible_command ();
 }
 
-double
-MidiRegionView::frames_to_beats(nframes64_t frames) const
+struct EventNoteTimeEarlyFirstComparator {
+       bool operator() (CanvasNoteEvent* a, CanvasNoteEvent* b) {
+               return a->note()->time() < b->note()->time();
+       }
+};
+
+void
+MidiRegionView::time_sort_events ()
 {
-       return _time_converter.from(frames);
+       if (!_sort_needed) {
+               return;
+       }
+
+       EventNoteTimeEarlyFirstComparator cmp;
+       _events.sort (cmp);
+
+       _sort_needed = false;
 }
 
 void
-MidiRegionView::begin_resizing(CanvasNote::NoteEnd note_end)
+MidiRegionView::goto_next_note (bool add_to_selection)
 {
-       _resize_data.clear();
+       bool use_next = false;
 
-       for (Selection::iterator i = _selection.begin(); i != _selection.end(); ++i) {
-               CanvasNote *note = dynamic_cast<CanvasNote *> (*i);
+       if (_events.back()->selected()) {
+               return;
+       }
 
-               // only insert CanvasNotes into the map
-               if (note) {
-                       NoteResizeData *resize_data = new NoteResizeData();
-                       resize_data->canvas_note = note;
+       time_sort_events ();
 
-                       // create a new SimpleRect from the note which will be the resize preview
-                       SimpleRect *resize_rect = new SimpleRect(
-                                       *group, note->x1(), note->y1(), note->x2(), note->y2());
+       MidiTimeAxisView* const mtv = dynamic_cast<MidiTimeAxisView*>(&trackview);
+       uint16_t const channel_mask = mtv->channel_selector().get_selected_channels ();
 
-                       // calculate the colors: get the color settings
-                       uint32_t fill_color = UINT_RGBA_CHANGE_A(
-                                       ARDOUR_UI::config()->canvasvar_MidiNoteSelected.get(),
-                                       128);
+       for (Events::iterator i = _events.begin(); i != _events.end(); ++i) {
+               if ((*i)->selected()) {
+                       use_next = true;
+                       continue;
+               } else if (use_next) {
+                       if (channel_mask & (1 << (*i)->note()->channel())) {
+                               if (!add_to_selection) {
+                                       unique_select (*i);
+                               } else {
+                                       note_selected (*i, true, false);
+                               }
+                               return;
+                       }
+               }
+       }
 
-                       // make the resize preview notes more transparent and bright
-                       fill_color = UINT_INTERPOLATE(fill_color, 0xFFFFFF40, 0.5);
+       /* use the first one */
 
-                       // calculate color based on note velocity
-                       resize_rect->property_fill_color_rgba() = UINT_INTERPOLATE(
-                                       CanvasNoteEvent::meter_style_fill_color(note->note()->velocity()),
-                                       fill_color,
-                                       0.85);
+       if (!_events.empty() && (channel_mask & (1 << _events.front()->note()->channel ()))) {
+               unique_select (_events.front());
+       }
+}
 
-                       resize_rect->property_outline_color_rgba() = CanvasNoteEvent::calculate_outline(
-                                       ARDOUR_UI::config()->canvasvar_MidiNoteSelected.get());
+void
+MidiRegionView::goto_previous_note (bool add_to_selection)
+{
+       bool use_next = false;
 
-                       resize_data->resize_rect = resize_rect;
+       if (_events.front()->selected()) {
+               return;
+       }
 
-                       if (note_end == CanvasNote::NOTE_ON) {
-                               resize_data->current_x = note->x1();
-                       } else { // NOTE_OFF
-                               resize_data->current_x = note->x2();
-                       }
+       time_sort_events ();
 
-                       _resize_data.push_back(resize_data);
+       MidiTimeAxisView* const mtv = dynamic_cast<MidiTimeAxisView*>(&trackview);
+       uint16_t const channel_mask = mtv->channel_selector().get_selected_channels ();
+
+       for (Events::reverse_iterator i = _events.rbegin(); i != _events.rend(); ++i) {
+               if ((*i)->selected()) {
+                       use_next = true;
+                       continue;
+               } else if (use_next) {
+                       if (channel_mask & (1 << (*i)->note()->channel())) {
+                               if (!add_to_selection) {
+                                       unique_select (*i);
+                               } else {
+                                       note_selected (*i, true, false);
+                               }
+                               return;
+                       }
                }
        }
+
+       /* use the last one */
+
+       if (!_events.empty() && (channel_mask & (1 << (*_events.rbegin())->note()->channel ()))) {
+               unique_select (*(_events.rbegin()));
+       }
 }
 
 void
-MidiRegionView::update_resizing(CanvasNote::NoteEnd note_end, double x, bool relative)
+MidiRegionView::selection_as_notelist (Notes& selected, bool allow_all_if_none_selected)
 {
-       for (std::vector<NoteResizeData *>::iterator i = _resize_data.begin(); i != _resize_data.end(); ++i) {
-               SimpleRect* resize_rect = (*i)->resize_rect;
-               CanvasNote* canvas_note = (*i)->canvas_note;
+       bool had_selected = false;
 
-               const double region_start = get_position_pixels();
+       time_sort_events ();
 
-               if (relative) {
-                       (*i)->current_x = (*i)->current_x + x;
-               } else {
-                       // x is in track relative, transform it to region relative
-                       (*i)->current_x = x - region_start;
+       for (Events::iterator i = _events.begin(); i != _events.end(); ++i) {
+               if ((*i)->selected()) {
+                       selected.insert ((*i)->note());
+                       had_selected = true;
                }
+       }
 
-               double current_x = (*i)->current_x;
-
-               if (note_end == CanvasNote::NOTE_ON) {
-                       resize_rect->property_x1() = snap_to_pixel(current_x);
-                       resize_rect->property_x2() = canvas_note->x2();
-               } else {
-                       resize_rect->property_x2() = snap_to_pixel(current_x);
-                       resize_rect->property_x1() = canvas_note->x1();
+       if (allow_all_if_none_selected && !had_selected) {
+               for (Events::iterator i = _events.begin(); i != _events.end(); ++i) {
+                       selected.insert ((*i)->note());
                }
        }
 }
 
 void
-MidiRegionView::commit_resizing(CanvasNote::NoteEnd note_end, double event_x, bool relative)
+MidiRegionView::update_ghost_note (double x, double y)
 {
-       start_delta_command(_("resize notes"));
+       MidiTimeAxisView* const mtv = dynamic_cast<MidiTimeAxisView*>(&trackview);
 
-       for (std::vector<NoteResizeData *>::iterator i = _resize_data.begin(); i != _resize_data.end(); ++i) {
-               CanvasNote*  canvas_note = (*i)->canvas_note;
-               SimpleRect*  resize_rect = (*i)->resize_rect;
-               double       current_x   = (*i)->current_x;
-               const double position    = get_position_pixels();
+       _last_ghost_x = x;
+       _last_ghost_y = y;
 
-               if (!relative) {
-                       // event_x is in track relative, transform it to region relative
-                       current_x = event_x - position;
-               }
+       _note_group->w2i (x, y);
 
-               // because snapping works on world coordinates we have to transform current_x
-               // to world coordinates before snapping and transform it back afterwards
-               nframes64_t current_frame = snap_pixel_to_frame(current_x);
-               // transform to region start relative
-               current_frame += _region->start();
-               
-               const boost::shared_ptr<NoteType> copy(new NoteType(*(canvas_note->note().get())));
+       PublicEditor& editor = trackview.editor ();
+       
+       framepos_t const unsnapped_frame = editor.pixel_to_frame (x);
+       framecnt_t grid_frames;
+       framepos_t const f = snap_frame_to_grid_underneath (unsnapped_frame, grid_frames);
+       
+       /* use region_frames... because we are converting a delta within the region
+       */
+        
+       double length = region_frames_to_region_beats (snap_frame_to_frame (f + grid_frames) - f);
 
-               // resize beginning of note
-               if (note_end == CanvasNote::NOTE_ON && current_frame < copy->end_time()) {
-                       command_remove_note(canvas_note);
-                       copy->on_event().time() = current_frame;
-                       command_add_note(copy, _selection.find(canvas_note) != _selection.end());
-               }
-               // resize end of note
-               if (note_end == CanvasNote::NOTE_OFF && current_frame > copy->time()) {
-                       command_remove_note(canvas_note);
-                       copy->off_event().time() = current_frame;
-                       command_add_note(copy, _selection.find(canvas_note) != _selection.end());
-               }
+       /* note that this sets the time of the ghost note in beats relative to
+          the start of the source; that is how all note times are stored.
+       */
+       _ghost_note->note()->set_time (absolute_frames_to_source_beats (f + _region->position ()));
+       _ghost_note->note()->set_length (length);
+       _ghost_note->note()->set_note (midi_stream_view()->y_to_note (y));
+       _ghost_note->note()->set_channel (mtv->get_channel_for_add ());
 
-               delete resize_rect;
-               delete (*i);
-       }
+       /* the ghost note does not appear in ghost regions, so pass false in here */
+       update_note (_ghost_note, false);
 
-       _resize_data.clear();
-       apply_command();
+       show_verbose_cursor (_ghost_note->note ());
 }
 
 void
-MidiRegionView::change_note_velocity(CanvasNoteEvent* event, int8_t velocity, bool relative)
+MidiRegionView::create_ghost_note (double x, double y)
 {
-       const boost::shared_ptr<NoteType> copy(new NoteType(*(event->note().get())));
+       delete _ghost_note;
+       _ghost_note = 0;
 
-       if (relative) {
-               uint8_t new_velocity = copy->velocity() + velocity;
-               clamp_to_0_127(new_velocity);
-               copy->set_velocity(new_velocity);
-       } else {
-               copy->set_velocity(velocity);                   
-       }
+       boost::shared_ptr<NoteType> g (new NoteType);
+       _ghost_note = new NoEventCanvasNote (*this, *_note_group, g);
+       _ghost_note->property_outline_color_rgba() = 0x000000aa;
+       update_ghost_note (x, y);
+       _ghost_note->show ();
+
+       _last_ghost_x = x;
+       _last_ghost_y = y;
 
-       command_remove_note(event);
-       command_add_note(copy, event->selected(), true);
+       show_verbose_cursor (_ghost_note->note ());
 }
 
 void
-MidiRegionView::change_velocity(CanvasNoteEvent* ev, int8_t velocity, bool relative)
+MidiRegionView::snap_changed ()
 {
-       start_delta_command(_("change velocity"));
-       
-       change_note_velocity(ev, velocity, relative);
-
-       for (Selection::iterator i = _selection.begin(); i != _selection.end();) {
-               Selection::iterator next = i;
-               ++next;
-               if ( !(*((*i)->note()) == *(ev->note())) ) {
-                       change_note_velocity(*i, velocity, relative);
-               }
-               i = next;
+       if (!_ghost_note) {
+               return;
        }
-       
-       apply_command();
+
+       create_ghost_note (_last_ghost_x, _last_ghost_y);
 }
 
 void
-MidiRegionView::change_channel(uint8_t channel)
+MidiRegionView::drop_down_keys ()
 {
-       start_delta_command(_("change channel"));
-       for (Selection::iterator i = _selection.begin(); i != _selection.end();) {
-               Selection::iterator next = i;
-               ++next;
+       _mouse_state = None;
+}
 
-               CanvasNoteEvent* event = *i;
-               const boost::shared_ptr<NoteType> copy(new NoteType(*(event->note().get())));
+void
+MidiRegionView::maybe_select_by_position (GdkEventButton* ev, double /*x*/, double y)
+{
+       double note = midi_stream_view()->y_to_note(y);
+       Events e;
+       MidiTimeAxisView* const mtv = dynamic_cast<MidiTimeAxisView*>(&trackview);
 
-               copy->set_channel(channel);
-               
-               command_remove_note(event);
-               command_add_note(copy, event->selected());
-               
-               i = next;
+       uint16_t chn_mask = mtv->channel_selector().get_selected_channels();
+
+       if (Keyboard::modifier_state_equals (ev->state, Keyboard::TertiaryModifier)) {
+               get_events (e, Evoral::Sequence<Evoral::MusicalTime>::PitchGreaterThanOrEqual, (uint8_t) floor (note), chn_mask);
+       } else if (Keyboard::modifier_state_equals (ev->state, Keyboard::PrimaryModifier)) {
+               get_events (e, Evoral::Sequence<Evoral::MusicalTime>::PitchLessThanOrEqual, (uint8_t) floor (note), chn_mask);
+       } else {
+               return;
+       }
+
+       bool add_mrv_selection = false;
+
+       if (_selection.empty()) {
+               add_mrv_selection = true;
+       }
+
+       for (Events::iterator i = e.begin(); i != e.end(); ++i) {
+               if (_selection.insert (*i).second) {
+                       (*i)->set_selected (true);
+               }
        }
-       
-       apply_command();
-}
 
+       if (add_mrv_selection) {
+               PublicEditor& editor (trackview.editor());
+               editor.get_selection().add (this);
+       }
+}
 
 void
-MidiRegionView::note_entered(ArdourCanvas::CanvasNoteEvent* ev)
+MidiRegionView::color_handler ()
 {
-       if (_mouse_state == SelectTouchDragging) {
-               note_selected(ev, true);
+       RegionView::color_handler ();
+
+       for (Events::iterator i = _events.begin(); i != _events.end(); ++i) {
+               (*i)->set_selected ((*i)->selected()); // will change color
        }
-}
 
+       /* XXX probably more to do here */
+}
 
 void
-MidiRegionView::switch_source(boost::shared_ptr<Source> src)
+MidiRegionView::enable_display (bool yn)
 {
-       boost::shared_ptr<MidiSource> msrc = boost::dynamic_pointer_cast<MidiSource>(src);
-       if (msrc)
-               display_model(msrc->model());
+       RegionView::enable_display (yn);
+       if (yn) {
+               redisplay_model ();
+       }
 }
 
 void
-MidiRegionView::set_frame_color()
+MidiRegionView::show_step_edit_cursor (Evoral::MusicalTime pos)
 {
-       if (frame) {
-               if (_selected && should_show_selection) {
-                       frame->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_SelectedFrameBase.get();
-               } else {
-                       frame->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_MidiFrameBase.get();
-               }
+       if (_step_edit_cursor == 0) {
+               ArdourCanvas::Group* const group = (ArdourCanvas::Group*)get_canvas_group();
+
+               _step_edit_cursor = new ArdourCanvas::SimpleRect (*group);
+               _step_edit_cursor->property_y1() = 0;
+               _step_edit_cursor->property_y2() = midi_stream_view()->contents_height();
+               _step_edit_cursor->property_fill_color_rgba() = RGBA_TO_UINT (45,0,0,90);
+               _step_edit_cursor->property_outline_color_rgba() = RGBA_TO_UINT (85,0,0,90);
        }
+
+       move_step_edit_cursor (pos);
+       _step_edit_cursor->show ();
 }
 
-void 
-MidiRegionView::midi_channel_mode_changed(ChannelMode mode, uint16_t mask)
+void
+MidiRegionView::move_step_edit_cursor (Evoral::MusicalTime pos)
 {
-       switch (mode) {
-       case AllChannels:
-       case FilterChannels:
-               _force_channel = -1;
-               break;
-       case ForceChannel:
-               _force_channel = mask;
-               mask = 0xFFFF; // Show all notes as active (below)
-       };
+       _step_edit_cursor_position = pos;
 
-       // Update notes for selection
-       for (Events::iterator i = _events.begin(); i != _events.end(); ++i) {
-               (*i)->on_channel_selection_change(mask);
+       if (_step_edit_cursor) {
+               double pixel = trackview.editor().frame_to_pixel (region_beats_to_region_frames (pos));
+               _step_edit_cursor->property_x1() = pixel;
+               set_step_edit_cursor_width (_step_edit_cursor_width);
        }
+}
 
-       _last_channel_selection = mask;
+void
+MidiRegionView::hide_step_edit_cursor ()
+{
+       if (_step_edit_cursor) {
+               _step_edit_cursor->hide ();
+       }
 }
 
-void 
-MidiRegionView::midi_patch_settings_changed(std::string model, std::string custom_device_mode)
+void
+MidiRegionView::set_step_edit_cursor_width (Evoral::MusicalTime beats)
 {
-       _model_name         = model;
-       _custom_device_mode = custom_device_mode;
-       redisplay_model();
+       _step_edit_cursor_width = beats;
+
+       if (_step_edit_cursor) {
+               _step_edit_cursor->property_x2() = _step_edit_cursor->property_x1() + trackview.editor().frame_to_pixel (region_beats_to_region_frames (beats));
+       }
 }
 
+/** Called when a diskstream on our track has received some data.  Update the view, if applicable.
+ *  @param w Source that the data will end up in.
+ */
 void
-MidiRegionView::cut_copy_clear (Editing::CutCopyOp op)
+MidiRegionView::data_recorded (boost::weak_ptr<MidiSource> w)
 {
-       if (_selection.empty()) {
+       if (!_active_notes) {
+               /* we aren't actively being recorded to */
                return;
        }
 
-       PublicEditor& editor (trackview.editor());
-
-       switch (op) {
-       case Cut:
-       case Copy:
-               editor.get_cut_buffer().add (selection_as_cut_buffer());
-               break;
-       default:
-               break;
+       boost::shared_ptr<MidiSource> src = w.lock ();
+       if (!src || src != midi_region()->midi_source()) {
+               /* recorded data was not destined for our source */
+               return;
        }
-               
-       start_delta_command();
 
-       for (Selection::iterator i = _selection.begin(); i != _selection.end(); ++i) {
-               switch (op) {
-               case Copy:
-                       break;
-               case Cut:
-                       command_remove_note (*i);
-                       break;
-               case Clear:
-                       break;
+       MidiTimeAxisView* mtv = dynamic_cast<MidiTimeAxisView*> (&trackview);
+
+       boost::shared_ptr<MidiBuffer> buf = mtv->midi_track()->get_gui_feed_buffer ();
+
+       BeatsFramesConverter converter (trackview.session()->tempo_map(), mtv->midi_track()->get_capture_start_frame (0));
+
+       framepos_t back = max_framepos;
+
+       for (MidiBuffer::iterator i = buf->begin(); i != buf->end(); ++i) {
+               Evoral::MIDIEvent<MidiBuffer::TimeType> const ev (*i, false);
+               assert (ev.buffer ());
+
+               Evoral::MusicalTime const time_beats = converter.from (ev.time () - converter.origin_b ());
+
+               if (ev.type() == MIDI_CMD_NOTE_ON) {
+
+                       boost::shared_ptr<NoteType> note (
+                               new NoteType (ev.channel(), time_beats, 0, ev.note(), ev.velocity())
+                                                         );
+
+                       add_note (note, true);
+
+                       /* fix up our note range */
+                       if (ev.note() < _current_range_min) {
+                               midi_stream_view()->apply_note_range (ev.note(), _current_range_max, true);
+                       } else if (ev.note() > _current_range_max) {
+                               midi_stream_view()->apply_note_range (_current_range_min, ev.note(), true);
+                       }
+
+               } else if (ev.type() == MIDI_CMD_NOTE_OFF) {
+                       resolve_note (ev.note (), time_beats);
                }
+
+               back = ev.time ();
        }
 
-       apply_command();
+       midi_stream_view()->check_record_layers (region(), back);
 }
 
-MidiCutBuffer*
-MidiRegionView::selection_as_cut_buffer () const
+void
+MidiRegionView::trim_front_starting ()
 {
-       Evoral::Sequence<MidiModel::TimeType>::Notes notes;
-
-       for (Selection::iterator i = _selection.begin(); i != _selection.end(); ++i) {
-               notes.push_back (boost::shared_ptr<NoteType> (new NoteType (*((*i)->note().get()))));
-       }
-
-       /* sort them into time order */
+       /* Reparent the note group to the region view's parent, so that it doesn't change
+          when the region view is trimmed.
+       */
+       _temporary_note_group = new ArdourCanvas::Group (*group->property_parent ());
+       _temporary_note_group->move (group->property_x(), group->property_y());
+       _note_group->reparent (*_temporary_note_group);
+}
 
-       sort (notes.begin(), notes.end(), Evoral::Sequence<MidiModel::TimeType>::note_time_comparator);
+void
+MidiRegionView::trim_front_ending ()
+{
+       _note_group->reparent (*group);
+       delete _temporary_note_group;
+       _temporary_note_group = 0;
 
-       MidiCutBuffer* cb = new MidiCutBuffer (trackview.session());
-       cb->set (notes);
-       
-       return cb;
+       if (_region->start() < 0) {
+               /* Trim drag made start time -ve; fix this */
+               midi_region()->fix_negative_start ();
+       }
 }
 
 void
-MidiRegionView::paste (nframes64_t pos, float times, const MidiCutBuffer& mcb)
+MidiRegionView::edit_patch_change (ArdourCanvas::CanvasPatchChange* pc)
 {
-       if (mcb.empty()) {
+       PatchChangeDialog d (&_source_relative_time_converter, trackview.session(), *pc->patch (), Gtk::Stock::APPLY);
+       if (d.run () != Gtk::RESPONSE_ACCEPT) {
                return;
        }
 
-       start_delta_command (_("paste"));
+       change_patch_change (pc->patch(), d.patch ());
+}
 
-       MidiModel::TimeType beat_delta;
-       MidiModel::TimeType paste_pos_beats;
-       MidiModel::TimeType duration;
 
-       duration = mcb.notes().back()->end_time() - mcb.notes().front()->time();
-       paste_pos_beats = frames_to_beats (pos);
-       beat_delta = mcb.notes().front()->time() - paste_pos_beats;
-       paste_pos_beats = 0;
+void
+MidiRegionView::show_verbose_cursor (boost::shared_ptr<NoteType> n) const
+{
+       char buf[24];
+       snprintf (buf, sizeof (buf), "%s (%d) Chn %d\nVel %d",
+                 Evoral::midi_note_name (n->note()).c_str(),
+                 (int) n->note (),
+                 (int) n->channel() + 1,
+                 (int) n->velocity());
 
-       _selection.clear ();
+       show_verbose_cursor (buf, 10, 20);
+}
 
-       for (int n = 0; n < (int) times; ++n) {
+void
+MidiRegionView::show_verbose_cursor (string const & text, double xoffset, double yoffset) const
+{
+       double wx, wy;
 
-               for (Evoral::Sequence<MidiModel::TimeType>::Notes::const_iterator i = mcb.notes().begin(); i != mcb.notes().end(); ++i) {
-                       
-                       boost::shared_ptr<NoteType> copied_note (new NoteType (*((*i).get())));
-                       copied_note->set_time (paste_pos_beats + copied_note->time() - beat_delta);
+       trackview.editor().get_pointer_position (wx, wy);
 
-                       /* make all newly added notes selected */
+       wx += xoffset;
+       wy += yoffset;
 
-                       command_add_note (copied_note, true);
-               }
+       /* Flip the cursor above the mouse pointer if it would overlap the bottom of the canvas */
 
-               paste_pos_beats += duration;
+       double x1, y1, x2, y2;
+       trackview.editor().verbose_cursor()->canvas_item()->get_bounds (x1, y1, x2, y2);
+
+       if ((wy + y2 - y1) > trackview.editor().canvas_height()) {
+               wy -= (y2 - y1) + 2 * yoffset;
+       }
+
+       trackview.editor().verbose_cursor()->set (text, wx, wy);
+       trackview.editor().verbose_cursor()->show ();
+}
+
+/** @param p A session framepos.
+ *  @param grid_frames Filled in with the number of frames that a grid interval is at p.
+ *  @return p snapped to the grid subdivision underneath it.
+ */
+framepos_t
+MidiRegionView::snap_frame_to_grid_underneath (framepos_t p, framecnt_t& grid_frames) const
+{
+       PublicEditor& editor = trackview.editor ();
+       
+       bool success;
+       Evoral::MusicalTime grid_beats = editor.get_grid_type_as_beats (success, p);
+
+       if (!success) {
+               grid_beats = 1;
        }
        
-       apply_command ();
+       grid_frames = region_beats_to_region_frames (grid_beats);
+
+       /* Hack so that we always snap to the note that we are over, instead of snapping
+          to the next one if we're more than halfway through the one we're over.
+       */
+       if (editor.snap_mode() == SnapNormal && p >= grid_frames / 2) {
+               p -= grid_frames / 2;
+       }
+
+       return snap_frame_to_frame (p);
+}
+
+/** Called when the selection has been cleared in any MidiRegionView.
+ *  @param rv MidiRegionView that the selection was cleared in.
+ */
+void
+MidiRegionView::selection_cleared (MidiRegionView* rv)
+{
+       if (rv == this) {
+               return;
+       }
+
+       /* Clear our selection in sympathy; but don't signal the fact */
+       clear_selection (false);
 }