Remove internal edit mode and add "content" tool.
[ardour.git] / gtk2_ardour / midi_region_view.cc
index 21ae56b8c22eefdf006b0b3ac10189c4e13b606b..8533cefdc07cbcdb24a34310672b79448703bbc9 100644 (file)
 
 #include <sigc++/signal.h>
 
+#include "midi++/midnam_patch.h"
+
 #include "pbd/memento_command.h"
 #include "pbd/stateful_diff_command.h"
 
 #include "ardour/midi_model.h"
-#include "ardour/midi_patch_manager.h"
 #include "ardour/midi_region.h"
 #include "ardour/midi_source.h"
 #include "ardour/midi_track.h"
@@ -39,7 +40,6 @@
 #include "ardour/session.h"
 
 #include "evoral/Parameter.hpp"
-#include "evoral/MIDIParameters.hpp"
 #include "evoral/MIDIEvent.hpp"
 #include "evoral/Control.hpp"
 #include "evoral/midi_util.h"
@@ -67,6 +67,7 @@
 #include "midi_velocity_dialog.h"
 #include "mouse_cursors.h"
 #include "note_player.h"
+#include "paste_context.h"
 #include "public_editor.h"
 #include "route_time_axis.h"
 #include "rgb_macros.h"
@@ -85,6 +86,7 @@
 using namespace ARDOUR;
 using namespace PBD;
 using namespace Editing;
+using namespace std;
 using Gtkmm2ext::Keyboard;
 
 PBD::Signal1<void, MidiRegionView *> MidiRegionView::SelectionCleared;
@@ -118,6 +120,8 @@ MidiRegionView::MidiRegionView (ArdourCanvas::Container*      parent,
        , _no_sound_notes (false)
        , _last_event_x (0)
        , _last_event_y (0)
+       , _grabbed_keyboard (false)
+       , _entered (false)
        , pre_enter_cursor (0)
        , pre_press_cursor (0)
        , pre_note_enter_cursor (0)
@@ -138,8 +142,9 @@ MidiRegionView::MidiRegionView (ArdourCanvas::Container*      parent,
                                 boost::shared_ptr<MidiRegion> r,
                                 double                        spu,
                                 uint32_t                      basic_color,
+                                bool                          recording,
                                 TimeAxisViewItem::Visibility  visibility)
-       : RegionView (parent, tv, r, spu, basic_color, false, visibility)
+       : RegionView (parent, tv, r, spu, basic_color, recording, visibility)
        , _current_range_min(0)
        , _current_range_max(0)
        , _region_relative_time_converter(r->session().tempo_map(), r->position())
@@ -161,6 +166,8 @@ MidiRegionView::MidiRegionView (ArdourCanvas::Container*      parent,
        , _no_sound_notes (false)
        , _last_event_x (0)
        , _last_event_y (0)
+       , _grabbed_keyboard (false)
+       , _entered (false)
        , pre_enter_cursor (0)
        , pre_press_cursor (0)
        , pre_note_enter_cursor (0)
@@ -210,6 +217,8 @@ MidiRegionView::MidiRegionView (const MidiRegionView& other)
        , _no_sound_notes (false)
        , _last_event_x (0)
        , _last_event_y (0)
+       , _grabbed_keyboard (false)
+       , _entered (false)
        , pre_enter_cursor (0)
        , pre_press_cursor (0)
        , pre_note_enter_cursor (0)
@@ -241,6 +250,8 @@ MidiRegionView::MidiRegionView (const MidiRegionView& other, boost::shared_ptr<M
        , _no_sound_notes (false)
        , _last_event_x (0)
        , _last_event_y (0)
+       , _grabbed_keyboard (false)
+       , _entered (false)
        , pre_enter_cursor (0)
        , pre_press_cursor (0)
        , pre_note_enter_cursor (0)
@@ -259,11 +270,13 @@ MidiRegionView::init (bool wfd)
                                           gui_context());
        
        if (wfd) {
-               midi_region()->midi_source(0)->load_model();
+               Glib::Threads::Mutex::Lock lm(midi_region()->midi_source(0)->mutex());
+               midi_region()->midi_source(0)->load_model(lm);
        }
 
        _model = midi_region()->midi_source(0)->model();
        _enable_display = false;
+       _fill_color_name = "midi frame base";
 
        RegionView::init (false);
 
@@ -329,42 +342,32 @@ MidiRegionView::connect_to_diskstream ()
 bool
 MidiRegionView::canvas_group_event(GdkEvent* ev)
 {
-       if (in_destructor) {
+       if (in_destructor || _recregion) {
                return false;
        }
 
+       if (!trackview.editor().internal_editing()) {
+               // not in internal edit mode, so just act like a normal region
+               return RegionView::canvas_group_event (ev);
+       }
+
        bool r;
 
        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 (ev->type == GDK_2BUTTON_PRESS) {
-               // cannot use double-click to exit internal mode if single-click is being used
-               MouseMode m = trackview.editor().current_mouse_mode();
-
-               if ((m != MouseObject || !Keyboard::modifier_state_contains (ev->button.state, Keyboard::insert_note_modifier())) && (m != MouseDraw)) {
-                       return trackview.editor().toggle_internal_editing_from_double_click (ev);
-               }
-       }
+               enter_notify(&ev->crossing);
+               // set entered_regionview (among other things)
+               return RegionView::canvas_group_event (ev);
 
-       if ((!trackview.editor().internal_editing() && trackview.editor().current_mouse_mode() != MouseGain) ||
-           (trackview.editor().current_mouse_mode() == MouseTimeFX)) {
-               // handle non-internal-edit/non-draw modes elsewhere
+       case GDK_LEAVE_NOTIFY:
+               _last_event_x = ev->crossing.x;
+               _last_event_y = ev->crossing.y;
+               leave_notify(&ev->crossing);
+               // reset entered_regionview (among other things)
                return RegionView::canvas_group_event (ev);
-       }
 
-       switch (ev->type) {
        case GDK_SCROLL:
                if (scroll (&ev->scroll)) {
                        return true;
@@ -386,24 +389,16 @@ MidiRegionView::canvas_group_event(GdkEvent* ev)
                _note_player = 0;
                return r;
 
-       case GDK_ENTER_NOTIFY:
-               // set entered_regionview (among other things)
-               trackview.editor().canvas_region_view_event (ev, group, this);
-               return enter_notify (&ev->crossing);
-
-       case GDK_LEAVE_NOTIFY:
-               // reset entered_regionview (among other things)
-               trackview.editor().canvas_region_view_event (ev, group, this);
-               return leave_notify (&ev->crossing);
-
        case GDK_MOTION_NOTIFY:
+               _last_event_x = ev->motion.x;
+               _last_event_y = ev->motion.y;
                return motion (&ev->motion);
 
        default:
                break;
        }
 
-       return trackview.editor().canvas_region_view_event (ev, group, this);
+       return RegionView::canvas_group_event (ev);
 }
 
 bool
@@ -413,24 +408,9 @@ MidiRegionView::enter_notify (GdkEventCrossing* ev)
                _mouse_mode_connection, invalidator (*this), boost::bind (&MidiRegionView::mouse_mode_changed, this), gui_context ()
                );
 
-       if (trackview.editor().current_mouse_mode() == MouseDraw && _mouse_state != AddDragging) {
-               create_ghost_note (ev->x, ev->y);
-       }
-
-       if (!trackview.editor().internal_editing()) {
-               Keyboard::magic_widget_drop_focus();
-       } else {
-               Keyboard::magic_widget_grab_focus();
-               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);
-       }
+       enter_internal();
 
+       _entered = true;
        return false;
 }
 
@@ -439,37 +419,48 @@ MidiRegionView::leave_notify (GdkEventCrossing*)
 {
        _mouse_mode_connection.disconnect ();
 
-       trackview.editor().verbose_cursor()->hide ();
-       remove_ghost_note ();
+       leave_internal();
 
+       _entered = false;
+       return false;
+}
+
+void
+MidiRegionView::mouse_mode_changed ()
+{
        if (trackview.editor().internal_editing()) {
-               Keyboard::magic_widget_drop_focus();
+               // Switched in to internal editing mode while entered
+               enter_internal();
+       } else {
+               // Switched out of internal editing mode while entered
+               leave_internal();
        }
+}
 
-       if (pre_enter_cursor) {
-               Editor* editor = dynamic_cast<Editor *> (&trackview.editor());
-               editor->set_canvas_cursor(pre_enter_cursor);
-               pre_enter_cursor = 0;
+void
+MidiRegionView::enter_internal()
+{
+       if (trackview.editor().current_mouse_mode() == MouseDraw && _mouse_state != AddDragging) {
+               // Show ghost note under pencil
+               create_ghost_note(_last_event_x, _last_event_y);
        }
 
-       return false;
+       if (!_selection.empty()) {
+               // Grab keyboard for moving selected notes with arrow keys
+               Keyboard::magic_widget_grab_focus();
+               _grabbed_keyboard = true;
+       }
 }
 
 void
-MidiRegionView::mouse_mode_changed ()
+MidiRegionView::leave_internal()
 {
-       if (trackview.editor().current_mouse_mode() == MouseDraw && trackview.editor().internal_editing()) {
-               create_ghost_note (_last_event_x, _last_event_y);
-       } else {
-               remove_ghost_note ();
-               trackview.editor().verbose_cursor()->hide ();
-       }
+       trackview.editor().verbose_cursor()->hide ();
+       remove_ghost_note ();
 
-       if (!trackview.editor().internal_editing()) {
+       if (_grabbed_keyboard) {
                Keyboard::magic_widget_drop_focus();
-       } else {
-               Keyboard::magic_widget_grab_focus();
-               group->grab_focus();
+               _grabbed_keyboard = false;
        }
 }
 
@@ -483,7 +474,7 @@ MidiRegionView::button_press (GdkEventButton* ev)
        Editor* editor = dynamic_cast<Editor *> (&trackview.editor());
        MouseMode m = editor->current_mouse_mode();
 
-       if (m == MouseObject && Keyboard::modifier_state_contains (ev->state, Keyboard::insert_note_modifier())) {
+       if (m == MouseContent && 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);
        }
@@ -532,7 +523,7 @@ MidiRegionView::button_release (GdkEventButton* ev)
                        clear_selection ();
                        break;
 
-               case MouseObject:
+               case MouseContent:
                case MouseTimeFX:
                        {
                                clear_selection();
@@ -597,18 +588,18 @@ MidiRegionView::motion (GdkEventMotion* ev)
 {
        PublicEditor& editor = trackview.editor ();
 
-       if (!_ghost_note && editor.current_mouse_mode() == MouseObject &&
+       if (!_ghost_note && editor.current_mouse_mode() == MouseContent &&
            Keyboard::modifier_state_contains (ev->state, Keyboard::insert_note_modifier()) &&
            _mouse_state != AddDragging) {
 
                create_ghost_note (ev->x, ev->y);
 
-       } else if (_ghost_note && editor.current_mouse_mode() == MouseObject &&
+       } else if (_ghost_note && editor.current_mouse_mode() == MouseContent &&
                   Keyboard::modifier_state_contains (ev->state, Keyboard::insert_note_modifier())) {
 
                update_ghost_note (ev->x, ev->y);
 
-       } else if (_ghost_note && editor.current_mouse_mode() == MouseObject) {
+       } else if (_ghost_note && editor.current_mouse_mode() == MouseContent) {
 
                remove_ghost_note ();
                editor.verbose_cursor()->hide ();
@@ -631,15 +622,17 @@ MidiRegionView::motion (GdkEventMotion* ev)
                        
                        MouseMode m = editor.current_mouse_mode();
                        
-                       if (m == MouseDraw || (m == MouseObject && Keyboard::modifier_state_contains (ev->state, Keyboard::insert_note_modifier()))) {
+                       if (m == MouseDraw || (m == MouseContent && 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) {
+                       } else if (m == MouseContent) {
                                editor.drags()->set (new MidiRubberbandSelectDrag (dynamic_cast<Editor *> (&editor), this), (GdkEvent *) ev);
-                               clear_selection ();
+                               if (!Keyboard::modifier_state_equals (ev->state, Keyboard::TertiaryModifier)) {
+                                       clear_selection ();
+                               }
                                _mouse_state = SelectRectDragging;
                                return true;
                        } else if (m == MouseRange) {
@@ -789,14 +782,16 @@ MidiRegionView::key_press (GdkEventKey* ev)
                }
                return true;
 
-       } else if (ev->keyval == GDK_Left && unmodified) {
+       } else if (ev->keyval == GDK_Left) {
 
-               nudge_notes (false);
+               bool fine = !Keyboard::modifier_state_contains (ev->state, Keyboard::SecondaryModifier);
+               nudge_notes (false, fine);
                return true;
 
-       } else if (ev->keyval == GDK_Right && unmodified) {
+       } else if (ev->keyval == GDK_Right) {
 
-               nudge_notes (true);
+               bool fine = !Keyboard::modifier_state_contains (ev->state, Keyboard::SecondaryModifier);
+               nudge_notes (true, fine);
                return true;
 
        } else if (ev->keyval == GDK_c && unmodified) {
@@ -1554,7 +1549,8 @@ MidiRegionView::extend_active_notes()
 
        for (unsigned i=0; i < 128; ++i) {
                if (_active_notes[i]) {
-                       _active_notes[i]->set_x1 (trackview.editor().sample_to_pixel(_region->length()));
+                       _active_notes[i]->set_x1(
+                               trackview.editor().sample_to_pixel(_region->position() + _region->length()));
                }
        }
 }
@@ -1875,15 +1871,11 @@ MidiRegionView::get_patch_key_at (Evoral::MusicalTime time, uint8_t channel, MID
        }
 
        if (i != _model->patch_changes().end() && patch_applies(*i, time, channel)) {
-               key.bank_number    = (*i)->bank();
-               key.program_number = (*i)->program ();
+               key.set_bank((*i)->bank());
+               key.set_program((*i)->program ());
        } else {
-               key.bank_number = key.program_number = 0;
-       }
-
-       if (!key.is_sane()) {
-               error << string_compose(_("insane MIDI patch key %1:%2"),
-                                       key.bank_number, key.program_number) << endmsg;
+               key.set_bank(0);
+               key.set_program(0);
        }
 }
 
@@ -1892,11 +1884,11 @@ MidiRegionView::change_patch_change (PatchChange& pc, const MIDI::Name::PatchPri
 {
        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);
+       if (pc.patch()->program() != new_patch.program()) {
+               c->change_program (pc.patch (), new_patch.program());
        }
 
-       int const new_bank = new_patch.bank_number;
+       int const new_bank = new_patch.bank();
        if (pc.patch()->bank() != new_bank) {
                c->change_bank (pc.patch (), new_bank);
        }
@@ -1982,47 +1974,15 @@ MidiRegionView::delete_patch_change (PatchChange* pc)
 }
 
 void
-MidiRegionView::previous_patch (PatchChange& patch)
-{
-       if (patch.patch()->program() < 127) {
-               MIDI::Name::PatchPrimaryKey key = patch_change_to_patch_key (patch.patch());
-               key.program_number++;
-               change_patch_change (patch, key);
-       }
-}
-
-void
-MidiRegionView::next_patch (PatchChange& patch)
-{
-       if (patch.patch()->program() > 0) {
-               MIDI::Name::PatchPrimaryKey key = patch_change_to_patch_key (patch.patch());
-               key.program_number--;
-               change_patch_change (patch, key);
-       }
-}
-
-void
-MidiRegionView::next_bank (PatchChange& patch)
-{
-       if (patch.patch()->program() < 127) {
-               MIDI::Name::PatchPrimaryKey key = patch_change_to_patch_key (patch.patch());
-               if (key.bank_number > 0) {
-                       key.bank_number--;
-                       change_patch_change (patch, key);
-               }
-       }
-}
-
-void
-MidiRegionView::previous_bank (PatchChange& patch)
+MidiRegionView::step_patch (PatchChange& patch, bool bank, int delta)
 {
-       if (patch.patch()->program() > 0) {
-               MIDI::Name::PatchPrimaryKey key = patch_change_to_patch_key (patch.patch());
-               if (key.bank_number < 127) {
-                       key.bank_number++;
-                       change_patch_change (patch, key);
-               }
+       MIDI::Name::PatchPrimaryKey key = patch_change_to_patch_key(patch.patch());
+       if (bank) {
+               key.set_bank(key.bank() + delta);
+       } else {
+               key.set_program(key.program() + delta);
        }
+       change_patch_change(patch, key);
 }
 
 void
@@ -2083,6 +2043,12 @@ MidiRegionView::clear_selection_except (NoteBase* ev, bool signal)
                }
        }
 
+       if (!ev && _entered) {
+               // Clearing selection entirely, ungrab keyboard
+               Keyboard::magic_widget_drop_focus();
+               _grabbed_keyboard = false;
+       }
+
        /* this does not change the status of this regionview w.r.t the editor
           selection.
        */
@@ -2095,6 +2061,8 @@ MidiRegionView::clear_selection_except (NoteBase* ev, bool signal)
 void
 MidiRegionView::unique_select(NoteBase* ev)
 {
+       const bool selection_was_empty = _selection.empty();
+
        clear_selection_except (ev);
 
        /* don't bother with checking to see if we should remove this
@@ -2105,6 +2073,11 @@ MidiRegionView::unique_select(NoteBase* ev)
 
        if (!ev->selected()) {
                add_to_selection (ev);
+               if (selection_was_empty && _entered) {
+                       // Grab keyboard for moving notes with arrow keys
+                       Keyboard::magic_widget_grab_focus();
+                       _grabbed_keyboard = true;
+               }
        }
 }
 
@@ -2376,6 +2349,11 @@ MidiRegionView::remove_from_selection (NoteBase* ev)
 
        if (i != _selection.end()) {
                _selection.erase (i);
+               if (_selection.empty() && _grabbed_keyboard) {
+                       // Ungrab keyboard
+                       Keyboard::magic_widget_drop_focus();
+                       _grabbed_keyboard = false;
+               }
        }
 
        ev->set_selected (false);
@@ -2390,18 +2368,19 @@ MidiRegionView::remove_from_selection (NoteBase* ev)
 void
 MidiRegionView::add_to_selection (NoteBase* ev)
 {
-       bool add_mrv_selection = false;
-
-       if (_selection.empty()) {
-               add_mrv_selection = true;
-       }
+       const bool selection_was_empty = _selection.empty();
 
        if (_selection.insert (ev).second) {
                ev->set_selected (true);
                start_playing_midi_note ((ev)->note());
+               if (selection_was_empty && _entered) {
+                       // Grab keyboard for moving notes with arrow keys
+                       Keyboard::magic_widget_grab_focus();
+                       _grabbed_keyboard = true;
+               }
        }
 
-       if (add_mrv_selection) {
+       if (selection_was_empty) {
                PublicEditor& editor (trackview.editor());
                editor.get_selection().add (this);
        }
@@ -2600,7 +2579,7 @@ MidiRegionView::begin_resizing (bool /*at_front*/)
 
                        // calculate the colors: get the color settings
                        uint32_t fill_color = UINT_RGBA_CHANGE_A(
-                               ARDOUR_UI::config()->get_MidiNoteSelected(),
+                               ARDOUR_UI::config()->color ("midi note selected"),
                                128);
 
                        // make the resize preview notes more transparent and bright
@@ -2613,7 +2592,7 @@ MidiRegionView::begin_resizing (bool /*at_front*/)
                                0.85));
 
                        resize_rect->set_outline_color (NoteBase::calculate_outline (
-                                                               ARDOUR_UI::config()->get_MidiNoteSelected()));
+                                                               ARDOUR_UI::config()->color ("midi note selected")));
 
                        resize_data->resize_rect = resize_rect;
                        _resize_data.push_back(resize_data);
@@ -3077,7 +3056,7 @@ MidiRegionView::change_note_lengths (bool fine, bool shorter, Evoral::MusicalTim
 }
 
 void
-MidiRegionView::nudge_notes (bool forward)
+MidiRegionView::nudge_notes (bool forward, bool fine)
 {
        if (_selection.empty()) {
                return;
@@ -3088,15 +3067,21 @@ MidiRegionView::nudge_notes (bool forward)
           into a vector and sort before using the first one.
        */
 
-       framepos_t ref_point = source_beats_to_absolute_frames ((*(_selection.begin()))->note()->time());
-       framepos_t unused;
-       framecnt_t distance;
+       const framepos_t    ref_point = source_beats_to_absolute_frames ((*(_selection.begin()))->note()->time());
+       Evoral::MusicalTime delta;
+
+       if (!fine) {
 
-       if (trackview.editor().snap_mode() == Editing::SnapOff) {
+               /* non-fine, move by 1 bar regardless of snap */
+               delta = Evoral::MusicalTime(trackview.session()->tempo_map().meter_at(ref_point).divisions_per_bar());
+
+       } else if (trackview.editor().snap_mode() == Editing::SnapOff) {
 
                /* grid is off - use nudge distance */
 
-               distance = trackview.editor().get_nudge_distance (ref_point, unused);
+               framepos_t       unused;
+               const framecnt_t distance = trackview.editor().get_nudge_distance (ref_point, unused);
+               delta = region_frames_to_region_beats (fabs ((double)distance));
 
        } else {
 
@@ -3116,15 +3101,14 @@ MidiRegionView::nudge_notes (bool forward)
                }
 
                trackview.editor().snap_to (next_pos, (forward ? RoundUpAlways : RoundDownAlways), false);
-               distance = ref_point - next_pos;
+               const framecnt_t distance = ref_point - next_pos;
+               delta = region_frames_to_region_beats (fabs ((double)distance));
        }
 
-       if (distance == 0) {
+       if (!delta) {
                return;
        }
 
-       Evoral::MusicalTime delta = region_frames_to_region_beats (fabs ((double)distance));
-
        if (!forward) {
                delta = -delta;
        }
@@ -3230,7 +3214,7 @@ MidiRegionView::note_mouse_position (float x_fraction, float /*y_fraction*/, boo
 {
        Editor* editor = dynamic_cast<Editor*>(&trackview.editor());
        Editing::MouseMode mm = editor->current_mouse_mode();
-       bool trimmable = (mm == MouseObject || mm == MouseTimeFX || mm == MouseDraw);
+       bool trimmable = (mm == MouseContent || mm == MouseTimeFX || mm == MouseDraw);
 
        if (can_set_cursor) {
                if (trimmable && x_fraction > 0.0 && x_fraction < 0.2) {
@@ -3255,9 +3239,9 @@ MidiRegionView::set_frame_color()
        }
 
        if (_selected) {
-               f = ARDOUR_UI::config()->get_SelectedFrameBase();
-       } else if (high_enough_for_name) {
-               f= ARDOUR_UI::config()->get_MidiFrameBase();
+               f = ARDOUR_UI::config()->color ("selected region base");
+       } else if (high_enough_for_name || !ARDOUR_UI::config()->get_color_regions_using_track_color()) {
+               f = ARDOUR_UI::config()->color_mod ("midi frame base", "midi frame base");
        } else {
                f = fill_color;
        }
@@ -3354,28 +3338,25 @@ MidiRegionView::selection_as_cut_buffer () const
 
 /** This method handles undo */
 bool
-MidiRegionView::paste (framepos_t pos, unsigned paste_count, float times, const ::Selection& selection, ItemCounts& counts)
+MidiRegionView::paste (framepos_t pos, const ::Selection& selection, PasteContext& ctx)
 {
-       // Get our set of notes from the selection
-       MidiNoteSelection::const_iterator m = selection.midi_notes.get_nth(counts.n_notes());
-       if (m == selection.midi_notes.end()) {
-               return false;
-       }
-       counts.increase_n_notes();
-
-       trackview.session()->begin_reversible_command (Operations::paste);
+       trackview.editor().begin_reversible_command (Operations::paste);
 
-       // Paste notes
-       paste_internal(pos, paste_count, times, **m);
+       // Paste notes, if available
+       MidiNoteSelection::const_iterator m = selection.midi_notes.get_nth(ctx.counts.n_notes());
+       if (m != selection.midi_notes.end()) {
+               ctx.counts.increase_n_notes();
+               paste_internal(pos, ctx.count, ctx.times, **m);
+       }
 
-       // Paste control points to automation children
+       // Paste control points to automation children, if available
        typedef RouteTimeAxisView::AutomationTracks ATracks;
        const ATracks& atracks = midi_view()->automation_tracks();
        for (ATracks::const_iterator a = atracks.begin(); a != atracks.end(); ++a) {
-               a->second->paste(pos, paste_count, times, selection, counts);
+               a->second->paste(pos, selection, ctx);
        }
 
-       trackview.session()->commit_reversible_command ();
+       trackview.editor().commit_reversible_command ();
 
        return true;
 }
@@ -3555,6 +3536,8 @@ MidiRegionView::selection_as_notelist (Notes& selected, bool allow_all_if_none_s
 void
 MidiRegionView::update_ghost_note (double x, double y)
 {
+       x = std::max(0.0, x);
+
        MidiTimeAxisView* const mtv = dynamic_cast<MidiTimeAxisView*>(&trackview);
 
        _last_ghost_x = x;
@@ -3598,13 +3581,9 @@ MidiRegionView::create_ghost_note (double x, double y)
        _ghost_note = new Note (*this, _note_group, g);
        _ghost_note->set_ignore_events (true);
        _ghost_note->set_outline_color (0x000000aa);
-       if (x < 0) { x = 0; }
        update_ghost_note (x, y);
        _ghost_note->show ();
 
-       _last_ghost_x = x;
-       _last_ghost_y = y;
-
        show_verbose_cursor (_ghost_note->note ());
 }
 
@@ -3634,6 +3613,8 @@ MidiRegionView::drop_down_keys ()
 void
 MidiRegionView::maybe_select_by_position (GdkEventButton* ev, double /*x*/, double y)
 {
+       /* XXX: This is dead code.  What was it for? */
+
        double note = midi_stream_view()->y_to_note(y);
        Events e;
        MidiTimeAxisView* const mtv = dynamic_cast<MidiTimeAxisView*>(&trackview);
@@ -3755,8 +3736,6 @@ MidiRegionView::data_recorded (boost::weak_ptr<MidiSource> w)
 
        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) {
@@ -3770,12 +3749,8 @@ MidiRegionView::data_recorded (boost::weak_ptr<MidiSource> w)
                        }
                }
 
-               /* 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 ());
+               /* convert from session frames to source beats */
+               Evoral::MusicalTime const time_beats = _source_relative_time_converter.from(ev.time());
 
                if (ev.type() == MIDI_CMD_NOTE_ON) {
                        boost::shared_ptr<NoteType> note (
@@ -3872,8 +3847,8 @@ MidiRegionView::show_verbose_cursor (boost::shared_ptr<NoteType> n) const
                        get_patch_key_at(n->time(), n->channel(), patch_key);
                        name = device_names->note_name(mtv->gui_property(X_("midnam-custom-device-mode")),
                                                       n->channel(),
-                                                      patch_key.bank_number,
-                                                      patch_key.program_number,
+                                                      patch_key.bank(),
+                                                      patch_key.program(),
                                                       n->note());
                }
        }