X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fmidi_region_view.cc;h=a2aa46f3ff607c354ba200dc2672d3535cd8916f;hb=7701207123891b400c144db880b77dc698a202ea;hp=e3179e0f9494dbf9eed994a762849b036e791bd7;hpb=232d67bc531aaf64d697eb99106e484c1b4ad5b3;p=ardour.git diff --git a/gtk2_ardour/midi_region_view.cc b/gtk2_ardour/midi_region_view.cc index e3179e0f94..a2aa46f3ff 100644 --- a/gtk2_ardour/midi_region_view.cc +++ b/gtk2_ardour/midi_region_view.cc @@ -33,6 +33,7 @@ #include "pbd/stateful_diff_command.h" #include "ardour/midi_model.h" +#include "ardour/midi_playlist.h" #include "ardour/midi_region.h" #include "ardour/midi_source.h" #include "ardour/midi_track.h" @@ -75,13 +76,13 @@ #include "streamview.h" #include "patch_change_dialog.h" #include "verbose_cursor.h" -#include "ardour_ui.h" #include "note.h" #include "hit.h" #include "patch_change.h" #include "sys_ex.h" +#include "ui_config.h" -#include "i18n.h" +#include "pbd/i18n.h" using namespace ARDOUR; using namespace PBD; @@ -89,8 +90,6 @@ using namespace Editing; using namespace std; using Gtkmm2ext::Keyboard; -PBD::Signal1 MidiRegionView::SelectionCleared; - #define MIDI_BP_ZERO ((Config->get_first_midi_bank_is_zero())?0:1) MidiRegionView::MidiRegionView (ArdourCanvas::Container* parent, @@ -103,6 +102,7 @@ MidiRegionView::MidiRegionView (ArdourCanvas::Container* parent, , _current_range_max(0) , _region_relative_time_converter(r->session().tempo_map(), r->position()) , _source_relative_time_converter(r->session().tempo_map(), r->position() - r->start()) + , _region_relative_time_converter_double(r->session().tempo_map(), r->position()) , _active_notes(0) , _note_group (new ArdourCanvas::Container (group)) , _note_diff_command (0) @@ -111,7 +111,6 @@ MidiRegionView::MidiRegionView (ArdourCanvas::Container* parent, , _step_edit_cursor_width (1.0) , _step_edit_cursor_position (0.0) , _channel_selection_scoped_note (0) - , _temporary_note_group (0) , _mouse_state(None) , _pressed_button(0) , _sort_needed (true) @@ -123,6 +122,7 @@ MidiRegionView::MidiRegionView (ArdourCanvas::Container* parent, , _last_event_y (0) , _grabbed_keyboard (false) , _entered (false) + , _note_entered (false) , _mouse_changed_selection (false) { CANVAS_DEBUG_NAME (_note_group, string_compose ("note group for %1", get_item_name())); @@ -131,11 +131,6 @@ MidiRegionView::MidiRegionView (ArdourCanvas::Container* parent, 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 ()); - - PublicEditor& editor (trackview.editor()); - editor.get_selection().ClearMidiNoteSelection.connect (_clear_midi_selection_connection, invalidator (*this), boost::bind (&MidiRegionView::clear_midi_selection, this), gui_context ()); } MidiRegionView::MidiRegionView (ArdourCanvas::Container* parent, @@ -150,6 +145,7 @@ MidiRegionView::MidiRegionView (ArdourCanvas::Container* parent, , _current_range_max(0) , _region_relative_time_converter(r->session().tempo_map(), r->position()) , _source_relative_time_converter(r->session().tempo_map(), r->position() - r->start()) + , _region_relative_time_converter_double(r->session().tempo_map(), r->position()) , _active_notes(0) , _note_group (new ArdourCanvas::Container (group)) , _note_diff_command (0) @@ -158,7 +154,6 @@ MidiRegionView::MidiRegionView (ArdourCanvas::Container* parent, , _step_edit_cursor_width (1.0) , _step_edit_cursor_position (0.0) , _channel_selection_scoped_note (0) - , _temporary_note_group (0) , _mouse_state(None) , _pressed_button(0) , _sort_needed (true) @@ -170,6 +165,7 @@ MidiRegionView::MidiRegionView (ArdourCanvas::Container* parent, , _last_event_y (0) , _grabbed_keyboard (false) , _entered (false) + , _note_entered (false) , _mouse_changed_selection (false) { CANVAS_DEBUG_NAME (_note_group, string_compose ("note group for %1", get_item_name())); @@ -178,11 +174,6 @@ MidiRegionView::MidiRegionView (ArdourCanvas::Container* parent, 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 ()); - - PublicEditor& editor (trackview.editor()); - editor.get_selection().ClearMidiNoteSelection.connect (_clear_midi_selection_connection, invalidator (*this), boost::bind (&MidiRegionView::clear_midi_selection, this), gui_context ()); } void @@ -202,6 +193,7 @@ MidiRegionView::MidiRegionView (const MidiRegionView& other) , _current_range_max(0) , _region_relative_time_converter(other.region_relative_time_converter()) , _source_relative_time_converter(other.source_relative_time_converter()) + , _region_relative_time_converter_double(other.region_relative_time_converter_double()) , _active_notes(0) , _note_group (new ArdourCanvas::Container (get_canvas_group())) , _note_diff_command (0) @@ -210,7 +202,6 @@ MidiRegionView::MidiRegionView (const MidiRegionView& other) , _step_edit_cursor_width (1.0) , _step_edit_cursor_position (0.0) , _channel_selection_scoped_note (0) - , _temporary_note_group (0) , _mouse_state(None) , _pressed_button(0) , _sort_needed (true) @@ -222,6 +213,7 @@ MidiRegionView::MidiRegionView (const MidiRegionView& other) , _last_event_y (0) , _grabbed_keyboard (false) , _entered (false) + , _note_entered (false) , _mouse_changed_selection (false) { init (false); @@ -233,6 +225,7 @@ MidiRegionView::MidiRegionView (const MidiRegionView& other, boost::shared_ptrmidi_source(0)->mutex()); midi_region()->midi_source(0)->load_model(lm); @@ -278,12 +267,12 @@ MidiRegionView::init (bool wfd) RegionView::init (false); - set_height (trackview.current_height()); + //set_height (trackview.current_height()); region_muted (); region_sync_changed (); region_resized (ARDOUR::bounds_change); - region_locked (); + //region_locked (); set_colors (); @@ -298,7 +287,7 @@ MidiRegionView::init (bool wfd) group->raise_to_top(); - midi_view()->midi_track()->PlaybackChannelModeChanged.connect (_channel_mode_changed_connection, invalidator (*this), + midi_view()->midi_track()->playback_filter().ChannelModeChanged.connect (_channel_mode_changed_connection, invalidator (*this), boost::bind (&MidiRegionView::midi_channel_mode_changed, this), gui_context ()); @@ -315,11 +304,6 @@ MidiRegionView::init (bool wfd) 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 ()); - - PublicEditor& editor (trackview.editor()); - editor.get_selection().ClearMidiNoteSelection.connect (_clear_midi_selection_connection, invalidator (*this), boost::bind (&MidiRegionView::clear_midi_selection, this), gui_context ()); } InstrumentInfo& @@ -390,7 +374,6 @@ MidiRegionView::canvas_group_event(GdkEvent* ev) case GDK_BUTTON_RELEASE: r = button_release (&ev->button); - _note_player.reset(); return r; case GDK_MOTION_NOTIFY: @@ -408,7 +391,7 @@ MidiRegionView::canvas_group_event(GdkEvent* ev) bool MidiRegionView::enter_notify (GdkEventCrossing* ev) { - enter_internal(); + enter_internal (ev->state); _entered = true; return false; @@ -430,22 +413,35 @@ MidiRegionView::mouse_mode_changed () set_frame_color(); if (_entered) { - if (trackview.editor().internal_editing()) { - // Switched in to internal editing mode while entered - enter_internal(); - } else { - // Switched out of internal editing mode while entered + if (!trackview.editor().internal_editing()) { + /* Switched out of internal editing mode while entered. + Only necessary for leave as a mouse_mode_change over a region + automatically triggers an enter event. */ leave_internal(); } + else if (trackview.editor().current_mouse_mode() == MouseContent) { + // hide cursor and ghost note after changing to internal edit mode + remove_ghost_note (); + + /* XXX This is problematic as the function is executed for every region + and only for one region _note_entered can be true. Still it's + necessary as to hide the verbose cursor when we're changing from + draw mode to internal edit mode. These lines are the reason why + in some situations no verbose cursor is shown when we enter internal + edit mode over a note. */ + if (!_note_entered) { + hide_verbose_cursor (); + } + } } } void -MidiRegionView::enter_internal() +MidiRegionView::enter_internal (uint32_t state) { if (trackview.editor().current_mouse_mode() == MouseDraw && _mouse_state != AddDragging) { // Show ghost note under pencil - create_ghost_note(_last_event_x, _last_event_y); + create_ghost_note(_last_event_x, _last_event_y, state); } if (!_selection.empty()) { @@ -466,8 +462,9 @@ MidiRegionView::enter_internal() void MidiRegionView::leave_internal() { - trackview.editor().verbose_cursor()->hide (); + hide_verbose_cursor (); remove_ghost_note (); + _note_entered = false; if (_grabbed_keyboard) { Keyboard::magic_widget_drop_focus(); @@ -498,10 +495,10 @@ MidiRegionView::button_press (GdkEventButton* ev) } if (_mouse_state != SelectTouchDragging) { - + _pressed_button = ev->button; _mouse_state = Pressed; - + return true; } @@ -535,15 +532,14 @@ MidiRegionView::button_release (GdkEventButton* ev) switch (editor.current_mouse_mode()) { case MouseRange: - /* no motion occured - simple click */ - clear_selection (); + /* no motion occurred - simple click */ + clear_editor_note_selection (); _mouse_changed_selection = true; break; case MouseContent: case MouseTimeFX: { - clear_selection(); _mouse_changed_selection = true; if (Keyboard::is_insert_note_event(ev)) { @@ -554,29 +550,18 @@ MidiRegionView::button_release (GdkEventButton* ev) event_y = ev->y; group->canvas_to_item (event_x, event_y); - Evoral::Beats beats = get_grid_beats(editor.pixel_to_sample(event_x)); - - /* 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 -= Evoral::Beats::tick(); - - create_note_at (editor.pixel_to_sample (event_x), event_y, beats, true); + Evoral::Beats beats = get_grid_beats(editor.pixel_to_sample(event_x) + _region->position()); + create_note_at (editor.pixel_to_sample (event_x), event_y, beats, ev->state, true); + } else { + clear_editor_note_selection (); } break; } case MouseDraw: { - Evoral::Beats beats = get_grid_beats(editor.pixel_to_sample(event_x)); - - /* 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 -= Evoral::Beats::tick(); - - create_note_at (editor.pixel_to_sample (event_x), event_y, beats, true); - + Evoral::Beats beats = get_grid_beats(editor.pixel_to_sample(event_x) + _region->position()); + create_note_at (editor.pixel_to_sample (event_x), event_y, beats, ev->state, true); break; } default: @@ -586,11 +571,12 @@ MidiRegionView::button_release (GdkEventButton* ev) _mouse_state = None; break; - case SelectRectDragging: case AddDragging: + /* Only create a ghost note when we added a note, not when we were drag-selecting. */ + create_ghost_note (ev->x, ev->y, ev->state); + case SelectRectDragging: editor.drags()->end_grab ((GdkEvent *) ev); _mouse_state = None; - create_ghost_note (ev->x, ev->y); break; @@ -599,7 +585,7 @@ MidiRegionView::button_release (GdkEventButton* ev) } if (_mouse_changed_selection) { - trackview.editor().begin_reversible_selection_op (_("Mouse Selection Change")); + trackview.editor().begin_reversible_selection_op (X_("Mouse Selection Change")); trackview.editor().commit_reversible_selection_op (); } @@ -611,25 +597,33 @@ MidiRegionView::motion (GdkEventMotion* ev) { PublicEditor& editor = trackview.editor (); - if (!_ghost_note && editor.current_mouse_mode() == MouseContent && - Keyboard::modifier_state_contains (ev->state, Keyboard::insert_note_modifier()) && - _mouse_state != AddDragging) { + if (!_note_entered) { - create_ghost_note (ev->x, ev->y); + if (!_ghost_note && editor.current_mouse_mode() == MouseContent && + Keyboard::modifier_state_contains (ev->state, Keyboard::insert_note_modifier()) && + _mouse_state != AddDragging) { - } else if (_ghost_note && editor.current_mouse_mode() == MouseContent && - Keyboard::modifier_state_contains (ev->state, Keyboard::insert_note_modifier())) { + create_ghost_note (ev->x, ev->y, ev->state); - update_ghost_note (ev->x, ev->y); + } else if (_ghost_note && editor.current_mouse_mode() == MouseContent && + Keyboard::modifier_state_contains (ev->state, Keyboard::insert_note_modifier())) { - } else if (_ghost_note && editor.current_mouse_mode() == MouseContent) { + update_ghost_note (ev->x, ev->y, ev->state); - remove_ghost_note (); - editor.verbose_cursor()->hide (); + } else if (_ghost_note && editor.current_mouse_mode() == MouseContent) { + + remove_ghost_note (); + hide_verbose_cursor (); - } else if (_ghost_note && editor.current_mouse_mode() == MouseDraw) { + } else if (editor.current_mouse_mode() == MouseDraw) { - update_ghost_note (ev->x, ev->y); + if (_ghost_note) { + update_ghost_note (ev->x, ev->y, ev->state); + } + else { + create_ghost_note (ev->x, ev->y, ev->state); + } + } } /* any motion immediately hides velocity text that may have been visible */ @@ -642,19 +636,19 @@ MidiRegionView::motion (GdkEventMotion* ev) case Pressed: if (_pressed_button == 1) { - + MouseMode m = editor.current_mouse_mode(); - + if (m == MouseDraw || (m == MouseContent && Keyboard::modifier_state_contains (ev->state, Keyboard::insert_note_modifier()))) { editor.drags()->set (new NoteCreateDrag (dynamic_cast (&editor), group, this), (GdkEvent *) ev); _mouse_state = AddDragging; remove_ghost_note (); - editor.verbose_cursor()->hide (); + hide_verbose_cursor (); return true; } else if (m == MouseContent) { editor.drags()->set (new MidiRubberbandSelectDrag (dynamic_cast (&editor), this), (GdkEvent *) ev); if (!Keyboard::modifier_state_equals (ev->state, Keyboard::TertiaryModifier)) { - clear_selection (); + clear_editor_note_selection (); _mouse_changed_selection = true; } _mouse_state = SelectRectDragging; @@ -673,7 +667,7 @@ MidiRegionView::motion (GdkEventMotion* ev) case AddDragging: editor.drags()->motion_handler ((GdkEvent *) ev, false); break; - + case SelectTouchDragging: return false; @@ -682,7 +676,7 @@ MidiRegionView::motion (GdkEventMotion* ev) } - /* we may be dragging some non-note object (eg. patch-change, sysex) + /* we may be dragging some non-note object (eg. patch-change, sysex) */ return editor.drags()->motion_handler ((GdkEvent *) ev, false); @@ -696,17 +690,19 @@ 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. + if (Keyboard::modifier_state_equals (ev->state, Keyboard::PrimaryModifier) || + Keyboard::modifier_state_equals (ev->state, Keyboard::TertiaryModifier)) { + /* XXX: bit of a hack; allow PrimaryModifier and TertiaryModifier scroll + * through so that it still works for navigation. */ return false; } - trackview.editor().verbose_cursor()->hide (); + hide_verbose_cursor (); bool fine = !Keyboard::modifier_state_contains (ev->state, Keyboard::SecondaryModifier); - bool together = Keyboard::modifier_state_contains (ev->state, Keyboard::TertiaryModifier); + Keyboard::ModifierMask mask_together(Keyboard::PrimaryModifier|Keyboard::TertiaryModifier); + bool together = Keyboard::modifier_state_contains (ev->state, mask_together); if (ev->direction == GDK_SCROLL_UP) { change_velocities (true, fine, false, together); @@ -729,13 +725,13 @@ MidiRegionView::key_press (GdkEventKey* ev) */ bool unmodified = Keyboard::no_modifier_keys_pressed (ev); - + if (unmodified && (ev->keyval == GDK_Alt_L || ev->keyval == GDK_Alt_R)) { _mouse_state = SelectTouchDragging; return true; } else if (ev->keyval == GDK_Escape && unmodified) { - clear_selection(); + clear_editor_note_selection (); _mouse_state = None; } else if (ev->keyval == GDK_comma || ev->keyval == GDK_period) { @@ -760,7 +756,7 @@ MidiRegionView::key_press (GdkEventKey* ev) } else if (ev->keyval == GDK_Tab || ev->keyval == GDK_ISO_Left_Tab) { - trackview.editor().begin_reversible_selection_op (_("Select Adjacent Note")); + trackview.editor().begin_reversible_selection_op (X_("Select Adjacent Note")); if (Keyboard::modifier_state_contains (ev->state, Keyboard::PrimaryModifier)) { goto_previous_note (Keyboard::modifier_state_contains (ev->state, Keyboard::TertiaryModifier)); @@ -874,7 +870,7 @@ 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. */ @@ -920,7 +916,7 @@ MidiRegionView::show_list_editor () * \param snap_t true to snap t to the grid, otherwise false. */ void -MidiRegionView::create_note_at (framepos_t t, double y, Evoral::Beats length, bool snap_t) +MidiRegionView::create_note_at (framepos_t t, double y, Evoral::Beats length, uint32_t state, bool shift_snap) { if (length < 2 * DBL_EPSILON) { return; @@ -928,15 +924,15 @@ MidiRegionView::create_note_at (framepos_t t, double y, Evoral::Beats length, bo MidiTimeAxisView* const mtv = dynamic_cast(&trackview); MidiStreamView* const view = mtv->midi_view(); + boost::shared_ptr mr = boost::dynamic_pointer_cast (_region); - // Start of note in frames relative to region start - if (snap_t) { - framecnt_t grid_frames; - t = snap_frame_to_grid_underneath (t, grid_frames); + if (!mr) { + return; } - const MidiModel::TimeType beat_time = region_frames_to_region_beats( - t + _region->start()); + // Start of note in frames relative to region start + const int32_t divisions = trackview.editor().get_grid_music_divisions (state); + Evoral::Beats beat_time = snap_frame_to_grid_underneath (t, divisions, shift_snap); const double note = view->y_to_note(y); const uint8_t chan = mtv->get_channel_for_add(); @@ -953,7 +949,7 @@ MidiRegionView::create_note_at (framepos_t t, double y, Evoral::Beats length, bo start_note_diff_command(_("add note")); - clear_selection (); + clear_editor_note_selection (); note_diff_add_note (new_note, true, false); apply_diff(); @@ -962,9 +958,10 @@ MidiRegionView::create_note_at (framepos_t t, double y, Evoral::Beats length, bo } void -MidiRegionView::clear_events (bool with_selection_signal) +MidiRegionView::clear_events () { - clear_selection (with_selection_signal); + // clear selection without signaling + clear_selection_internal (); MidiGhostRegion* gr; for (std::vector::iterator g = ghosts.begin(); g != ghosts.end(); ++g) { @@ -991,7 +988,7 @@ MidiRegionView::display_model(boost::shared_ptr model) content_connection.disconnect (); _model->ContentsChanged.connect (content_connection, invalidator (*this), boost::bind (&MidiRegionView::redisplay_model, this), gui_context()); /* Don't signal as nobody else needs to know until selection has been altered. */ - clear_events (false); + clear_events (); if (_enable_display) { redisplay_model(); @@ -1066,6 +1063,9 @@ MidiRegionView::apply_diff (bool as_subcommand) } } + midi_view()->midi_track()->midi_playlist()->region_edited( + _region, _note_diff_command); + if (as_subcommand) { _model->apply_command_as_subcommand (*trackview.session(), _note_diff_command); } else { @@ -1074,7 +1074,6 @@ MidiRegionView::apply_diff (bool as_subcommand) } _note_diff_command = 0; - midi_view()->midi_track()->playlist_modified(); if (add_or_remove) { _marked_for_selection.clear(); @@ -1091,7 +1090,7 @@ MidiRegionView::abort_command() { delete _note_diff_command; _note_diff_command = 0; - clear_selection(); + clear_editor_note_selection(); } NoteBase* @@ -1177,21 +1176,20 @@ MidiRegionView::redisplay_model() _optimization_iterator = _events.begin(); bool empty_when_starting = _events.empty(); + NoteBase* cne; for (MidiModel::Notes::iterator n = notes.begin(); n != notes.end(); ++n) { boost::shared_ptr note (*n); - NoteBase* cne; bool visible; if (note_in_region_range (note, visible)) { - - if (!empty_when_starting && (cne = find_canvas_note (note)) != 0) { - cne->validate (); - update_note (cne); + if (!empty_when_starting && (cne = find_canvas_note (note)) != 0) { if (visible) { + cne->validate (); + update_note (cne); cne->show (); } else { cne->hide (); @@ -1210,7 +1208,7 @@ MidiRegionView::redisplay_model() } } else { - + if (!empty_when_starting && (cne = find_canvas_note (note)) != 0) { cne->validate (); cne->hide (); @@ -1223,17 +1221,17 @@ MidiRegionView::redisplay_model() if (!empty_when_starting) { for (Events::iterator i = _events.begin(); i != _events.end(); ) { if (!(*i)->valid ()) { - + for (vector::iterator j = ghosts.begin(); j != ghosts.end(); ++j) { MidiGhostRegion* gr = dynamic_cast (*j); if (gr) { gr->remove_note (*i); } } - + delete *i; i = _events.erase (i); - + } else { ++i; } @@ -1292,12 +1290,12 @@ MidiRegionView::display_sysexes() bool have_periodic_system_messages = false; bool display_periodic_messages = true; - if (!ARDOUR_UI::config()->get_never_display_periodic_midi()) { + if (!UIConfiguration::instance().get_never_display_periodic_midi()) { for (MidiModel::SysExes::const_iterator i = _model->sysexes().begin(); i != _model->sysexes().end(); ++i) { - const boost::shared_ptr > mev = + const boost::shared_ptr > mev = boost::static_pointer_cast > (*i); - + if (mev) { if (mev->is_spp() || mev->is_mtc_quarter() || mev->is_mtc_full()) { have_periodic_system_messages = true; @@ -1305,22 +1303,22 @@ MidiRegionView::display_sysexes() } } } - + 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; @@ -1328,7 +1326,7 @@ MidiRegionView::display_sysexes() for (MidiModel::SysExes::const_iterator i = _model->sysexes().begin(); i != _model->sysexes().end(); ++i) { - const boost::shared_ptr > mev = + const boost::shared_ptr > mev = boost::static_pointer_cast > (*i); Evoral::Beats time = (*i)->time(); @@ -1376,9 +1374,7 @@ MidiRegionView::~MidiRegionView () { in_destructor = true; - trackview.editor().verbose_cursor()->hide (); - - note_delete_connection.disconnect (); + hide_verbose_cursor (); delete _list_editor; @@ -1388,34 +1384,38 @@ MidiRegionView::~MidiRegionView () end_write(); } - _selection_cleared_connection.disconnect (); - _selection.clear(); - clear_events (false); + clear_events (); delete _note_group; delete _note_diff_command; delete _step_edit_cursor; - delete _temporary_note_group; } void MidiRegionView::region_resized (const PropertyChange& what_changed) { - RegionView::region_resized(what_changed); + RegionView::region_resized(what_changed); // calls RegionView::set_duration() if (what_changed.contains (ARDOUR::Properties::position)) { _region_relative_time_converter.set_origin_b(_region->position()); - set_duration(_region->length(), 0); - if (_enable_display) { - redisplay_model(); - } + _region_relative_time_converter_double.set_origin_b(_region->position()); + /* reset_width dependent_items() redisplays model */ + } if (what_changed.contains (ARDOUR::Properties::start) || what_changed.contains (ARDOUR::Properties::position)) { _source_relative_time_converter.set_origin_b (_region->position() - _region->start()); } + /* catch end and start trim so we can update the view*/ + if (!what_changed.contains (ARDOUR::Properties::start) && + what_changed.contains (ARDOUR::Properties::length)) { + enable_display (true); + } else if (what_changed.contains (ARDOUR::Properties::start) && + what_changed.contains (ARDOUR::Properties::length)) { + enable_display (true); + } } void @@ -1496,6 +1496,21 @@ MidiRegionView::apply_note_range (uint8_t min, uint8_t max, bool force) const double y0 = 1. + floor (midi_stream_view()->note_to_y(note->note())); const double y1 = y0 + std::max(1., floor(midi_stream_view()->note_height()) - 1.); + if (y0 < 0 || y1 >= _height) { + /* During DnD, the region uses the 'old/current' + * midi_stream_view()'s range and its position/height calculation. + * + * Ideally DnD would decouple the midi_stream_view() for the + * region(s) being dragged and set it to the target's range + * (or in case of the drop-zone, FullRange). + * but I don't see how this can be done without major rework. + * + * For now, just prevent visual bleeding of events in case + * the target-track is smaller. + */ + event->hide(); + continue; + } cnote->set_y0 (y0); cnote->set_y1 (y1); @@ -1516,9 +1531,9 @@ MidiRegionView::add_ghost (TimeAxisView& tv) /* if ghost is inserted into midi track, use a dedicated midi ghost canvas group to allow having midi notes on top of note lines and waveforms. */ - ghost = new MidiGhostRegion (*mtv->midi_view(), trackview, unit_position); + ghost = new MidiGhostRegion (*this, *mtv->midi_view(), trackview, unit_position); } else { - ghost = new MidiGhostRegion (tv, trackview, unit_position); + ghost = new MidiGhostRegion (*this, tv, trackview, unit_position); } for (Events::iterator i = _events.begin(); i != _events.end(); ++i) { @@ -1529,8 +1544,6 @@ MidiRegionView::add_ghost (TimeAxisView& tv) ghost->set_duration (_region->length() / samples_per_pixel); ghosts.push_back (ghost); - GhostRegion::CatchDeletion.connect (*this, invalidator (*this), boost::bind (&RegionView::remove_ghost, this, _1), gui_context()); - return ghost; } @@ -1607,7 +1620,7 @@ MidiRegionView::extend_active_notes() void MidiRegionView::play_midi_note(boost::shared_ptr note) { - if (_no_sound_notes || !ARDOUR_UI::config()->get_sound_midi_notes()) { + if (_no_sound_notes || !UIConfiguration::instance().get_sound_midi_notes()) { return; } @@ -1634,7 +1647,7 @@ MidiRegionView::start_playing_midi_note(boost::shared_ptr note) void MidiRegionView::start_playing_midi_chord (vector > notes) { - if (_no_sound_notes || !ARDOUR_UI::config()->get_sound_midi_notes()) { + if (_no_sound_notes || !UIConfiguration::instance().get_sound_midi_notes()) { return; } @@ -1644,25 +1657,22 @@ MidiRegionView::start_playing_midi_chord (vector > n return; } - _note_player = boost::shared_ptr(new NotePlayer(route_ui->midi_track())); + NotePlayer* player = new NotePlayer (route_ui->midi_track()); for (vector >::iterator n = notes.begin(); n != notes.end(); ++n) { - _note_player->add (*n); + player->add (*n); } - _note_player->on (); + player->play (); } bool MidiRegionView::note_in_region_range (const boost::shared_ptr note, bool& visible) const { - /* This is imprecise due to all the conversion conversion involved, so only - hide notes if they seem to start more than one tick before the start. */ - const framecnt_t tick_frames = Evoral::Beats::tick().to_ticks(trackview.session()->frame_rate()); - const framepos_t note_start_frames = source_beats_to_region_frames (note->time()); - const bool outside = ((note_start_frames <= -tick_frames) || - (note_start_frames > _region->last_frame())); + const boost::shared_ptr midi_reg = midi_region(); + const bool outside = (note->time() < midi_reg->start_beats() || + note->time() > midi_reg->start_beats() + midi_reg->length_beats()); visible = (note->note() >= midi_stream_view()->lowest_note()) && (note->note() <= midi_stream_view()->highest_note()); @@ -1689,23 +1699,36 @@ MidiRegionView::update_note (NoteBase* note, bool update_ghost_regions) void MidiRegionView::update_sustained (Note* ev, bool update_ghost_regions) { + TempoMap& map (trackview.session()->tempo_map()); + const boost::shared_ptr mr = midi_region(); boost::shared_ptr note = ev->note(); - const double x = trackview.editor().sample_to_pixel (source_beats_to_region_frames (note->time())); + const double qn_note_time = note->time().to_double() + ((_region->pulse() * 4.0) - mr->start_beats().to_double()); + const framepos_t note_start_frames = map.frame_at_quarter_note (qn_note_time) - _region->position(); + const double x0 = trackview.editor().sample_to_pixel (note_start_frames); + double x1; const double y0 = 1 + floor(midi_stream_view()->note_to_y(note->note())); - - ev->set_x0 (x); - ev->set_y0 (y0); + double y1; /* trim note display to not overlap the end of its region */ - if (note->length() > 0) { - const framepos_t note_end_frames = min (source_beats_to_region_frames (note->end_time()), _region->length()); - ev->set_x1 (trackview.editor().sample_to_pixel (note_end_frames)); + Evoral::Beats note_end_time = note->end_time(); + + if (note->end_time() > mr->start_beats() + mr->length_beats()) { + note_end_time = mr->start_beats() + mr->length_beats(); + } + const double session_qn_start = (_region->pulse() * 4.0) - mr->start_beats().to_double(); + const double quarter_note_end_time = session_qn_start + note_end_time.to_double(); + + const framepos_t note_end_frames = map.frame_at_quarter_note (quarter_note_end_time) - _region->position(); + x1 = std::max(1., trackview.editor().sample_to_pixel (note_end_frames)) - 1; } else { - ev->set_x1 (trackview.editor().sample_to_pixel (_region->length())); + x1 = std::max(1., trackview.editor().sample_to_pixel (_region->length())) - 1; } - ev->set_y1 (y0 + std::max(1., floor(midi_stream_view()->note_height()) - 1)); + y1 = y0 + std::max(1., floor(midi_stream_view()->note_height()) - 1); + + ArdourCanvas::Rect rect (x0, y0, x1, y1); + ev->set (rect); if (!note->length()) { if (_active_notes && note->note() < 128) { @@ -1713,7 +1736,7 @@ MidiRegionView::update_sustained (Note* ev, bool update_ghost_regions) if (old_rect) { /* There is an active note on this key, so we have a stuck note. Finish the old rectangle here. */ - old_rect->set_x1 (x); + old_rect->set_x1 (x1); old_rect->set_outline_all (); } _active_notes[note->note()] = ev; @@ -1729,8 +1752,9 @@ 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())); + const uint32_t base_col = ev->base_color(); + ev->set_fill_color(base_col); + ev->set_outline_color(ev->calculate_outline(base_col, ev->selected())); if (update_ghost_regions) { for (std::vector::iterator i = ghosts.begin(); i != ghosts.end(); ++i) { @@ -1747,11 +1771,20 @@ MidiRegionView::update_hit (Hit* ev, bool update_ghost_regions) { boost::shared_ptr note = ev->note(); - const framepos_t note_start_frames = source_beats_to_region_frames(note->time()); + const double note_time_qn = note->time().to_double() + ((_region->pulse() * 4.0) - midi_region()->start_beats().to_double()); + const framepos_t note_start_frames = trackview.session()->tempo_map().frame_at_quarter_note (note_time_qn) - _region->position(); + const double x = trackview.editor().sample_to_pixel(note_start_frames); const double diamond_size = std::max(1., floor(midi_stream_view()->note_height()) - 2.); const double y = 1.5 + floor(midi_stream_view()->note_to_y(note->note())) + diamond_size * .5; + // see DnD note in MidiRegionView::apply_note_range() above + if (y <= 0 || y >= _height) { + ev->hide(); + } else { + ev->show(); + } + ev->set_position (ArdourCanvas::Duple (x, y)); ev->set_height (diamond_size); @@ -1848,7 +1881,8 @@ MidiRegionView::step_add_note (uint8_t channel, uint8_t number, uint8_t velocity framepos_t region_end = _region->last_frame(); if (end_frame > region_end) { - _region->set_length (end_frame - _region->position()); + /* XX sets length in beats from audio space. make musical */ + _region->set_length (end_frame - _region->position(), 0); } MidiTimeAxisView* const mtv = dynamic_cast(&trackview); @@ -1860,7 +1894,7 @@ MidiRegionView::step_add_note (uint8_t channel, uint8_t number, uint8_t velocity start_note_diff_command (_("step add")); - clear_selection (); + clear_editor_note_selection (); note_diff_add_note (new_note, true, false); apply_diff(); @@ -1926,8 +1960,8 @@ patch_applies (const ARDOUR::MidiModel::constPatchChangePtr pc, Evoral::Beats ti { return pc->time() <= time && pc->channel() == channel; } - -void + +void MidiRegionView::get_patch_key_at (Evoral::Beats time, uint8_t channel, MIDI::Name::PatchPrimaryKey& key) const { // The earliest event not before time @@ -2069,7 +2103,7 @@ MidiRegionView::step_patch (PatchChange& patch, bool bank, int delta) } void -MidiRegionView::maybe_remove_deleted_note_from_selection (NoteBase* cne) +MidiRegionView::note_deleted (NoteBase* cne) { if (_selection.empty()) { return; @@ -2085,6 +2119,10 @@ MidiRegionView::delete_selection() return; } + if (trackview.editor().drags()->active()) { + return; + } + start_note_diff_command (_("delete selection")); for (Selection::iterator i = _selection.begin(); i != _selection.end(); ++i) { @@ -2096,6 +2134,7 @@ MidiRegionView::delete_selection() _selection.clear(); apply_diff (); + hide_verbose_cursor (); } void @@ -2105,69 +2144,54 @@ MidiRegionView::delete_note (boost::shared_ptr n) _note_diff_command->remove (n); apply_diff (); - trackview.editor().verbose_cursor()->hide (); + hide_verbose_cursor (); } void -MidiRegionView::clear_selection_except (NoteBase* ev, bool signal) +MidiRegionView::clear_editor_note_selection () { - for (Selection::iterator i = _selection.begin(); i != _selection.end(); ) { - if ((*i) != ev) { - Selection::iterator tmp = i; - ++tmp; + DEBUG_TRACE(DEBUG::Selection, "MRV::clear_editor_note_selection\n"); + PublicEditor& editor(trackview.editor()); + editor.get_selection().clear_midi_notes(); +} - (*i)->set_selected (false); - (*i)->hide_velocity (); - _selection.erase (i); +void +MidiRegionView::clear_selection () +{ + clear_selection_internal(); + PublicEditor& editor(trackview.editor()); + editor.get_selection().remove(this); +} - i = tmp; - } else { - ++i; - } +void +MidiRegionView::clear_selection_internal () +{ + DEBUG_TRACE(DEBUG::Selection, "MRV::clear_selection_internal\n"); + + for (Selection::iterator i = _selection.begin(); i != _selection.end(); ++i) { + (*i)->set_selected(false); + (*i)->hide_velocity(); } + _selection.clear(); - if (!ev && _entered) { + if (_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. - */ - - if (signal) { - SelectionCleared (this); /* EMIT 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 - regionview from the editor selection, since we're about to add - another note, and thus put/keep this regionview in the editor - selection anyway. - */ - - if (!ev->selected()) { - add_to_selection (ev); - if (selection_was_empty && _entered) { - // Grab keyboard for moving notes with arrow keys - Keyboard::magic_widget_grab_focus(); - _grabbed_keyboard = true; - } - } + clear_editor_note_selection(); + add_to_selection(ev); } void MidiRegionView::select_all_notes () { - clear_selection (); + clear_editor_note_selection (); for (Events::iterator i = _events.begin(); i != _events.end(); ++i) { add_to_selection (*i); @@ -2177,7 +2201,7 @@ MidiRegionView::select_all_notes () void MidiRegionView::select_range (framepos_t start, framepos_t end) { - clear_selection (); + clear_editor_note_selection (); for (Events::iterator i = _events.begin(); i != _events.end(); ++i) { framepos_t t = source_beats_to_absolute_frames((*i)->note()->time()); @@ -2225,13 +2249,13 @@ MidiRegionView::select_matching_notes (uint8_t notenum, uint16_t channel_mask, b uint8_t high_note = 0; MidiModel::Notes& notes (_model->notes()); _optimization_iterator = _events.begin(); - + if (extend && !have_selection) { extend = false; } /* scan existing selection to get note range */ - + for (Selection::iterator i = _selection.begin(); i != _selection.end(); ++i) { if ((*i)->note()->note() < low_note) { low_note = (*i)->note()->note(); @@ -2240,9 +2264,9 @@ MidiRegionView::select_matching_notes (uint8_t notenum, uint16_t channel_mask, b high_note = (*i)->note()->note(); } } - + if (!add) { - clear_selection (); + clear_editor_note_selection (); if (!extend && (low_note == high_note) && (high_note == notenum)) { /* only note previously selected is the one we are @@ -2317,11 +2341,8 @@ void MidiRegionView::note_selected (NoteBase* ev, bool add, bool extend) { if (!add) { - clear_selection_except (ev); - if (!_selection.empty()) { - PublicEditor& editor (trackview.editor()); - editor.get_selection().add (this); - } + clear_editor_note_selection(); + add_to_selection (ev); } if (!extend) { @@ -2507,7 +2528,7 @@ MidiRegionView::move_selection(double dx, double dy, double cumulative_dy) (*i)->move_event(dx, dy); } - if (dy && !_selection.empty() && !_no_sound_notes && ARDOUR_UI::config()->get_sound_midi_notes()) { + if (dy && !_selection.empty() && !_no_sound_notes && UIConfiguration::instance().get_sound_midi_notes()) { if (to_play.size() > 1) { @@ -2559,14 +2580,15 @@ MidiRegionView::note_dropped(NoteBase *, frameoffset_t dt, int8_t dnote) if (highest_note_in_selection + dnote > 127) { highest_note_difference = highest_note_in_selection - 127; } + TempoMap& map (trackview.session()->tempo_map()); start_note_diff_command (_("move notes")); for (Selection::iterator i = _selection.begin(); i != _selection.end() ; ++i) { - - framepos_t new_frames = source_beats_to_absolute_frames ((*i)->note()->time()) + dt; - Evoral::Beats new_time = absolute_frames_to_source_beats (new_frames); + double const start_qn = (_region->pulse() * 4.0) - midi_region()->start_beats().to_double(); + framepos_t new_frames = map.frame_at_quarter_note (start_qn + (*i)->note()->time().to_double()) + dt; + Evoral::Beats new_time = Evoral::Beats (map.quarter_note_at_frame (new_frames) - start_qn); if (new_time < 0) { continue; } @@ -2595,22 +2617,25 @@ MidiRegionView::note_dropped(NoteBase *, frameoffset_t dt, int8_t dnote) } /** @param x Pixel relative to the region position. + * @param ensure_snap defaults to false. true = snap always, ignoring snap mode and magnetic snap. + * Used for inverting the snap logic with key modifiers and snap delta calculation. * @return Snapped frame relative to the region position. */ framepos_t -MidiRegionView::snap_pixel_to_sample(double x) +MidiRegionView::snap_pixel_to_sample(double x, bool ensure_snap) { PublicEditor& editor (trackview.editor()); - return snap_frame_to_frame (editor.pixel_to_sample (x)); + return snap_frame_to_frame (editor.pixel_to_sample (x), ensure_snap); } /** @param x Pixel relative to the region position. + * @param ensure_snap defaults to false. true = ignore magnetic snap and snap mode (used for snap delta calculation). * @return Snapped pixel relative to the region position. */ double -MidiRegionView::snap_to_pixel(double x) +MidiRegionView::snap_to_pixel(double x, bool ensure_snap) { - return (double) trackview.editor().sample_to_pixel(snap_pixel_to_sample(x)); + return (double) trackview.editor().sample_to_pixel(snap_pixel_to_sample(x, ensure_snap)); } double @@ -2661,6 +2686,12 @@ MidiRegionView::region_frames_to_region_beats(framepos_t frames) const return _region_relative_time_converter.from(frames); } +double +MidiRegionView::region_frames_to_region_beats_double (framepos_t frames) const +{ + return _region_relative_time_converter_double.from(frames); +} + void MidiRegionView::begin_resizing (bool /*at_front*/) { @@ -2675,12 +2706,12 @@ MidiRegionView::begin_resizing (bool /*at_front*/) resize_data->note = note; // create a new SimpleRect from the note which will be the resize preview - ArdourCanvas::Rectangle *resize_rect = new ArdourCanvas::Rectangle (_note_group, + ArdourCanvas::Rectangle *resize_rect = new ArdourCanvas::Rectangle (_note_group, ArdourCanvas::Rect (note->x0(), note->y0(), note->x0(), note->y1())); // calculate the colors: get the color settings uint32_t fill_color = UINT_RGBA_CHANGE_A( - ARDOUR_UI::config()->color ("midi note selected"), + UIConfiguration::instance().color ("midi note selected"), 128); // make the resize preview notes more transparent and bright @@ -2693,7 +2724,7 @@ MidiRegionView::begin_resizing (bool /*at_front*/) 0.85)); resize_rect->set_outline_color (NoteBase::calculate_outline ( - ARDOUR_UI::config()->color ("midi note selected"))); + UIConfiguration::instance().color ("midi note selected"))); resize_data->resize_rect = resize_rect; _resize_data.push_back(resize_data); @@ -2709,11 +2740,15 @@ MidiRegionView::begin_resizing (bool /*at_front*/) * a difference when multiple notes are being resized; in relative mode, each note's length is changed by the * amount of the drag. In non-relative mode, all selected notes are set to have the same start or end point * as the \a primary note. + * @param snap_delta snap offset of the primary note in pixels. used in SnapRelative SnapDelta mode. + * @param with_snap true if snap is to be used to determine the position, false if no snap is to be used. */ void -MidiRegionView::update_resizing (NoteBase* primary, bool at_front, double delta_x, bool relative) +MidiRegionView::update_resizing (NoteBase* primary, bool at_front, double delta_x, bool relative, double snap_delta, bool with_snap) { + TempoMap& tmap (trackview.session()->tempo_map()); bool cursor_set = false; + bool const ensure_snap = trackview.editor().snap_mode () != SnapMagnetic; for (std::vector::iterator i = _resize_data.begin(); i != _resize_data.end(); ++i) { ArdourCanvas::Rectangle* resize_rect = (*i)->resize_rect; @@ -2722,15 +2757,15 @@ MidiRegionView::update_resizing (NoteBase* primary, bool at_front, double delta_ if (at_front) { if (relative) { - current_x = canvas_note->x0() + delta_x; + current_x = canvas_note->x0() + delta_x + snap_delta; } else { - current_x = primary->x0() + delta_x; + current_x = primary->x0() + delta_x + snap_delta; } } else { if (relative) { - current_x = canvas_note->x1() + delta_x; + current_x = canvas_note->x1() + delta_x + snap_delta; } else { - current_x = primary->x1() + delta_x; + current_x = primary->x1() + delta_x + snap_delta; } } @@ -2744,26 +2779,57 @@ MidiRegionView::update_resizing (NoteBase* primary, bool at_front, double delta_ } if (at_front) { - resize_rect->set_x0 (snap_to_pixel(current_x)); + if (with_snap) { + resize_rect->set_x0 (snap_to_pixel (current_x, ensure_snap) - snap_delta); + } else { + resize_rect->set_x0 (current_x - snap_delta); + } resize_rect->set_x1 (canvas_note->x1()); } else { - resize_rect->set_x1 (snap_to_pixel(current_x)); + if (with_snap) { + resize_rect->set_x1 (snap_to_pixel (current_x, ensure_snap) - snap_delta); + } else { + resize_rect->set_x1 (current_x - snap_delta); + } resize_rect->set_x0 (canvas_note->x0()); } if (!cursor_set) { - const double snapped_x = snap_pixel_to_sample (current_x); - Evoral::Beats beats = region_frames_to_region_beats (snapped_x); - Evoral::Beats len = Evoral::Beats(); + /* Convert snap delta from pixels to beats. */ + framepos_t snap_delta_samps = trackview.editor().pixel_to_sample (snap_delta); + double snap_delta_beats = 0.0; + int sign = 1; + + /* negative beat offsets aren't allowed */ + if (snap_delta_samps > 0) { + snap_delta_beats = region_frames_to_region_beats_double (snap_delta_samps); + } else if (snap_delta_samps < 0) { + snap_delta_beats = region_frames_to_region_beats_double ( - snap_delta_samps); + sign = -1; + } + + double snapped_x; + int32_t divisions = 0; + + if (with_snap) { + snapped_x = snap_pixel_to_sample (current_x, ensure_snap); + divisions = trackview.editor().get_grid_music_divisions (0); + } else { + snapped_x = trackview.editor ().pixel_to_sample (current_x); + } + const Evoral::Beats beats = Evoral::Beats (tmap.exact_beat_at_frame (snapped_x + midi_region()->position(), divisions) + - midi_region()->beat()) + midi_region()->start_beats(); + + Evoral::Beats len = Evoral::Beats(); if (at_front) { if (beats < canvas_note->note()->end_time()) { - len = canvas_note->note()->time() - beats; + len = canvas_note->note()->time() - beats + (sign * snap_delta_beats); len += canvas_note->note()->length(); } } else { if (beats >= canvas_note->note()->time()) { - len = beats - canvas_note->note()->time(); + len = beats - canvas_note->note()->time() - (sign * snap_delta_beats); } } @@ -2784,9 +2850,13 @@ MidiRegionView::update_resizing (NoteBase* primary, bool at_front, double delta_ * Parameters the same as for \a update_resizing(). */ void -MidiRegionView::commit_resizing (NoteBase* primary, bool at_front, double delta_x, bool relative) +MidiRegionView::commit_resizing (NoteBase* primary, bool at_front, double delta_x, bool relative, double snap_delta, bool with_snap) { _note_diff_command = _model->new_note_diff_command (_("resize notes")); + TempoMap& tmap (trackview.session()->tempo_map()); + + /* XX why doesn't snap_pixel_to_sample() handle this properly? */ + bool const ensure_snap = trackview.editor().snap_mode () != SnapMagnetic; for (std::vector::iterator i = _resize_data.begin(); i != _resize_data.end(); ++i) { Note* canvas_note = (*i)->note; @@ -2795,20 +2865,20 @@ MidiRegionView::commit_resizing (NoteBase* primary, bool at_front, double delta_ /* Get the new x position for this resize, which is in pixels relative * to the region position. */ - + double current_x; if (at_front) { if (relative) { - current_x = canvas_note->x0() + delta_x; + current_x = canvas_note->x0() + delta_x + snap_delta; } else { - current_x = primary->x0() + delta_x; + current_x = primary->x0() + delta_x + snap_delta; } } else { if (relative) { - current_x = canvas_note->x1() + delta_x; + current_x = canvas_note->x1() + delta_x + snap_delta; } else { - current_x = primary->x1() + delta_x; + current_x = primary->x1() + delta_x + snap_delta; } } @@ -2819,16 +2889,36 @@ MidiRegionView::commit_resizing (NoteBase* primary, bool at_front, double delta_ current_x = trackview.editor().sample_to_pixel(_region->length()); } - /* Convert that to a frame within the source */ - current_x = snap_pixel_to_sample (current_x) + _region->start (); + /* Convert snap delta from pixels to beats with sign. */ + framepos_t snap_delta_samps = trackview.editor().pixel_to_sample (snap_delta); + double snap_delta_beats = 0.0; + int sign = 1; + + if (snap_delta_samps > 0) { + snap_delta_beats = region_frames_to_region_beats_double (snap_delta_samps); + } else if (snap_delta_samps < 0) { + snap_delta_beats = region_frames_to_region_beats_double ( - snap_delta_samps); + sign = -1; + } + + uint32_t divisions = 0; + /* Convert the new x position to a frame within the source */ + framepos_t current_fr; + if (with_snap) { + current_fr = snap_pixel_to_sample (current_x, ensure_snap); + divisions = trackview.editor().get_grid_music_divisions (0); + } else { + current_fr = trackview.editor().pixel_to_sample (current_x); + } /* and then to beats */ - const Evoral::Beats x_beats = region_frames_to_region_beats (current_x); + const double e_baf = tmap.exact_beat_at_frame (current_fr + midi_region()->position(), divisions); + const double quarter_note_start_beat = tmap.quarter_note_at_beat (_region->beat() - midi_region()->start_beats().to_double()); + const Evoral::Beats x_beats = Evoral::Beats (tmap.quarter_note_at_beat (e_baf) - quarter_note_start_beat); if (at_front && x_beats < canvas_note->note()->end_time()) { - note_diff_add_change (canvas_note, MidiModel::NoteDiffCommand::StartTime, x_beats); - - Evoral::Beats len = canvas_note->note()->time() - x_beats; + note_diff_add_change (canvas_note, MidiModel::NoteDiffCommand::StartTime, x_beats - (sign * snap_delta_beats)); + Evoral::Beats len = canvas_note->note()->time() - x_beats + (sign * snap_delta_beats); len += canvas_note->note()->length(); if (!!len) { @@ -2837,8 +2927,8 @@ MidiRegionView::commit_resizing (NoteBase* primary, bool at_front, double delta_ } if (!at_front) { - const Evoral::Beats len = std::max(Evoral::Beats(1 / 512.0), - x_beats - canvas_note->note()->time()); + Evoral::Beats len = std::max(Evoral::Beats(1 / 512.0), + x_beats - canvas_note->note()->time() - (sign * snap_delta_beats)); note_diff_add_change (canvas_note, MidiModel::NoteDiffCommand::Length, len); } @@ -3173,7 +3263,7 @@ MidiRegionView::nudge_notes (bool forward, bool fine) if (!fine) { /* non-fine, move by 1 bar regardless of snap */ - delta = Evoral::Beats(trackview.session()->tempo_map().meter_at(ref_point).divisions_per_bar()); + delta = Evoral::Beats(trackview.session()->tempo_map().meter_at_frame (ref_point).divisions_per_bar()); } else if (trackview.editor().snap_mode() == Editing::SnapOff) { @@ -3240,13 +3330,22 @@ MidiRegionView::change_channel(uint8_t channel) void MidiRegionView::note_entered(NoteBase* ev) { + _note_entered = true; + Editor* editor = dynamic_cast(&trackview.editor()); if (_mouse_state == SelectTouchDragging) { + note_selected (ev, true); + } else if (editor->current_mouse_mode() == MouseContent) { + + remove_ghost_note (); show_verbose_cursor (ev->note ()); + } else if (editor->current_mouse_mode() == MouseDraw) { + + remove_ghost_note (); show_verbose_cursor (ev->note ()); } } @@ -3254,22 +3353,21 @@ MidiRegionView::note_entered(NoteBase* ev) void MidiRegionView::note_left (NoteBase*) { - Editor* editor = dynamic_cast(&trackview.editor()); + _note_entered = false; for (Selection::iterator i = _selection.begin(); i != _selection.end(); ++i) { (*i)->hide_velocity (); } - editor->verbose_cursor()->hide (); + hide_verbose_cursor (); } void MidiRegionView::patch_entered (PatchChange* p) { ostringstream s; - /* XXX should get patch name if we can */ - s << _("Bank ") << (p->patch()->bank() + MIDI_BP_ZERO) << '\n' - << _("Program ") << ((int) p->patch()->program()) + MIDI_BP_ZERO << '\n' + s << _("Bank ") << (p->patch()->bank() + MIDI_BP_ZERO) << '\n' + << instrument_info().get_patch_name_without (p->patch()->bank(), p->patch()->program(), p->patch()->channel()) << '\n' << _("Channel ") << ((int) p->patch()->channel() + 1); show_verbose_cursor (s.str(), 10, 20); p->item().grab_focus(); @@ -3278,7 +3376,7 @@ MidiRegionView::patch_entered (PatchChange* p) void MidiRegionView::patch_left (PatchChange *) { - trackview.editor().verbose_cursor()->hide (); + hide_verbose_cursor (); /* focus will transfer back via the enter-notify event sent to this * midi region view. */ @@ -3298,7 +3396,7 @@ MidiRegionView::sysex_entered (SysEx* p) void MidiRegionView::sysex_left (SysEx *) { - trackview.editor().verbose_cursor()->hide (); + hide_verbose_cursor (); /* focus will transfer back via the enter-notify event sent to this * midi region view. */ @@ -3330,12 +3428,12 @@ MidiRegionView::get_fill_color() const trackview.editor().internal_editing() ? "editable region" : "midi frame base"); if (_selected) { - return ARDOUR_UI::config()->color_mod ("selected region base", mod_name); - } else if ((!ARDOUR_UI::config()->get_show_name_highlight() || high_enough_for_name) && - !ARDOUR_UI::config()->get_color_regions_using_track_color()) { - return ARDOUR_UI::config()->color_mod ("midi frame base", mod_name); + return UIConfiguration::instance().color_mod ("selected region base", mod_name); + } else if ((!UIConfiguration::instance().get_show_name_highlight() || high_enough_for_name) && + !UIConfiguration::instance().get_color_regions_using_track_color()) { + return UIConfiguration::instance().color_mod ("midi frame base", mod_name); } - return ARDOUR_UI::config()->color_mod (fill_color, mod_name); + return UIConfiguration::instance().color_mod (fill_color, mod_name); } void @@ -3423,14 +3521,16 @@ MidiRegionView::selection_as_cut_buffer () const /** This method handles undo */ bool -MidiRegionView::paste (framepos_t pos, const ::Selection& selection, PasteContext& ctx) +MidiRegionView::paste (framepos_t pos, const ::Selection& selection, PasteContext& ctx, const int32_t sub_num) { bool commit = false; // 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(); - if (!(*m)->empty()) { commit = true; } + if (!(*m)->empty()) { + commit = true; + } paste_internal(pos, ctx.count, ctx.times, **m); } @@ -3438,7 +3538,10 @@ MidiRegionView::paste (framepos_t pos, const ::Selection& selection, PasteContex typedef RouteTimeAxisView::AutomationTracks ATracks; const ATracks& atracks = midi_view()->automation_tracks(); for (ATracks::const_iterator a = atracks.begin(); a != atracks.end(); ++a) { - if (a->second->paste(pos, selection, ctx)) { + if (a->second->paste(pos, selection, ctx, sub_num)) { + if(!commit) { + trackview.editor().begin_reversible_command (Operations::paste); + } commit = true; } } @@ -3474,7 +3577,7 @@ MidiRegionView::paste_internal (framepos_t pos, unsigned paste_count, float time duration, pos, _region->position(), pos_beats)); - clear_selection (); + clear_editor_note_selection (); for (int n = 0; n < (int) times; ++n) { @@ -3482,6 +3585,7 @@ MidiRegionView::paste_internal (framepos_t pos, unsigned paste_count, float time boost::shared_ptr copied_note (new NoteType (*((*i).get()))); copied_note->set_time (pos_beats + copied_note->time() - first_time); + copied_note->set_id (Evoral::next_event_id()); /* make all newly added notes selected */ @@ -3500,7 +3604,8 @@ MidiRegionView::paste_internal (framepos_t pos, unsigned paste_count, float time 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->position()); + /* we probably need to get the snap modifier somehow to make this correct for non-musical use */ + _region->set_length (end_frame - _region->position(), trackview.editor().get_grid_music_divisions (0)); trackview.session()->add_command (new StatefulDiffCommand (_region)); } @@ -3622,7 +3727,7 @@ MidiRegionView::selection_as_notelist (Notes& selected, bool allow_all_if_none_s } void -MidiRegionView::update_ghost_note (double x, double y) +MidiRegionView::update_ghost_note (double x, double y, uint32_t state) { x = std::max(0.0, x); @@ -3634,23 +3739,21 @@ MidiRegionView::update_ghost_note (double x, double y) _note_group->canvas_to_item (x, y); PublicEditor& editor = trackview.editor (); - + framepos_t const unsnapped_frame = editor.pixel_to_sample (x); - framecnt_t grid_frames; - framepos_t const f = snap_frame_to_grid_underneath (unsnapped_frame, grid_frames); + const int32_t divisions = editor.get_grid_music_divisions (state); + const double snapped_region_qn = snap_frame_to_grid_underneath (unsnapped_frame, divisions, true).to_double(); + + Evoral::Beats snapped_beats = Evoral::Beats (snapped_region_qn); /* calculate time in beats relative to start of source */ - const Evoral::Beats length = get_grid_beats(unsnapped_frame); - const Evoral::Beats time = std::max( - Evoral::Beats(), - absolute_frames_to_source_beats (f + _region->position ())); + const Evoral::Beats length = get_grid_beats(unsnapped_frame + _region->position()); - _ghost_note->note()->set_time (time); + _ghost_note->note()->set_time (snapped_beats); _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 ()); - _ghost_note->note()->set_velocity (get_velocity_for_add (time)); - + _ghost_note->note()->set_velocity (get_velocity_for_add (snapped_beats)); /* the ghost note does not appear in ghost regions, so pass false in here */ update_note (_ghost_note, false); @@ -3658,7 +3761,7 @@ MidiRegionView::update_ghost_note (double x, double y) } void -MidiRegionView::create_ghost_note (double x, double y) +MidiRegionView::create_ghost_note (double x, double y, uint32_t state) { remove_ghost_note (); @@ -3670,7 +3773,7 @@ MidiRegionView::create_ghost_note (double x, double y) } _ghost_note->set_ignore_events (true); _ghost_note->set_outline_color (0x000000aa); - update_ghost_note (x, y); + update_ghost_note (x, y, state); _ghost_note->show (); show_verbose_cursor (_ghost_note->note ()); @@ -3683,6 +3786,16 @@ MidiRegionView::remove_ghost_note () _ghost_note = 0; } +void +MidiRegionView::hide_verbose_cursor () +{ + trackview.editor().verbose_cursor()->hide (); + MidiTimeAxisView* mtv = dynamic_cast(&trackview); + if (mtv) { + mtv->set_note_highlight (NO_MIDI_NOTE); + } +} + void MidiRegionView::snap_changed () { @@ -3690,7 +3803,7 @@ MidiRegionView::snap_changed () return; } - create_ghost_note (_last_ghost_x, _last_ghost_y); + create_ghost_note (_last_ghost_x, _last_ghost_y, 0); } void @@ -3752,9 +3865,6 @@ void MidiRegionView::enable_display (bool yn) { RegionView::enable_display (yn); - if (yn) { - redisplay_model (); - } } void @@ -3800,7 +3910,9 @@ MidiRegionView::set_step_edit_cursor_width (Evoral::Beats beats) _step_edit_cursor_width = beats; if (_step_edit_cursor) { - _step_edit_cursor->set_x1 (_step_edit_cursor->x0() + trackview.editor().sample_to_pixel (region_beats_to_region_frames (beats))); + _step_edit_cursor->set_x1 (_step_edit_cursor->x0() + trackview.editor().sample_to_pixel ( + region_beats_to_region_frames (_step_edit_cursor_position + beats) + - region_beats_to_region_frames (_step_edit_cursor_position))); } } @@ -3868,21 +3980,14 @@ MidiRegionView::data_recorded (boost::weak_ptr w) void MidiRegionView::trim_front_starting () { - /* Reparent the note group to the region view's parent, so that it doesn't change - when the region view is trimmed. + /* We used to eparent the note group to the region view's parent, so that it didn't change. + now we update it. */ - _temporary_note_group = new ArdourCanvas::Container (group->parent ()); - _temporary_note_group->move (group->position ()); - _note_group->reparent (_temporary_note_group); } void MidiRegionView::trim_front_ending () { - _note_group->reparent (group); - delete _temporary_note_group; - _temporary_note_group = 0; - if (_region->start() < 0) { /* Trim drag made start time -ve; fix this */ midi_region()->fix_negative_start (); @@ -3922,14 +4027,13 @@ MidiRegionView::delete_sysex (SysEx* /*sysex*/) // display_sysexes(); } -void -MidiRegionView::show_verbose_cursor (boost::shared_ptr n) const +std::string +MidiRegionView::get_note_name (boost::shared_ptr n, uint8_t note_value) const { using namespace MIDI::Name; - std::string name; - MidiTimeAxisView* const mtv = dynamic_cast(&trackview); + MidiTimeAxisView* mtv = dynamic_cast(&trackview); if (mtv) { boost::shared_ptr device_names(mtv->get_device_names()); if (device_names) { @@ -3939,18 +4043,36 @@ MidiRegionView::show_verbose_cursor (boost::shared_ptr n) const n->channel(), patch_key.bank(), patch_key.program(), - n->note()); + note_value); } } 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() ? ParameterDescriptor::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 current_note, + uint8_t new_value) const +{ + MidiTimeAxisView* mtv = dynamic_cast(&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 n) const +{ + show_verbose_cursor_for_new_note_value(n, n->note()); } void @@ -3989,46 +4111,30 @@ MidiRegionView::get_velocity_for_add (MidiModel::TimeType time) const } /** @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. + * @param divisions beat division to snap given by Editor::get_grid_music_divisions() where + * bar is -1, 0 is audio samples and a positive integer is beat subdivisions. + * @return beat duration of p snapped to the grid subdivision underneath it. */ -framepos_t -MidiRegionView::snap_frame_to_grid_underneath (framepos_t p, framecnt_t& grid_frames) const +Evoral::Beats +MidiRegionView::snap_frame_to_grid_underneath (framepos_t p, int32_t divisions, bool shift_snap) const { - PublicEditor& editor = trackview.editor (); - - const Evoral::Beats grid_beats = get_grid_beats(p); - - 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; - } + TempoMap& map (trackview.session()->tempo_map()); + double eqaf = map.exact_qn_at_frame (p + _region->position(), divisions); - 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; + if (divisions != 0 && shift_snap) { + const double qaf = map.quarter_note_at_frame (p + _region->position()); + /* 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. + */ + const Evoral::Beats grid_beats = get_grid_beats (p + _region->position()); + const double rem = eqaf - qaf; + if (rem >= 0.0 && eqaf - grid_beats.to_double() > _region->pulse() * 4.0) { + eqaf -= grid_beats.to_double(); + } } + const double session_start_off = (_region->pulse() * 4.0) - midi_region()->start_beats().to_double(); - /* Clear our selection in sympathy; but don't signal the fact */ - clear_selection (false); -} - -void -MidiRegionView::note_button_release () -{ - _note_player.reset(); + return Evoral::Beats (eqaf - session_start_off); } ChannelMode @@ -4051,7 +4157,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); }