Tempo ramps - update midi regions and locations when dragging tempo.

[ardour.git] / gtk2_ardour / midi_region_view.cc

diff --git a/gtk2_ardour/midi_region_view.cc b/gtk2_ardour/midi_region_view.cc
index c62686170a9372aae83d8b03d1a032c17dbf2240..61e9dea9d7a23fe72529f6852147a0c89dc4ce9b 100644 (file)
--- a/gtk2_ardour/midi_region_view.cc
+++ b/gtk2_ardour/midi_region_view.cc
@@ -536,7 +536,7 @@ MidiRegionView::button_release (GdkEventButton* ev)
 
                switch (editor.current_mouse_mode()) {
                case MouseRange:
-                       /* no motion occured - simple click */
+                       /* no motion occurred - simple click */
                        clear_editor_note_selection ();
                        _mouse_changed_selection = true;
                        break;
@@ -1742,8 +1742,8 @@ MidiRegionView::update_sustained (Note* ev, bool update_ghost_regions)
        }
 
        // Update color in case velocity has changed
-       ev->set_fill_color(ev->base_color());
-       ev->set_outline_color(ev->calculate_outline(ev->base_color(), ev->selected()));
+       //ev->set_fill_color(ev->base_color());
+       //ev->set_outline_color(ev->calculate_outline(ev->base_color(), ev->selected()));
 
        if (update_ghost_regions) {
                for (std::vector<GhostRegion*>::iterator i = ghosts.begin(); i != ghosts.end(); ++i) {
@@ -3997,11 +3997,10 @@ MidiRegionView::delete_sysex (SysEx* /*sysex*/)
        // display_sysexes();
 }
 
-void
-MidiRegionView::show_verbose_cursor (boost::shared_ptr<NoteType> n) const
+std::string
+MidiRegionView::get_note_name (boost::shared_ptr<NoteType> n, uint8_t note_value) const
 {
        using namespace MIDI::Name;
-
        std::string name;
 
        MidiTimeAxisView* mtv = dynamic_cast<MidiTimeAxisView*>(&trackview);
@@ -4014,19 +4013,36 @@ MidiRegionView::show_verbose_cursor (boost::shared_ptr<NoteType> n) const
                                                       n->channel(),
                                                       patch_key.bank(),
                                                       patch_key.program(),
-                                                      n->note());
+                                                      note_value);
                }
-               mtv->set_note_highlight (n->note());
        }
 
        char buf[128];
        snprintf (buf, sizeof (buf), "%d %s\nCh %d Vel %d",
-                 (int) n->note (),
-                 name.empty() ? Evoral::midi_note_name (n->note()).c_str() : name.c_str(),
+                 (int) note_value,
+                 name.empty() ? Evoral::midi_note_name (note_value).c_str() : name.c_str(),
                  (int) n->channel() + 1,
                  (int) n->velocity());
 
-       show_verbose_cursor(buf, 10, 20);
+       return buf;
+}
+
+void
+MidiRegionView::show_verbose_cursor_for_new_note_value(boost::shared_ptr<NoteType> current_note,
+                                                       uint8_t new_value) const
+{
+       MidiTimeAxisView* mtv = dynamic_cast<MidiTimeAxisView*>(&trackview);
+       if (mtv) {
+               mtv->set_note_highlight (new_value);
+       }
+
+       show_verbose_cursor(get_note_name(current_note, new_value), 10, 20);
+}
+
+void
+MidiRegionView::show_verbose_cursor (boost::shared_ptr<NoteType> n) const
+{
+       show_verbose_cursor_for_new_note_value(n, n->note());
 }
 
 void
@@ -4107,7 +4123,7 @@ MidiRegionView::get_grid_beats(framepos_t pos) const
 {
        PublicEditor& editor  = trackview.editor();
        bool          success = false;
-       Evoral::Beats beats   = editor.get_grid_type_as_beats(success, pos);
+       Evoral::Beats beats   = editor.get_grid_type_as_beats (success, pos);
        if (!success) {
                beats = Evoral::Beats(1);
        }