fix duplicate, and clarify its behaviour in smart mode; includes a fix for TimeSelect...
[ardour.git] / gtk2_ardour / midi_region_view.cc
index 8229c9bc2966019448ce4b03d6c1461fbdab0f2c..ac982a3040146771de7a4e9030031230160e5215 100644 (file)
@@ -48,6 +48,7 @@
 #include "canvas-hit.h"
 #include "canvas-note.h"
 #include "canvas_patch_change.h"
+#include "canvas-sysex.h"
 #include "debug.h"
 #include "editor.h"
 #include "editor_drag.h"
@@ -61,6 +62,7 @@
 #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"
@@ -109,13 +111,17 @@ MidiRegionView::MidiRegionView (ArdourCanvas::Group *parent, RouteTimeAxisView &
        , _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));
 
-       /* Look up MIDNAM details from our MidiTimeAxisView */
-       MidiTimeAxisView& mtv = dynamic_cast<MidiTimeAxisView&> (tv);
-       midi_patch_settings_changed (mtv.midi_patch_model (), mtv.midi_patch_custom_device_node ());
+
+       MidiTimeAxisView *time_axis = dynamic_cast<MidiTimeAxisView *>(&tv);
+       if (time_axis) {
+               _last_channel_mode = time_axis->channel_selector().get_channel_mode();
+               _last_channel_selection = time_axis->channel_selector().get_selected_channels();
+       }
 
        Config->ParameterChanged.connect (*this, invalidator (*this), boost::bind (&MidiRegionView::parameter_changed, this, _1), gui_context());
        connect_to_diskstream ();
@@ -149,14 +155,17 @@ MidiRegionView::MidiRegionView (ArdourCanvas::Group *parent, RouteTimeAxisView &
        , _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));
 
-       /* Look up MIDNAM details from our MidiTimeAxisView */
-       MidiTimeAxisView& mtv = dynamic_cast<MidiTimeAxisView&> (tv);
-       midi_patch_settings_changed (mtv.midi_patch_model (), mtv.midi_patch_custom_device_node ());
-       
+       MidiTimeAxisView *time_axis = dynamic_cast<MidiTimeAxisView *>(&tv);
+       if (time_axis) {
+               _last_channel_mode = time_axis->channel_selector().get_channel_mode();
+               _last_channel_selection = time_axis->channel_selector().get_selected_channels();
+       }
+
        connect_to_diskstream ();
 
        SelectionCleared.connect (_selection_cleared_connection, invalidator (*this), boost::bind (&MidiRegionView::selection_cleared, this, _1), gui_context ());
@@ -197,6 +206,7 @@ MidiRegionView::MidiRegionView (const MidiRegionView& other)
        , _last_event_y (0)
        , pre_enter_cursor (0)
        , pre_press_cursor (0)
+       , _note_player (0)
 {
        Gdk::Color c;
        int r,g,b,a;
@@ -231,6 +241,7 @@ MidiRegionView::MidiRegionView (const MidiRegionView& other, boost::shared_ptr<M
        , _last_event_y (0)
        , pre_enter_cursor (0)
        , pre_press_cursor (0)
+       , _note_player (0)
 {
        Gdk::Color c;
        int r,g,b,a;
@@ -268,8 +279,6 @@ MidiRegionView::init (Gdk::Color const & basic_color, bool wfd)
        region_resized (ARDOUR::bounds_change);
        region_locked ();
 
-       reset_width_dependent_items (_pixel_width);
-
        set_colors ();
 
        _enable_display = true;
@@ -279,15 +288,16 @@ MidiRegionView::init (Gdk::Color const & basic_color, bool wfd)
                }
        }
 
+       reset_width_dependent_items (_pixel_width);
+
        group->raise_to_top();
-       group->signal_event().connect(
-               sigc::mem_fun(this, &MidiRegionView::canvas_event), false);
+       group->signal_event().connect (sigc::mem_fun (this, &MidiRegionView::canvas_event), false);
 
        midi_view()->signal_channel_mode_changed().connect(
                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));
+       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),
                                               boost::bind (&MidiRegionView::snap_changed, this),
@@ -299,6 +309,13 @@ MidiRegionView::init (Gdk::Color const & basic_color, bool wfd)
        SelectionCleared.connect (_selection_cleared_connection, invalidator (*this), boost::bind (&MidiRegionView::selection_cleared, this, _1), gui_context ());
 }
 
+InstrumentInfo&
+MidiRegionView::instrument_info () const
+{
+       RouteUI* route_ui = dynamic_cast<RouteUI*> (&trackview);
+       return route_ui->route()->instrument_info();
+}
+
 const boost::shared_ptr<ARDOUR::MidiRegion>
 MidiRegionView::midi_region() const
 {
@@ -317,6 +334,8 @@ MidiRegionView::connect_to_diskstream ()
 bool
 MidiRegionView::canvas_event(GdkEvent* ev)
 {
+       bool r;
+
        switch (ev->type) {
        case GDK_ENTER_NOTIFY:
        case GDK_LEAVE_NOTIFY:
@@ -332,7 +351,12 @@ MidiRegionView::canvas_event(GdkEvent* ev)
        }
 
        if (ev->type == GDK_2BUTTON_PRESS) {
-               return trackview.editor().toggle_internal_editing_from_double_click (ev);
+               // 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);
+               }
        }
 
        if ((!trackview.editor().internal_editing() && trackview.editor().current_mouse_mode() != MouseGain) ||
@@ -356,7 +380,10 @@ MidiRegionView::canvas_event(GdkEvent* ev)
                return button_press (&ev->button);
 
        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);
@@ -672,7 +699,11 @@ MidiRegionView::scroll (GdkEventScroll* ev)
                change_velocities (true, fine, false, together);
        } else if (ev->direction == GDK_SCROLL_DOWN) {
                change_velocities (false, fine, false, together);
+       } else {
+               /* left, right: we don't use them */
+               return false;
        }
+
        return true;
 }
 
@@ -705,7 +736,11 @@ MidiRegionView::key_press (GdkEventKey* ev)
 
                return true;
 
-       } else if (ev->keyval == GDK_Delete && unmodified) {
+       } else if ((ev->keyval == GDK_BackSpace || ev->keyval == GDK_Delete) && unmodified) {
+
+               if (_selection.empty()) {
+                       return false;
+               }
 
                delete_selection();
                return true;
@@ -736,7 +771,7 @@ 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::PrimaryModifier);
+               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, together);
@@ -749,14 +784,13 @@ 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::PrimaryModifier);
+               bool together = Keyboard::modifier_state_contains (ev->state, Keyboard::Level4Modifier);
 
-               if (Keyboard::no_modifiers_active (ev->state)) {
-                       transpose (false, fine, allow_smush);
-               } else {
+               if (Keyboard::modifier_state_contains (ev->state, Keyboard::PrimaryModifier)) {
                        change_velocities (false, fine, allow_smush, together);
+               } else {
+                       transpose (false, fine, allow_smush);
                }
-
                return true;
 
        } else if (ev->keyval == GDK_Left && unmodified) {
@@ -772,6 +806,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;
@@ -790,20 +828,15 @@ MidiRegionView::key_release (GdkEventKey* ev)
 void
 MidiRegionView::channel_edit ()
 {
-       bool first = true;
-       uint8_t current_channel = 0;
-
        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 ();
 
@@ -828,6 +861,42 @@ 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 ()
 {
@@ -882,9 +951,9 @@ MidiRegionView::create_note_at (framepos_t t, double y, double length, bool snap
 }
 
 void
-MidiRegionView::clear_events()
+MidiRegionView::clear_events (bool with_selection_signal)
 {
-       clear_selection();
+       clear_selection (with_selection_signal);
 
        MidiGhostRegion* gr;
        for (std::vector<GhostRegion*>::iterator g = ghosts.begin(); g != ghosts.end(); ++g) {
@@ -1149,15 +1218,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) {
 
@@ -1165,20 +1234,8 @@ MidiRegionView::display_patch_changes_on_channel (uint8_t channel)
                        continue;
                }
 
-               MIDI::Name::PatchPrimaryKey patch_key ((*i)->bank_msb (), (*i)->bank_lsb (), (*i)->program ());
-
-               boost::shared_ptr<MIDI::Name::Patch> patch =
-                       MIDI::Name::MidiPatchManager::instance().find_patch(
-                               _model_name, _custom_device_mode, channel, patch_key);
-
-               if (patch != 0) {
-                       add_canvas_patch_change (*i, patch->name());
-               } else {
-                       char buf[16];
-                       /* program and bank numbers are zero-based: convert to one-based: MIDI_BP_ZERO */
-                       snprintf (buf, 16, "%d %d", (*i)->program() + MIDI_BP_ZERO , (*i)->bank() + MIDI_BP_ZERO);
-                       add_canvas_patch_change (*i, buf);
-               }
+               string patch_name = instrument_info().get_patch_name ((*i)->bank(), (*i)->program(), channel);
+               add_canvas_patch_change (*i, patch_name, active_channel);
        }
 }
 
@@ -1248,12 +1305,12 @@ MidiRegionView::display_sysexes()
                }
                string text = str.str();
 
-               const double x = trackview.editor().frame_to_pixel(source_beats_to_absolute_frames(time));
+               const double x = trackview.editor().frame_to_pixel(source_beats_to_region_frames(time));
 
                double height = midi_stream_view()->contents_height();
 
                boost::shared_ptr<CanvasSysEx> sysex = boost::shared_ptr<CanvasSysEx>(
-                       new CanvasSysEx(*this, *_note_group, text, height, x, 1.0));
+                       new CanvasSysEx(*this, *_note_group, text, height, x, 1.0, (*i)));
 
                // Show unless message is beyond the region bounds
                if (time - _region->start() >= _region->length() || time < _region->start()) {
@@ -1282,8 +1339,10 @@ MidiRegionView::~MidiRegionView ()
                end_write();
        }
 
+       _selection_cleared_connection.disconnect ();
+
        _selection.clear();
-       clear_events();
+       clear_events (false);
 
        delete _note_group;
        delete _note_diff_command;
@@ -1314,6 +1373,14 @@ MidiRegionView::reset_width_dependent_items (double pixel_width)
                redisplay_model();
        }
 
+       for (PatchChanges::iterator x = _patch_changes.begin(); x != _patch_changes.end(); ++x) {
+               if ((*x)->width() >= _pixel_width) {
+                       (*x)->hide();
+               } else {
+                       (*x)->show();
+               }
+       }
+
        move_step_edit_cursor (_step_edit_cursor_position);
        set_step_edit_cursor_width (_step_edit_cursor_width);
 }
@@ -1502,13 +1569,34 @@ 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::start_playing_midi_note(boost::shared_ptr<NoteType> note)
+{
+       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 ());
+       _note_player->add (note);
+       _note_player->on ();
 }
 
 void
-MidiRegionView::play_midi_chord (vector<boost::shared_ptr<NoteType> > notes)
+MidiRegionView::start_playing_midi_chord (vector<boost::shared_ptr<NoteType> > notes)
 {
        if (_no_sound_notes || !Config->get_sound_midi_notes()) {
                return;
@@ -1520,13 +1608,14 @@ 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());
 
        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 ();
 }
 
 
@@ -1719,8 +1808,13 @@ 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);
 
@@ -1730,27 +1824,37 @@ MidiRegionView::add_canvas_patch_change (MidiModel::PatchChangePtr patch, const
        double const height = midi_stream_view()->contents_height();
 
        boost::shared_ptr<CanvasPatchChange> patch_change = boost::shared_ptr<CanvasPatchChange>(
-               new CanvasPatchChange(*this, *_note_group,
+               new CanvasPatchChange(*this, *group,
                                      displaytext,
                                      height,
                                      x, 1.0,
-                                     _model_name,
-                                     _custom_device_mode,
-                                     patch)
+                                     instrument_info(),
+                                     patch,
+                                     active_channel)
                          );
 
-       // Show unless patch change is beyond the region bounds
-       if (region_frames < 0 || region_frames >= _region->length()) {
-               patch_change->hide();
+       if (patch_change->width() < _pixel_width) {
+               // Show unless patch change is beyond the region bounds
+               if (region_frames < 0 || region_frames >= _region->length()) {
+                       patch_change->hide();
+               } else {
+                       patch_change->show();
+               }
        } else {
-               patch_change->show();
+               patch_change->hide ();
        }
 
        _patch_changes.push_back (patch_change);
 }
 
-void
-MidiRegionView::get_patch_key_at (Evoral::MusicalTime time, uint8_t channel, MIDI::Name::PatchPrimaryKey& key)
+MIDI::Name::PatchPrimaryKey
+MidiRegionView::patch_change_to_patch_key (MidiModel::PatchChangePtr p)
+{
+       return MIDI::Name::PatchPrimaryKey (p->program(), p->bank());
+}
+
+void 
+MidiRegionView::get_patch_key_at (double time, uint8_t channel, MIDI::Name::PatchPrimaryKey& key)
 {
        MidiModel::PatchChanges::iterator i = _model->patch_change_lower_bound (time);
        while (i != _model->patch_changes().end() && (*i)->channel() != channel) {
@@ -1758,17 +1862,15 @@ 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());
 }
 
-
 void
 MidiRegionView::change_patch_change (CanvasPatchChange& pc, const MIDI::Name::PatchPrimaryKey& new_patch)
 {
@@ -1778,7 +1880,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);
        }
@@ -1867,8 +1969,7 @@ void
 MidiRegionView::previous_patch (CanvasPatchChange& patch)
 {
        if (patch.patch()->program() < 127) {
-               MIDI::Name::PatchPrimaryKey key;
-               get_patch_key_at (patch.patch()->time(), patch.patch()->channel(), key);
+               MIDI::Name::PatchPrimaryKey key = patch_change_to_patch_key (patch.patch());
                key.program_number++;
                change_patch_change (patch, key);
        }
@@ -1878,47 +1979,32 @@ void
 MidiRegionView::next_patch (CanvasPatchChange& patch)
 {
        if (patch.patch()->program() > 0) {
-               MIDI::Name::PatchPrimaryKey key;
-               get_patch_key_at (patch.patch()->time(), patch.patch()->channel(), key);
+               MIDI::Name::PatchPrimaryKey key = patch_change_to_patch_key (patch.patch());
                key.program_number--;
                change_patch_change (patch, key);
        }
 }
 
 void
-MidiRegionView::previous_bank (CanvasPatchChange& patch)
+MidiRegionView::next_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--;
+               MIDI::Name::PatchPrimaryKey key = patch_change_to_patch_key (patch.patch());
+               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);
-                       }
                }
        }
 }
 
 void
-MidiRegionView::next_bank (CanvasPatchChange& patch)
+MidiRegionView::previous_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++;
+               MIDI::Name::PatchPrimaryKey key = patch_change_to_patch_key (patch.patch());
+               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);
-                       }
                }
        }
 }
@@ -2295,7 +2381,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) {
@@ -2336,13 +2422,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);
                }
        }
 }
@@ -2831,7 +2917,7 @@ void
 MidiRegionView::change_velocities (bool up, bool fine, bool allow_smush, bool all_together)
 {
        int8_t delta;
-       int8_t value;
+       int8_t value = 0;
 
        if (_selection.empty()) {
                return;
@@ -3079,18 +3165,42 @@ MidiRegionView::note_left (ArdourCanvas::CanvasNoteEvent*)
 }
 
 void
-MidiRegionView::patch_entered (ArdourCanvas::CanvasPatchChange* ev)
+MidiRegionView::patch_entered (ArdourCanvas::CanvasPatchChange* p)
 {
        ostringstream s;
        /* XXX should get patch name if we can */
-       s << _("Bank:") << (ev->patch()->bank() + MIDI_BP_ZERO) << '\n' << _("Program:") << ((int) ev->patch()->program()) + MIDI_BP_ZERO << '\n' << _("Channel:") << ((int) ev->patch()->channel() + 1);
+       s << _("Bank:") << (p->patch()->bank() + MIDI_BP_ZERO) << '\n' 
+         << _("Program:") << ((int) p->patch()->program()) + MIDI_BP_ZERO << '\n' 
+         << _("Channel:") << ((int) p->patch()->channel() + 1);
        show_verbose_cursor (s.str(), 10, 20);
+       p->grab_focus();
 }
 
 void
 MidiRegionView::patch_left (ArdourCanvas::CanvasPatchChange *)
 {
        trackview.editor().verbose_cursor()->hide ();
+       /* focus will transfer back via the enter-notify event sent to this
+        * midi region view.
+        */
+}
+
+void
+MidiRegionView::sysex_entered (ArdourCanvas::CanvasSysEx* p)
+{
+       ostringstream s;
+       s << p->text();
+       show_verbose_cursor (s.str(), 10, 20);
+       p->grab_focus();
+}
+
+void
+MidiRegionView::sysex_left (ArdourCanvas::CanvasSysEx *)
+{
+       trackview.editor().verbose_cursor()->hide ();
+       /* focus will transfer back via the enter-notify event sent to this
+        * midi region view.
+        */
 }
 
 void
@@ -3150,16 +3260,15 @@ MidiRegionView::midi_channel_mode_changed(ChannelMode mode, uint16_t mask)
        }
 
        _last_channel_selection = mask;
+       _last_channel_mode = mode;
 
        _patch_changes.clear ();
        display_patch_changes ();
 }
 
 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();
 }
 
@@ -3606,6 +3715,14 @@ MidiRegionView::data_recorded (boost::weak_ptr<MidiSource> w)
                Evoral::MIDIEvent<MidiBuffer::TimeType> const ev (*i, false);
                assert (ev.buffer ());
 
+               if(ev.is_channel_event()) {
+                       if (_last_channel_mode == FilterChannels) {
+                               if(((uint16_t(1) << ev.channel()) & _last_channel_selection) == 0) {
+                                       continue;
+                               }
+                       }
+               }
+
                /* 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.
@@ -3665,7 +3782,10 @@ MidiRegionView::trim_front_ending ()
 void
 MidiRegionView::edit_patch_change (ArdourCanvas::CanvasPatchChange* pc)
 {
-       PatchChangeDialog d (&_source_relative_time_converter, trackview.session(), *pc->patch (), _model_name, _custom_device_mode, Gtk::Stock::APPLY);
+       PatchChangeDialog d (&_source_relative_time_converter, trackview.session(), *pc->patch (), instrument_info(), Gtk::Stock::APPLY);
+
+        d.set_position (Gtk::WIN_POS_MOUSE);
+
        if (d.run () != Gtk::RESPONSE_ACCEPT) {
                return;
        }
@@ -3673,6 +3793,16 @@ MidiRegionView::edit_patch_change (ArdourCanvas::CanvasPatchChange* pc)
        change_patch_change (pc->patch(), d.patch ());
 }
 
+void
+MidiRegionView::delete_sysex (CanvasSysEx* sysex)
+{
+       MidiModel::SysExDiffCommand* c = _model->new_sysex_diff_command (_("delete sysex"));
+       c->remove (sysex->sysex());
+       _model->apply_command (*trackview.session(), c);
+
+       _sys_exes.clear ();
+       display_sysexes();
+}
 
 void
 MidiRegionView::show_verbose_cursor (boost::shared_ptr<NoteType> n) const
@@ -3751,3 +3881,10 @@ MidiRegionView::selection_cleared (MidiRegionView* rv)
        /* 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;
+}