partially-done (but compile-friendly) move of instrument info into a new backend...
[ardour.git] / gtk2_ardour / midi_region_view.cc
index dd9f686561d23a2e53a8deba6e446be473eae406..ca9cd4af717241a136df9a9167f618ad48b4cb71 100644 (file)
 
 #include <gtkmm.h>
 
-#include <gtkmm2ext/gtk_ui.h>
+#include "gtkmm2ext/gtk_ui.h"
 
 #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_model.h"
@@ -41,6 +39,7 @@
 
 #include "evoral/Parameter.hpp"
 #include "evoral/MIDIParameters.hpp"
+#include "evoral/MIDIEvent.hpp"
 #include "evoral/Control.hpp"
 #include "evoral/midi_util.h"
 
@@ -51,6 +50,7 @@
 #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"
@@ -61,6 +61,8 @@
 #include "midi_streamview.h"
 #include "midi_time_axis.h"
 #include "midi_util.h"
+#include "midi_velocity_dialog.h"
+#include "mouse_cursors.h"
 #include "note_player.h"
 #include "public_editor.h"
 #include "rgb_macros.h"
@@ -68,7 +70,6 @@
 #include "simpleline.h"
 #include "streamview.h"
 #include "utils.h"
-#include "mouse_cursors.h"
 #include "patch_change_dialog.h"
 #include "verbose_cursor.h"
 
@@ -80,22 +81,20 @@ 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)
        : RegionView (parent, tv, r, spu, basic_color)
-       , _force_channel(-1)
        , _last_channel_selection(0xFFFF)
        , _current_range_min(0)
        , _current_range_max(0)
-       , _model_name(string())
-       , _custom_device_mode(string())
        , _active_notes(0)
        , _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)
@@ -109,28 +108,30 @@ MidiRegionView::MidiRegionView (ArdourCanvas::Group *parent, RouteTimeAxisView &
        , _no_sound_notes (false)
        , _last_event_x (0)
        , _last_event_y (0)
-       , _pre_enter_cursor (0)
+       , pre_enter_cursor (0)
+       , pre_press_cursor (0)
+       , _note_player (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());
+       Config->ParameterChanged.connect (*this, invalidator (*this), boost::bind (&MidiRegionView::parameter_changed, this, _1), gui_context());
        connect_to_diskstream ();
+
+       SelectionCleared.connect (_selection_cleared_connection, invalidator (*this), boost::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)
        : RegionView (parent, tv, r, spu, basic_color, false, visibility)
-       , _force_channel(-1)
        , _last_channel_selection(0xFFFF)
-       , _model_name(string())
-       , _custom_device_mode(string())
+       , _current_range_min(0)
+       , _current_range_max(0)
        , _active_notes(0)
        , _note_group(new ArdourCanvas::Group(*parent))
        , _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)
@@ -144,11 +145,16 @@ MidiRegionView::MidiRegionView (ArdourCanvas::Group *parent, RouteTimeAxisView &
        , _no_sound_notes (false)
        , _last_event_x (0)
        , _last_event_y (0)
+       , pre_enter_cursor (0)
+       , pre_press_cursor (0)
+       , _note_player (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), boost::bind (&MidiRegionView::selection_cleared, this, _1), gui_context ());
 }
 
 void
@@ -164,15 +170,13 @@ MidiRegionView::parameter_changed (std::string const & p)
 MidiRegionView::MidiRegionView (const MidiRegionView& other)
        : sigc::trackable(other)
        , RegionView (other)
-       , _force_channel(-1)
        , _last_channel_selection(0xFFFF)
-       , _model_name(string())
-       , _custom_device_mode(string())
+       , _current_range_min(0)
+       , _current_range_max(0)
        , _active_notes(0)
        , _note_group(new ArdourCanvas::Group(*get_canvas_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)
@@ -186,6 +190,9 @@ MidiRegionView::MidiRegionView (const MidiRegionView& other)
        , _no_sound_notes (false)
        , _last_event_x (0)
        , _last_event_y (0)
+       , pre_enter_cursor (0)
+       , pre_press_cursor (0)
+       , _note_player (0)
 {
        Gdk::Color c;
        int r,g,b,a;
@@ -198,15 +205,13 @@ MidiRegionView::MidiRegionView (const MidiRegionView& other)
 
 MidiRegionView::MidiRegionView (const MidiRegionView& other, boost::shared_ptr<MidiRegion> region)
        : RegionView (other, boost::shared_ptr<Region> (region))
-       , _force_channel(-1)
        , _last_channel_selection(0xFFFF)
-       , _model_name(string())
-       , _custom_device_mode(string())
+       , _current_range_min(0)
+       , _current_range_max(0)
        , _active_notes(0)
        , _note_group(new ArdourCanvas::Group(*get_canvas_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)
@@ -220,6 +225,9 @@ MidiRegionView::MidiRegionView (const MidiRegionView& other, boost::shared_ptr<M
        , _no_sound_notes (false)
        , _last_event_x (0)
        , _last_event_y (0)
+       , pre_enter_cursor (0)
+       , pre_press_cursor (0)
+       , _note_player (0)
 {
        Gdk::Color c;
        int r,g,b,a;
@@ -236,7 +244,7 @@ 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),
+                                                        boost::bind (&MidiRegionView::maybe_remove_deleted_note_from_selection, this, _1),
                                                         gui_context());
 
        if (wfd) {
@@ -275,15 +283,26 @@ MidiRegionView::init (Gdk::Color const & basic_color, bool wfd)
        midi_view()->signal_channel_mode_changed().connect(
                sigc::mem_fun(this, &MidiRegionView::midi_channel_mode_changed));
 
-       midi_view()->signal_midi_patch_settings_changed().connect(
-               sigc::mem_fun(this, &MidiRegionView::midi_patch_settings_changed));
+       RouteUI* route_ui = dynamic_cast<RouteUI*> (&trackview);
+       if (route_ui) {
+               route_ui->route()->instrument_info().Changed.connect (_instrument_changed_connection, invalidator (*this),
+                                                                     boost::bind (&MidiRegionView::instrument_settings_changed, this), gui_context());
+       }
 
        trackview.editor().SnapChanged.connect(snap_changed_connection, invalidator(*this),
-                                              ui_bind(&MidiRegionView::snap_changed, this),
+                                              boost::bind (&MidiRegionView::snap_changed, this),
                                               gui_context());
 
-       Config->ParameterChanged.connect (*this, invalidator (*this), ui_bind (&MidiRegionView::parameter_changed, this, _1), gui_context());
+       Config->ParameterChanged.connect (*this, invalidator (*this), boost::bind (&MidiRegionView::parameter_changed, this, _1), gui_context());
        connect_to_diskstream ();
+
+       SelectionCleared.connect (_selection_cleared_connection, invalidator (*this), boost::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
@@ -291,13 +310,15 @@ MidiRegionView::connect_to_diskstream ()
 {
        midi_view()->midi_track()->DataRecorded.connect(
                *this, invalidator(*this),
-               ui_bind(&MidiRegionView::data_recorded, this, _1, _2),
+               boost::bind (&MidiRegionView::data_recorded, this, _1),
                gui_context());
 }
 
 bool
 MidiRegionView::canvas_event(GdkEvent* ev)
 {
+       bool r;
+       
        switch (ev->type) {
        case GDK_ENTER_NOTIFY:
        case GDK_LEAVE_NOTIFY:
@@ -312,7 +333,14 @@ MidiRegionView::canvas_event(GdkEvent* ev)
                break;
        }
 
-       if (!trackview.editor().internal_editing()) {
+       if (ev->type == GDK_2BUTTON_PRESS) {
+               return trackview.editor().toggle_internal_editing_from_double_click (ev);
+       }
+
+       if ((!trackview.editor().internal_editing() && trackview.editor().current_mouse_mode() != MouseGain) ||
+               (trackview.editor().current_mouse_mode() == MouseTimeFX) ||
+               (trackview.editor().current_mouse_mode() == MouseZoom)) {
+               // handle non-draw modes elsewhere
                return false;
        }
 
@@ -329,11 +357,11 @@ MidiRegionView::canvas_event(GdkEvent* ev)
        case GDK_BUTTON_PRESS:
                return button_press (&ev->button);
 
-       case GDK_2BUTTON_PRESS:
-               return true;
-
        case GDK_BUTTON_RELEASE:
-               return button_release (&ev->button);
+               r = button_release (&ev->button);
+               delete _note_player;
+               _note_player = 0;
+               return r;
 
        case GDK_ENTER_NOTIFY:
                return enter_notify (&ev->crossing);
@@ -362,10 +390,10 @@ bool
 MidiRegionView::enter_notify (GdkEventCrossing* ev)
 {
        trackview.editor().MouseModeChanged.connect (
-               _mouse_mode_connection, invalidator (*this), ui_bind (&MidiRegionView::mouse_mode_changed, this), gui_context ()
+               _mouse_mode_connection, invalidator (*this), boost::bind (&MidiRegionView::mouse_mode_changed, this), gui_context ()
                );
 
-       if (trackview.editor().current_mouse_mode() == MouseRange) {
+       if (trackview.editor().current_mouse_mode() == MouseDraw && _mouse_state != AddDragging) {
                create_ghost_note (ev->x, ev->y);
        }
 
@@ -376,24 +404,36 @@ MidiRegionView::enter_notify (GdkEventCrossing* ev)
                group->grab_focus();
        }
 
+       // if current operation is non-operational in a midi region, change the cursor to so indicate
+       if (trackview.editor().current_mouse_mode() == MouseGain) {
+               Editor* editor = dynamic_cast<Editor *> (&trackview.editor());
+               pre_enter_cursor = editor->get_canvas_cursor();
+               editor->set_canvas_cursor(editor->cursors()->timebar);
+       }
+
        return false;
 }
 
 bool
-MidiRegionView::leave_notify (GdkEventCrossing* ev)
+MidiRegionView::leave_notify (GdkEventCrossing*)
 {
        _mouse_mode_connection.disconnect ();
 
        trackview.editor().verbose_cursor()->hide ();
        remove_ghost_note ();
 
+       if (pre_enter_cursor) {
+               Editor* editor = dynamic_cast<Editor *> (&trackview.editor());
+               editor->set_canvas_cursor(pre_enter_cursor);
+       }
+
        return false;
 }
 
 void
 MidiRegionView::mouse_mode_changed ()
 {
-       if (trackview.editor().current_mouse_mode() == MouseRange && trackview.editor().internal_editing()) {
+       if (trackview.editor().current_mouse_mode() == MouseDraw && trackview.editor().internal_editing()) {
                create_ghost_note (_last_event_x, _last_event_y);
        } else {
                remove_ghost_note ();
@@ -415,16 +455,19 @@ MidiRegionView::button_press (GdkEventButton* ev)
                return false;
        }
 
-       _last_x = ev->x;
-       _last_y = ev->y;
+       Editor* editor = dynamic_cast<Editor *> (&trackview.editor());
+       MouseMode m = editor->current_mouse_mode();
 
-       group->w2i (_last_x, _last_y);
+       if (m == MouseObject && Keyboard::modifier_state_contains (ev->state, Keyboard::insert_note_modifier())) {
+               pre_press_cursor = editor->get_canvas_cursor ();
+               editor->set_canvas_cursor (editor->cursors()->midi_pencil);
+       } 
 
        if (_mouse_state != SelectTouchDragging) {
-
+               
                _pressed_button = ev->button;
                _mouse_state = Pressed;
-
+               
                return true;
        }
 
@@ -448,10 +491,22 @@ MidiRegionView::button_release (GdkEventButton* ev)
        group->w2i(event_x, event_y);
        group->ungrab(ev->time);
 
+       PublicEditor& editor = trackview.editor ();
+
+       if (pre_press_cursor) {
+               dynamic_cast<Editor*>(&editor)->set_canvas_cursor (pre_press_cursor, false);
+               pre_press_cursor = 0;
+       }
+
        switch (_mouse_state) {
        case Pressed: // Clicked
 
-               switch (trackview.editor().current_mouse_mode()) {
+               switch (editor.current_mouse_mode()) {
+               case MouseRange:
+                       /* no motion occured - simple click */
+                       clear_selection ();
+                       break;
+
                case MouseObject:
                case MouseTimeFX:
                        {
@@ -466,27 +521,37 @@ MidiRegionView::button_release (GdkEventButton* ev)
                                        group->w2i(event_x, event_y);
 
                                        bool success;
-                                       Evoral::MusicalTime beats = trackview.editor().get_grid_type_as_beats (success, trackview.editor().pixel_to_frame (event_x));
+                                       Evoral::MusicalTime beats = editor.get_grid_type_as_beats (success, editor.pixel_to_frame (event_x));
 
                                        if (!success) {
                                                beats = 1;
                                        }
 
-                                       create_note_at (event_x, event_y, beats, true);
+                                       /* Shorten the length by 1 tick so that we can add a new note at the next
+                                          grid snap without it overlapping this one.
+                                       */
+                                       beats -= 1.0 / Timecode::BBT_Time::ticks_per_beat;
+
+                                       create_note_at (editor.pixel_to_frame (event_x), event_y, beats, true);
                                }
 
                                break;
                        }
-               case MouseRange:
+               case MouseDraw:
                        {
                                bool success;
-                               Evoral::MusicalTime beats = trackview.editor().get_grid_type_as_beats (success, trackview.editor().pixel_to_frame (event_x));
+                               Evoral::MusicalTime beats = editor.get_grid_type_as_beats (success, editor.pixel_to_frame (event_x));
 
                                if (!success) {
                                        beats = 1;
                                }
 
-                               create_note_at (event_x, event_y, beats, true);
+                               /* Shorten the length by 1 tick so that we can add a new note at the next
+                                  grid snap without it overlapping this one.
+                               */
+                               beats -= 1.0 / Timecode::BBT_Time::ticks_per_beat;
+                               
+                               create_note_at (editor.pixel_to_frame (event_x), event_y, beats, true);
 
                                break;
                        }
@@ -497,32 +562,13 @@ MidiRegionView::button_release (GdkEventButton* ev)
                _mouse_state = None;
                break;
 
-       case SelectRectDragging: // Select drag done
-
+       case SelectRectDragging:
+       case AddDragging:
+               editor.drags()->end_grab ((GdkEvent *) ev);
                _mouse_state = None;
-               delete _drag_rect;
-               _drag_rect = 0;
+               create_ghost_note (ev->x, ev->y);
                break;
 
-       case AddDragging: // Add drag done
-
-               _mouse_state = None;
-
-               if (Keyboard::is_insert_note_event(ev) || trackview.editor().current_mouse_mode() == MouseRange) {
-
-                       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);
-                       }
-               }
-
-               delete _drag_rect;
-               _drag_rect = 0;
-
-               create_ghost_note (ev->x, ev->y);
 
        default:
                break;
@@ -534,32 +580,26 @@ MidiRegionView::button_release (GdkEventButton* ev)
 bool
 MidiRegionView::motion (GdkEventMotion* ev)
 {
-       double event_x, event_y;
-       framepos_t event_frame = 0;
-
-       event_x = ev->x;
-       event_y = ev->y;
-       group->w2i(event_x, event_y);
-
-       // convert event_x to global frame
-       event_frame = snap_pixel_to_frame (event_x);
+       PublicEditor& editor = trackview.editor ();
 
-       if (!_ghost_note && trackview.editor().current_mouse_mode() != MouseRange
-           && Keyboard::modifier_state_contains (ev->state, Keyboard::insert_note_modifier())
-           && _mouse_state != AddDragging) {
+       if (!_ghost_note && editor.current_mouse_mode() == MouseObject &&
+           Keyboard::modifier_state_contains (ev->state, Keyboard::insert_note_modifier()) &&
+           _mouse_state != AddDragging) {
 
                create_ghost_note (ev->x, ev->y);
-       } else if (_ghost_note && trackview.editor().current_mouse_mode() != MouseRange
-                  && Keyboard::modifier_state_contains (ev->state, Keyboard::insert_note_modifier())) {
+
+       } else if (_ghost_note && editor.current_mouse_mode() == MouseObject &&
+                  Keyboard::modifier_state_contains (ev->state, Keyboard::insert_note_modifier())) {
 
                update_ghost_note (ev->x, ev->y);
-       } else if (_ghost_note && trackview.editor().current_mouse_mode() != MouseRange) {
 
-               delete _ghost_note;
-               _ghost_note = 0;
+       } else if (_ghost_note && editor.current_mouse_mode() == MouseObject) {
+
+               remove_ghost_note ();
+               editor.verbose_cursor()->hide ();
+
+       } else if (_ghost_note && editor.current_mouse_mode() == MouseDraw) {
 
-               trackview.editor().verbose_cursor()->hide ();
-       } else if (_ghost_note && trackview.editor().current_mouse_mode() == MouseRange) {
                update_ghost_note (ev->x, ev->y);
        }
 
@@ -570,115 +610,39 @@ MidiRegionView::motion (GdkEventMotion* ev)
        }
 
        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 && trackview.editor().current_mouse_mode() == MouseObject
-                   && !Keyboard::modifier_state_contains (ev->state, Keyboard::insert_note_modifier())) {
-                       // Select 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() = 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;
-
-               } else if (trackview.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() = 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() = trackview.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;
-
-                       trackview.editor().verbose_cursor()->hide ();
-
-                       return true;
-               }
-
-               return false;
-
-       case SelectRectDragging: // Select drag motion
-       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 = trackview.editor().frame_to_pixel(event_frame);
-               }
-
-               if (_drag_rect) {
-
-                       if (event_x > _drag_start_x) {
-                               _drag_rect->property_x2() = event_x;
-                       }
-                       else {
-                               _drag_rect->property_x1() = event_x;
-                       }
-               }
+       case Pressed:
 
-               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 (_pressed_button == 1) {
+                       
+                       MouseMode m = editor.current_mouse_mode();
+                       
+                       if (m == MouseDraw || (m == MouseObject && Keyboard::modifier_state_contains (ev->state, Keyboard::insert_note_modifier()))) {
+                       
+                               editor.drags()->set (new NoteCreateDrag (dynamic_cast<Editor *> (&editor), group, this), (GdkEvent *) ev);
+                               _mouse_state = AddDragging;
+                               remove_ghost_note ();
+                               editor.verbose_cursor()->hide ();
+                               return true;
+                       } else if (m == MouseObject) {
+                               editor.drags()->set (new MidiRubberbandSelectDrag (dynamic_cast<Editor *> (&editor), this), (GdkEvent *) ev);
+                               clear_selection ();
+                               _mouse_state = SelectRectDragging;
+                               return true;
+                       } else if (m == MouseRange) {
+                               editor.drags()->set (new MidiVerticalSelectDrag (dynamic_cast<Editor *> (&editor), this), (GdkEvent *) ev);
+                               _mouse_state = SelectVerticalDragging;
+                               return true;
                        }
-
-                       update_drag_selection(_drag_start_x, event_x, _drag_start_y, event_y, Keyboard::modifier_state_contains (ev->state, Keyboard::TertiaryModifier));
                }
 
-               _last_x = event_x;
-               _last_y = event_y;
+               return false;
 
+       case SelectRectDragging:
+       case SelectVerticalDragging:
+       case AddDragging:
+               editor.drags()->motion_handler ((GdkEvent *) ev, false);
+               break;
+               
        case SelectTouchDragging:
                return false;
 
@@ -697,14 +661,22 @@ MidiRegionView::scroll (GdkEventScroll* ev)
                return false;
        }
 
+       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;
+       }
+
        trackview.editor().verbose_cursor()->hide ();
 
-       bool fine = !Keyboard::modifier_state_equals (ev->state, Keyboard::SecondaryModifier);
+       bool fine = !Keyboard::modifier_state_contains (ev->state, Keyboard::SecondaryModifier);
+       bool together = Keyboard::modifier_state_contains (ev->state, Keyboard::TertiaryModifier);
 
        if (ev->direction == GDK_SCROLL_UP) {
-               change_velocities (true, fine, false);
+               change_velocities (true, fine, false, together);
        } else if (ev->direction == GDK_SCROLL_DOWN) {
-               change_velocities (false, fine, false);
+               change_velocities (false, fine, false, together);
        }
        return true;
 }
@@ -769,9 +741,10 @@ MidiRegionView::key_press (GdkEventKey* ev)
 
                bool allow_smush = Keyboard::modifier_state_contains (ev->state, Keyboard::TertiaryModifier);
                bool fine = !Keyboard::modifier_state_contains (ev->state, Keyboard::SecondaryModifier);
+               bool together = Keyboard::modifier_state_contains (ev->state, Keyboard::Level4Modifier);
 
                if (Keyboard::modifier_state_contains (ev->state, Keyboard::PrimaryModifier)) {
-                       change_velocities (true, fine, allow_smush);
+                       change_velocities (true, fine, allow_smush, together);
                } else {
                        transpose (true, fine, allow_smush);
                }
@@ -781,9 +754,10 @@ MidiRegionView::key_press (GdkEventKey* ev)
 
                bool allow_smush = Keyboard::modifier_state_contains (ev->state, Keyboard::TertiaryModifier);
                bool fine = !Keyboard::modifier_state_contains (ev->state, Keyboard::SecondaryModifier);
+               bool together = Keyboard::modifier_state_contains (ev->state, Keyboard::Level4Modifier);
 
                if (Keyboard::modifier_state_contains (ev->state, Keyboard::PrimaryModifier)) {
-                       change_velocities (false, fine, allow_smush);
+                       change_velocities (false, fine, allow_smush, together);
                } else {
                        transpose (false, fine, allow_smush);
                }
@@ -802,6 +776,10 @@ MidiRegionView::key_press (GdkEventKey* ev)
        } else if (ev->keyval == GDK_c && unmodified) {
                channel_edit ();
                return true;
+
+       } else if (ev->keyval == GDK_v && unmodified) {
+               velocity_edit ();
+               return true;
        }
 
        return false;
@@ -820,20 +798,15 @@ MidiRegionView::key_release (GdkEventKey* ev)
 void
 MidiRegionView::channel_edit ()
 {
-       bool first = true;
-       uint8_t current_channel;
-
        if (_selection.empty()) {
                return;
        }
-       
-       for (Selection::iterator i = _selection.begin(); i != _selection.end(); ++i) {
-               if (first) {
-                       current_channel = (*i)->note()->channel ();
-                       first = false;
-               }
-       }
 
+       /* pick a note somewhat at random (since Selection is a set<>) to
+        * provide the "current" channel for the dialog.
+        */
+
+       uint8_t current_channel = (*_selection.begin())->note()->channel ();
        MidiChannelDialog channel_dialog (current_channel);
        int ret = channel_dialog.run ();
 
@@ -858,23 +831,59 @@ MidiRegionView::channel_edit ()
        apply_diff ();
 }
 
+void
+MidiRegionView::velocity_edit ()
+{
+       if (_selection.empty()) {
+               return;
+       }
+       
+       /* pick a note somewhat at random (since Selection is a set<>) to
+        * provide the "current" velocity for the dialog.
+        */
+
+       uint8_t current_velocity = (*_selection.begin())->note()->velocity ();
+       MidiVelocityDialog velocity_dialog (current_velocity);
+       int ret = velocity_dialog.run ();
+
+       switch (ret) {
+       case Gtk::RESPONSE_OK:
+               break;
+       default:
+               return;
+       }
+
+       uint8_t new_velocity = velocity_dialog.velocity ();
+
+       start_note_diff_command (_("velocity edit"));
+
+       for (Selection::iterator i = _selection.begin(); i != _selection.end(); ) {
+               Selection::iterator next = i;
+               ++next;
+               change_note_velocity (*i, new_velocity, false);
+               i = next;
+       }
+
+       apply_diff ();
+}
+
 void
 MidiRegionView::show_list_editor ()
 {
        if (!_list_editor) {
-               _list_editor = new MidiListEditor (trackview.session(), midi_region());
+               _list_editor = new MidiListEditor (trackview.session(), midi_region(), midi_view()->midi_track());
        }
        _list_editor->present ();
 }
 
 /** Add a note to the model, and the view, at a canvas (click) coordinate.
- * \param x horizontal position in pixels
+ * \param t time in frames relative to the position of the region
  * \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 length duration of the note in beats
+ * \param snap_t true to snap t to the grid, otherwise false.
  */
 void
-MidiRegionView::create_note_at(double x, double y, double length, bool sh)
+MidiRegionView::create_note_at (framepos_t t, double y, double length, bool snap_t)
 {
        MidiTimeAxisView* const mtv = dynamic_cast<MidiTimeAxisView*>(&trackview);
        MidiStreamView* const view = mtv->midi_view();
@@ -885,21 +894,17 @@ MidiRegionView::create_note_at(double x, double y, double length, bool sh)
        assert(note <= 127.0);
 
        // Start of note in frames relative to region start
-       framepos_t const start_frames = snap_pixel_to_frame (x);
-       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);
+       if (snap_t) {
+               framecnt_t grid_frames;
+               t = snap_frame_to_grid_underneath (t, grid_frames);
+       }
 
+       assert (t >= 0);
        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,
+                                                                 region_frames_to_region_beats(t + _region->start()), 
+                                                                 length,
                                                                  (uint8_t)note, 0x40));
 
        if (_model->contains (new_note)) {
@@ -908,7 +913,7 @@ MidiRegionView::create_note_at(double x, double y, double length, bool sh)
 
        view->update_note_range(new_note->note());
 
-       MidiModel::NoteDiffCommand* cmd = _model->new_note_diff_command("add note");
+       MidiModel::NoteDiffCommand* cmd = _model->new_note_diff_command(_("add note"));
        cmd->add (new_note);
        _model->apply_command(*trackview.session(), cmd);
 
@@ -1143,8 +1148,17 @@ MidiRegionView::redisplay_model()
 
        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;
                }
@@ -1174,15 +1188,15 @@ MidiRegionView::display_patch_changes ()
        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 */
+               display_patch_changes_on_channel (i, chn_mask & (1 << i));
        }
 }
 
+/** @param active_channel true to display patch changes fully, false to display
+ * them `greyed-out' (as on an inactive channel)
+ */
 void
-MidiRegionView::display_patch_changes_on_channel (uint8_t channel)
+MidiRegionView::display_patch_changes_on_channel (uint8_t channel, bool active_channel)
 {
        for (MidiModel::PatchChanges::const_iterator i = _model->patch_changes().begin(); i != _model->patch_changes().end(); ++i) {
 
@@ -1190,29 +1204,68 @@ MidiRegionView::display_patch_changes_on_channel (uint8_t channel)
                        continue;
                }
 
-               MIDI::Name::PatchPrimaryKey patch_key ((*i)->bank_msb (), (*i)->bank_lsb (), (*i)->program ());
+               // MidiTimeAxisView* const mtv = dynamic_cast<MidiTimeAxisView*>(&trackview);
+               //string patch_name = mtv->get_patch_name ((*i)->bank(), (*i)->program(), channel);
 
-               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);
-               }
+               // add_canvas_patch_change (*i, patch_name, active_channel);
        }
 }
 
 void
 MidiRegionView::display_sysexes()
 {
+       bool have_periodic_system_messages = false;
+       bool display_periodic_messages = true;
+
+       if (!Config->get_never_display_periodic_midi()) {
+
+               for (MidiModel::SysExes::const_iterator i = _model->sysexes().begin(); i != _model->sysexes().end(); ++i) {
+                       const boost::shared_ptr<const Evoral::MIDIEvent<Evoral::MusicalTime> > mev = 
+                               boost::static_pointer_cast<const Evoral::MIDIEvent<Evoral::MusicalTime> > (*i);
+                       
+                       if (mev) {
+                               if (mev->is_spp() || mev->is_mtc_quarter() || mev->is_mtc_full()) {
+                                       have_periodic_system_messages = true;
+                                       break;
+                               }
+                       }
+               }
+               
+               if (have_periodic_system_messages) {
+                       double zoom = trackview.editor().get_current_zoom (); // frames per pixel
+                       
+                       /* get an approximate value for the number of samples per video frame */
+                       
+                       double video_frame = trackview.session()->frame_rate() * (1.0/30);
+                       
+                       /* if we are zoomed out beyond than the cutoff (i.e. more
+                        * frames per pixel than frames per 4 video frames), don't
+                        * show periodic sysex messages.
+                        */
+                       
+                       if (zoom > (video_frame*4)) {
+                               display_periodic_messages = false;
+                       } 
+               }
+       } else {
+               display_periodic_messages = false;
+       }
+
        for (MidiModel::SysExes::const_iterator i = _model->sysexes().begin(); i != _model->sysexes().end(); ++i) {
+
+               const boost::shared_ptr<const Evoral::MIDIEvent<Evoral::MusicalTime> > mev = 
+                       boost::static_pointer_cast<const Evoral::MIDIEvent<Evoral::MusicalTime> > (*i);
+
                Evoral::MusicalTime time = (*i)->time();
-               assert(time >= 0);
+               assert (time >= 0);
+
+               if (mev) {
+                       if (mev->is_spp() || mev->is_mtc_quarter() || mev->is_mtc_full()) {
+                               if (!display_periodic_messages) {
+                                       continue;
+                               }
+                       }
+               }
 
                ostringstream str;
                str << hex;
@@ -1231,7 +1284,7 @@ MidiRegionView::display_sysexes()
                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
+               // Show unless message is beyond the region bounds
                if (time - _region->start() >= _region->length() || time < _region->start()) {
                        sysex->hide();
                } else {
@@ -1242,7 +1295,6 @@ MidiRegionView::display_sysexes()
        }
 }
 
-
 MidiRegionView::~MidiRegionView ()
 {
        in_destructor = true;
@@ -1259,6 +1311,8 @@ MidiRegionView::~MidiRegionView ()
                end_write();
        }
 
+       _selection_cleared_connection.disconnect ();
+
        _selection.clear();
        clear_events();
 
@@ -1394,7 +1448,7 @@ MidiRegionView::add_ghost (TimeAxisView& tv)
        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());
+       GhostRegion::CatchDeletion.connect (*this, invalidator (*this), boost::bind (&RegionView::remove_ghost, this, _1), gui_context());
 
        return ghost;
 }
@@ -1469,7 +1523,7 @@ MidiRegionView::extend_active_notes()
 void
 MidiRegionView::play_midi_note(boost::shared_ptr<NoteType> note)
 {
-       if (_no_sound_notes || !trackview.editor().sound_notes()) {
+       if (_no_sound_notes || !Config->get_sound_midi_notes()) {
                return;
        }
 
@@ -1479,15 +1533,17 @@ MidiRegionView::play_midi_note(boost::shared_ptr<NoteType> note)
                return;
        }
 
-       NotePlayer* np = new NotePlayer (route_ui->midi_track());
+       NotePlayer* np = new NotePlayer (route_ui->midi_track ());
        np->add (note);
        np->play ();
+
+       /* NotePlayer deletes itself */
 }
 
 void
-MidiRegionView::play_midi_chord (vector<boost::shared_ptr<NoteType> > notes)
+MidiRegionView::start_playing_midi_note(boost::shared_ptr<NoteType> note)
 {
-       if (_no_sound_notes || !trackview.editor().sound_notes()) {
+       if (_no_sound_notes || !Config->get_sound_midi_notes()) {
                return;
        }
 
@@ -1497,13 +1553,33 @@ MidiRegionView::play_midi_chord (vector<boost::shared_ptr<NoteType> > notes)
                return;
        }
 
-       NotePlayer* np = new NotePlayer (route_ui->midi_track());
+       delete _note_player;
+       _note_player = new NotePlayer (route_ui->midi_track ());
+       _note_player->add (note);
+       _note_player->on ();
+}
+
+void
+MidiRegionView::start_playing_midi_chord (vector<boost::shared_ptr<NoteType> > notes)
+{
+       if (_no_sound_notes || !Config->get_sound_midi_notes()) {
+               return;
+       }
+
+       RouteUI* route_ui = dynamic_cast<RouteUI*> (&trackview);
+
+       if (!route_ui || !route_ui->midi_track()) {
+               return;
+       }
+
+       delete _note_player;
+       _note_player = new NotePlayer (route_ui->midi_track());
 
        for (vector<boost::shared_ptr<NoteType> >::iterator n = notes.begin(); n != notes.end(); ++n) {
-               np->add (*n);
+               _note_player->add (*n);
        }
 
-       np->play ();
+       _note_player->on ();
 }
 
 
@@ -1527,7 +1603,6 @@ 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());
 
@@ -1697,12 +1772,18 @@ MidiRegionView::step_sustain (Evoral::MusicalTime beats)
        change_note_lengths (false, false, beats, false, true);
 }
 
+/** Add a new patch change flag to the canvas.
+ * @param patch the patch change to add
+ * @param the text to display in the flag
+ * @param active_channel true to display the flag as on an active channel, false to grey it out for an inactive channel.
+ */
 void
-MidiRegionView::add_canvas_patch_change (MidiModel::PatchChangePtr patch, const string& displaytext)
+MidiRegionView::add_canvas_patch_change (MidiModel::PatchChangePtr patch, const string& displaytext, bool active_channel)
 {
        assert (patch->time() >= 0);
 
-       const double x = trackview.editor().frame_to_pixel (source_beats_to_region_frames (patch->time()));
+       framecnt_t region_frames = source_beats_to_region_frames (patch->time());
+       const double x = trackview.editor().frame_to_pixel (region_frames);
 
        double const height = midi_stream_view()->contents_height();
 
@@ -1713,11 +1794,12 @@ MidiRegionView::add_canvas_patch_change (MidiModel::PatchChangePtr patch, const
                                      x, 1.0,
                                      _model_name,
                                      _custom_device_mode,
-                                     patch)
+                                     patch,
+                                     active_channel)
                          );
 
        // Show unless patch change is beyond the region bounds
-       if (patch->time() - _region->start() >= _region->length() || patch->time() < _region->start()) {
+       if (region_frames < 0 || region_frames >= _region->length()) {
                patch_change->hide();
        } else {
                patch_change->show();
@@ -1735,11 +1817,10 @@ MidiRegionView::get_patch_key_at (Evoral::MusicalTime time, uint8_t channel, MID
        }
 
        if (i != _model->patch_changes().end()) {
-               key.msb = (*i)->bank_msb ();
-               key.lsb = (*i)->bank_lsb ();
+               key.bank_number = (*i)->bank();
                key.program_number = (*i)->program ();
        } else {
-               key.msb = key.lsb = key.program_number = 0;
+               key.bank_number = key.program_number = 0;
        }
 
        assert (key.is_sane());
@@ -1755,7 +1836,7 @@ MidiRegionView::change_patch_change (CanvasPatchChange& pc, const MIDI::Name::Pa
                c->change_program (pc.patch (), new_patch.program_number);
        }
 
-       int const new_bank = (new_patch.msb << 7) | new_patch.lsb;
+       int const new_bank = new_patch.bank_number;
        if (pc.patch()->bank() != new_bank) {
                c->change_bank (pc.patch (), new_bank);
        }
@@ -1868,15 +1949,9 @@ 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--;
+               if (key.bank_number > 0) {
+                       key.bank_number--;
                        change_patch_change (patch, key);
-               } else {
-                       if (key.msb > 0) {
-                               key.lsb = 127;
-                               key.msb--;
-                               change_patch_change (patch, key);
-                       }
                }
        }
 }
@@ -1887,15 +1962,9 @@ 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++;
+               if (key.bank_number < 127) {
+                       key.bank_number++;
                        change_patch_change (patch, key);
-               } else {
-                       if (key.msb < 127) {
-                               key.lsb = 0;
-                               key.msb++;
-                               change_patch_change (patch, key);
-                       }
                }
        }
 }
@@ -1941,9 +2010,9 @@ MidiRegionView::delete_note (boost::shared_ptr<NoteType> n)
 }
 
 void
-MidiRegionView::clear_selection_except (ArdourCanvas::CanvasNoteEvent* ev)
+MidiRegionView::clear_selection_except (ArdourCanvas::CanvasNoteEvent* ev, bool signal)
 {
-       for (Selection::iterator i = _selection.begin(); i != _selection.end(); ) {
+       for (Selection::iterator i = _selection.begin(); i != _selection.end(); ) {
                if ((*i) != ev) {
                        Selection::iterator tmp = i;
                        ++tmp;
@@ -1951,7 +2020,7 @@ MidiRegionView::clear_selection_except (ArdourCanvas::CanvasNoteEvent* ev)
                        (*i)->set_selected (false);
                        (*i)->hide_velocity ();
                        _selection.erase (i);
-                       
+
                        i = tmp;
                } else {
                        ++i;
@@ -1961,6 +2030,10 @@ MidiRegionView::clear_selection_except (ArdourCanvas::CanvasNoteEvent* ev)
        /* this does not change the status of this regionview w.r.t the editor
           selection.
        */
+
+       if (signal) {
+               SelectionCleared (this); /* EMIT SIGNAL */
+       }
 }
 
 void
@@ -1989,6 +2062,31 @@ MidiRegionView::select_all_notes ()
        }
 }
 
+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)
 {
@@ -2182,6 +2280,38 @@ MidiRegionView::update_drag_selection(double x1, double x2, double y1, double y2
        }
 }
 
+void
+MidiRegionView::update_vertical_drag_selection (double y1, double y2, bool extend)
+{
+       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.
+               */
+
+               if (((*i)->y1() >= y1 && (*i)->y1() <= y2)) {
+                       // within y- (note-) range
+                       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)
 {
@@ -2211,7 +2341,7 @@ MidiRegionView::add_to_selection (CanvasNoteEvent* ev)
 
        if (_selection.insert (ev).second) {
                ev->set_selected (true);
-               play_midi_note ((ev)->note());
+               start_playing_midi_note ((ev)->note());
        }
 
        if (add_mrv_selection) {
@@ -2240,7 +2370,7 @@ MidiRegionView::move_selection(double dx, double dy, double cumulative_dy)
                (*i)->move_event(dx, dy);
        }
 
-       if (dy && !_selection.empty() && !_no_sound_notes && trackview.editor().sound_notes()) {
+       if (dy && !_selection.empty() && !_no_sound_notes && Config->get_sound_midi_notes()) {
 
                if (to_play.size() > 1) {
 
@@ -2252,13 +2382,13 @@ MidiRegionView::move_selection(double dx, double dy, double cumulative_dy)
                                shifted.push_back (moved_note);
                        }
 
-                       play_midi_chord (shifted);
+                       start_playing_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);
+                       start_playing_midi_note (moved_note);
                }
        }
 }
@@ -2298,8 +2428,9 @@ MidiRegionView::note_dropped(CanvasNoteEvent *, frameoffset_t dt, int8_t dnote)
        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);
+               
+               framepos_t new_frames = source_beats_to_absolute_frames ((*i)->note()->time()) + dt;
+               Evoral::MusicalTime new_time = absolute_frames_to_source_beats (new_frames);
 
                if (new_time < 0) {
                        continue;
@@ -2313,12 +2444,6 @@ MidiRegionView::note_dropped(CanvasNoteEvent *, frameoffset_t dt, int8_t dnote)
                // 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;
-               }
-
                lowest_note_in_selection  = std::min(lowest_note_in_selection,  new_pitch);
                highest_note_in_selection = std::max(highest_note_in_selection, new_pitch);
 
@@ -2334,6 +2459,9 @@ MidiRegionView::note_dropped(CanvasNoteEvent *, frameoffset_t dt, int8_t dnote)
        }
 }
 
+/** @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)
 {
@@ -2341,32 +2469,9 @@ MidiRegionView::snap_pixel_to_frame(double x)
        return snap_frame_to_frame (editor.pixel_to_frame (x));
 }
 
-/** Snap a frame offset within our region using the current snap settings.
- *  @param x Frame offset from this region's position.
- *  @return Snapped frame offset from this region's position.
+/** @param x Pixel relative to the region position.
+ *  @return Snapped pixel relative to the region position.
  */
-frameoffset_t
-MidiRegionView::snap_frame_to_frame (frameoffset_t x)
-{
-       PublicEditor& editor = trackview.editor();
-
-       /* x is region relative, convert it to global absolute frames */
-       framepos_t const session_frame = x + _region->position();
-
-       /* try a snap in either direction */
-       framepos_t frame = session_frame;
-       editor.snap_to (frame, 0);
-
-       /* if we went off the beginning of the region, snap forwards */
-       if (frame < _region->position ()) {
-               frame = session_frame;
-               editor.snap_to (frame, 1);
-       }
-
-       /* back to region relative */
-       return frame - _region->position();
-}
-
 double
 MidiRegionView::snap_to_pixel(double x)
 {
@@ -2506,9 +2611,6 @@ MidiRegionView::update_resizing (ArdourCanvas::CanvasNoteEvent* primary, bool at
                        double beats;
 
                        beats = snap_pixel_to_frame (current_x);
-                       /* XXX not sure this is correct - snap_pixel_to_frame()
-                          returns an absolute frame.
-                       */
                        beats = region_frames_to_region_beats (beats);
 
                        double len;
@@ -2571,13 +2673,10 @@ MidiRegionView::commit_resizing (ArdourCanvas::CanvasNoteEvent* primary, bool at
                        }
                }
 
-               /* Convert that to a frame within the region */
+               /* Convert that to a frame within the source */
                current_x = snap_pixel_to_frame (current_x) + _region->start ();
 
                /* and then to beats */
-               /* XXX not sure this is correct - snap_pixel_to_frame()
-                  returns an absolute frame.
-               */
                current_x = region_frames_to_region_beats (current_x);
 
                if (at_front && current_x < canvas_note->note()->end_time()) {
@@ -2609,6 +2708,17 @@ MidiRegionView::commit_resizing (ArdourCanvas::CanvasNoteEvent* primary, bool at
        apply_diff();
 }
 
+void
+MidiRegionView::abort_resizing ()
+{
+       for (std::vector<NoteResizeData *>::iterator i = _resize_data.begin(); i != _resize_data.end(); ++i) {
+               delete (*i)->resize_rect;
+               delete *i;
+       }
+
+       _resize_data.clear ();
+}
+
 void
 MidiRegionView::change_note_velocity(CanvasNoteEvent* event, int8_t velocity, bool relative)
 {
@@ -2764,9 +2874,10 @@ MidiRegionView::change_note_length (CanvasNoteEvent* event, Evoral::MusicalTime
 }
 
 void
-MidiRegionView::change_velocities (bool up, bool fine, bool allow_smush)
+MidiRegionView::change_velocities (bool up, bool fine, bool allow_smush, bool all_together)
 {
        int8_t delta;
+       int8_t value;
 
        if (_selection.empty()) {
                return;
@@ -2795,7 +2906,19 @@ MidiRegionView::change_velocities (bool up, bool fine, bool allow_smush)
        for (Selection::iterator i = _selection.begin(); i != _selection.end();) {
                Selection::iterator next = i;
                ++next;
-               change_note_velocity (*i, delta, true);
+
+               if (all_together) {
+                       if (i == _selection.begin()) {
+                               change_note_velocity (*i, delta, true);
+                               value = (*i)->note()->velocity() + delta;
+                       } else {
+                               change_note_velocity (*i, value, false);
+                       }
+
+               } else {
+                       change_note_velocity (*i, delta, true);
+               }
+
                i = next;
        }
 
@@ -2867,7 +2990,7 @@ MidiRegionView::change_note_lengths (bool fine, bool shorter, Evoral::MusicalTim
                        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";
+                               error << string_compose (_("programming error: %1"), "Grid type not available as beats - TO BE FIXED") << endmsg;
                                return;
                        }
                }
@@ -2907,7 +3030,7 @@ MidiRegionView::nudge_notes (bool forward)
 
        framepos_t ref_point = source_beats_to_absolute_frames ((*(_selection.begin()))->note()->time());
        framepos_t unused;
-       framepos_t distance;
+       framecnt_t distance;
 
        if (trackview.editor().snap_mode() == Editing::SnapOff) {
 
@@ -2975,7 +3098,7 @@ MidiRegionView::note_entered(ArdourCanvas::CanvasNoteEvent* ev)
 {
        Editor* editor = dynamic_cast<Editor*>(&trackview.editor());
 
-       _pre_enter_cursor = editor->get_canvas_cursor ();
+       pre_enter_cursor = editor->get_canvas_cursor ();
 
        if (_mouse_state == SelectTouchDragging) {
                note_selected (ev, true);
@@ -2995,9 +3118,9 @@ MidiRegionView::note_left (ArdourCanvas::CanvasNoteEvent*)
 
        editor->verbose_cursor()->hide ();
 
-       if (_pre_enter_cursor) {
-               editor->set_canvas_cursor (_pre_enter_cursor);
-               _pre_enter_cursor = 0;
+       if (pre_enter_cursor) {
+               editor->set_canvas_cursor (pre_enter_cursor);
+               pre_enter_cursor = 0;
        }
 }
 
@@ -3020,14 +3143,16 @@ void
 MidiRegionView::note_mouse_position (float x_fraction, float /*y_fraction*/, bool can_set_cursor)
 {
        Editor* editor = dynamic_cast<Editor*>(&trackview.editor());
+       Editing::MouseMode mm = editor->current_mouse_mode();
+       bool trimmable = (mm == MouseObject || mm == MouseTimeFX || mm == MouseDraw);
 
-       if (x_fraction > 0.0 && x_fraction < 0.25) {
+       if (trimmable && x_fraction > 0.0 && x_fraction < 0.2) {
                editor->set_canvas_cursor (editor->cursors()->left_side_trim);
-       } else if (x_fraction >= 0.75 && x_fraction < 1.0) {
+       } else if (trimmable && x_fraction >= 0.8 && 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);
+               if (pre_enter_cursor && can_set_cursor) {
+                       editor->set_canvas_cursor (pre_enter_cursor);
                }
        }
 }
@@ -3061,15 +3186,9 @@ MidiRegionView::set_frame_color()
 void
 MidiRegionView::midi_channel_mode_changed(ChannelMode mode, uint16_t mask)
 {
-       switch (mode) {
-       case AllChannels:
-       case FilterChannels:
-               _force_channel = -1;
-               break;
-       case ForceChannel:
-               _force_channel = mask;
+       if (mode == ForceChannel) {
                mask = 0xFFFF; // Show all notes as active (below)
-       };
+       }
 
        // Update notes for selection
        for (Events::iterator i = _events.begin(); i != _events.end(); ++i) {
@@ -3083,10 +3202,8 @@ MidiRegionView::midi_channel_mode_changed(ChannelMode mode, uint16_t mask)
 }
 
 void
-MidiRegionView::midi_patch_settings_changed(std::string model, std::string custom_device_mode)
+MidiRegionView::instrument_settings_changed ()
 {
-       _model_name         = model;
-       _custom_device_mode = custom_device_mode;
        redisplay_model();
 }
 
@@ -3167,7 +3284,7 @@ MidiRegionView::paste (framepos_t pos, float times, const MidiCutBuffer& mcb)
        Evoral::MusicalTime end_point = 0;
 
        duration = (*mcb.notes().rbegin())->end_time() - (*mcb.notes().begin())->time();
-       paste_pos_beats = region_frames_to_region_beats (pos - _region->position());
+       paste_pos_beats = absolute_frames_to_source_beats (pos);
        beat_delta = (*mcb.notes().begin())->time() - paste_pos_beats;
        paste_pos_beats = 0;
 
@@ -3205,7 +3322,7 @@ MidiRegionView::paste (framepos_t pos, float times, const MidiCutBuffer& mcb)
                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);
+               _region->set_length (end_frame - _region->position());
                trackview.session()->add_command (new StatefulDiffCommand (_region));
        }
 
@@ -3244,24 +3361,30 @@ MidiRegionView::goto_next_note (bool add_to_selection)
 
        time_sort_events ();
 
+       MidiTimeAxisView* const mtv = dynamic_cast<MidiTimeAxisView*>(&trackview);
+       uint16_t const channel_mask = mtv->channel_selector().get_selected_channels ();
+
        for (Events::iterator i = _events.begin(); i != _events.end(); ++i) {
                if ((*i)->selected()) {
                        use_next = true;
                        continue;
                } else if (use_next) {
-                       if (!add_to_selection) {
-                               unique_select (*i);
-                       } else {
-                               note_selected (*i, true, false);
+                       if (channel_mask & (1 << (*i)->note()->channel())) {
+                               if (!add_to_selection) {
+                                       unique_select (*i);
+                               } else {
+                                       note_selected (*i, true, false);
+                               }
+                               return;
                        }
-                       return;
                }
        }
 
        /* use the first one */
 
-       unique_select (_events.front());
-
+       if (!_events.empty() && (channel_mask & (1 << _events.front()->note()->channel ()))) {
+               unique_select (_events.front());
+       }
 }
 
 void
@@ -3275,23 +3398,30 @@ MidiRegionView::goto_previous_note (bool add_to_selection)
 
        time_sort_events ();
 
+       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 (!add_to_selection) {
-                               unique_select (*i);
-                       } else {
-                               note_selected (*i, true, false);
+                       if (channel_mask & (1 << (*i)->note()->channel())) {
+                               if (!add_to_selection) {
+                                       unique_select (*i);
+                               } else {
+                                       note_selected (*i, true, false);
+                               }
+                               return;
                        }
-                       return;
                }
        }
 
        /* use the last one */
 
-       unique_select (*(_events.rbegin()));
+       if (!_events.empty() && (channel_mask & (1 << (*_events.rbegin())->note()->channel ()))) {
+               unique_select (*(_events.rbegin()));
+       }
 }
 
 void
@@ -3328,24 +3458,23 @@ MidiRegionView::update_ghost_note (double x, double y)
        PublicEditor& editor = trackview.editor ();
        
        framepos_t const unsnapped_frame = editor.pixel_to_frame (x);
-       bool success;
-       Evoral::MusicalTime grid_beats = editor.get_grid_type_as_beats (success, unsnapped_frame);
+       framecnt_t grid_frames;
+       framepos_t const f = snap_frame_to_grid_underneath (unsnapped_frame, grid_frames);
 
-       if (!success) {
-               grid_beats = 1;
-       }
-
-       framecnt_t const grid_frames = region_beats_to_region_frames (grid_beats);
-       framepos_t f = snap_frame_to_frame (unsnapped_frame);
        /* 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);
+       bool success;
+       double length = editor.get_grid_type_as_beats (success, unsnapped_frame);
+
+       if (!success) {
+               length = 1;
+       }
 
        /* note that this sets the time of the ghost note in beats relative to
-          the start of the region.
+          the start of the source; that is how all note times are stored.
        */
-       _ghost_note->note()->set_time (region_frames_to_region_beats (f));
+       _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 ());
@@ -3359,8 +3488,7 @@ MidiRegionView::update_ghost_note (double x, double y)
 void
 MidiRegionView::create_ghost_note (double x, double y)
 {
-       delete _ghost_note;
-       _ghost_note = 0;
+       remove_ghost_note ();
 
        boost::shared_ptr<NoteType> g (new NoteType);
        _ghost_note = new NoEventCanvasNote (*this, *_note_group, g);
@@ -3494,11 +3622,10 @@ MidiRegionView::set_step_edit_cursor_width (Evoral::MusicalTime beats)
 }
 
 /** Called when a diskstream on our track has received some data.  Update the view, if applicable.
- *  @param buf Data that has been recorded.
- *  @param w Source that this data will end up in.
+ *  @param w Source that the data will end up in.
  */
 void
-MidiRegionView::data_recorded (boost::shared_ptr<MidiBuffer> buf, boost::weak_ptr<MidiSource> w)
+MidiRegionView::data_recorded (boost::weak_ptr<MidiSource> w)
 {
        if (!_active_notes) {
                /* we aren't actively being recorded to */
@@ -3512,6 +3639,9 @@ MidiRegionView::data_recorded (boost::shared_ptr<MidiBuffer> buf, boost::weak_pt
        }
 
        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;
@@ -3520,6 +3650,11 @@ MidiRegionView::data_recorded (boost::shared_ptr<MidiBuffer> buf, boost::weak_pt
                Evoral::MIDIEvent<MidiBuffer::TimeType> const ev (*i, false);
                assert (ev.buffer ());
 
+               /* ev.time() is in session frames, so (ev.time() - converter.origin_b()) is
+                  frames from the start of the source, and so time_beats is in terms of the
+                  source.
+               */
+
                Evoral::MusicalTime const time_beats = converter.from (ev.time () - converter.origin_b ());
 
                if (ev.type() == MIDI_CMD_NOTE_ON) {
@@ -3574,7 +3709,7 @@ MidiRegionView::trim_front_ending ()
 void
 MidiRegionView::edit_patch_change (ArdourCanvas::CanvasPatchChange* pc)
 {
-       PatchChangeDialog d (&_source_relative_time_converter, trackview.session(), *pc->patch (), Gtk::Stock::APPLY);
+       PatchChangeDialog d (&_source_relative_time_converter, trackview.session(), *pc->patch (), _model_name, _custom_device_mode, Gtk::Stock::APPLY);
        if (d.run () != Gtk::RESPONSE_ACCEPT) {
                return;
        }
@@ -3618,3 +3753,52 @@ MidiRegionView::show_verbose_cursor (string const & text, double xoffset, double
        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;
+       }
+       
+       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);
+}
+
+void
+MidiRegionView::note_button_release ()
+{
+       delete _note_player;
+       _note_player = 0;
+}