X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fmidi_region_view.cc;h=23c761178c1403ec521e513c385af74e3ba56ade;hb=4438263d4d0168581329952a995d0c5887d7f7d2;hp=96dd9b27a713b6a15f2f5a65612f4fdeb2daa5bf;hpb=e0cb9efb003500fea319552a772364f00753a26f;p=ardour.git diff --git a/gtk2_ardour/midi_region_view.cc b/gtk2_ardour/midi_region_view.cc index 96dd9b27a7..23c761178c 100644 --- a/gtk2_ardour/midi_region_view.cc +++ b/gtk2_ardour/midi_region_view.cc @@ -118,14 +118,12 @@ MidiRegionView::MidiRegionView (ArdourCanvas::Container* parent, , _optimization_iterator (_events.end()) , _list_editor (0) , _no_sound_notes (false) + , _last_display_zoom (0) , _last_event_x (0) , _last_event_y (0) , _grabbed_keyboard (false) , _entered (false) - , pre_enter_cursor (0) - , pre_press_cursor (0) - , pre_note_enter_cursor (0) - , _note_player (0) + , _mouse_changed_selection (false) { CANVAS_DEBUG_NAME (_note_group, string_compose ("note group for %1", get_item_name())); _note_group->raise_to_top(); @@ -135,6 +133,9 @@ MidiRegionView::MidiRegionView (ArdourCanvas::Container* parent, 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, @@ -142,14 +143,15 @@ MidiRegionView::MidiRegionView (ArdourCanvas::Container* parent, boost::shared_ptr r, double spu, uint32_t basic_color, + bool recording, TimeAxisViewItem::Visibility visibility) - : RegionView (parent, tv, r, spu, basic_color, false, visibility) + : RegionView (parent, tv, r, spu, basic_color, recording, visibility) , _current_range_min(0) , _current_range_max(0) , _region_relative_time_converter(r->session().tempo_map(), r->position()) , _source_relative_time_converter(r->session().tempo_map(), r->position() - r->start()) , _active_notes(0) - , _note_group (new ArdourCanvas::Container (parent)) + , _note_group (new ArdourCanvas::Container (group)) , _note_diff_command (0) , _ghost_note(0) , _step_edit_cursor (0) @@ -163,14 +165,12 @@ MidiRegionView::MidiRegionView (ArdourCanvas::Container* parent, , _optimization_iterator (_events.end()) , _list_editor (0) , _no_sound_notes (false) + , _last_display_zoom (0) , _last_event_x (0) , _last_event_y (0) , _grabbed_keyboard (false) , _entered (false) - , pre_enter_cursor (0) - , pre_press_cursor (0) - , pre_note_enter_cursor (0) - , _note_player (0) + , _mouse_changed_selection (false) { CANVAS_DEBUG_NAME (_note_group, string_compose ("note group for %1", get_item_name())); _note_group->raise_to_top(); @@ -180,6 +180,9 @@ MidiRegionView::MidiRegionView (ArdourCanvas::Container* parent, 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 @@ -214,14 +217,12 @@ MidiRegionView::MidiRegionView (const MidiRegionView& other) , _optimization_iterator (_events.end()) , _list_editor (0) , _no_sound_notes (false) + , _last_display_zoom (0) , _last_event_x (0) , _last_event_y (0) , _grabbed_keyboard (false) , _entered (false) - , pre_enter_cursor (0) - , pre_press_cursor (0) - , pre_note_enter_cursor (0) - , _note_player (0) + , _mouse_changed_selection (false) { init (false); } @@ -247,14 +248,12 @@ MidiRegionView::MidiRegionView (const MidiRegionView& other, boost::shared_ptrmidi_source(0)->load_model(); + Glib::Threads::Mutex::Lock lm(midi_region()->midi_source(0)->mutex()); + midi_region()->midi_source(0)->load_model(lm); } _model = midi_region()->midi_source(0)->model(); _enable_display = false; - _fill_color_name = "midi frame base"; + fill_color_name = "midi frame base"; RegionView::init (false); @@ -309,10 +309,17 @@ MidiRegionView::init (bool wfd) boost::bind (&MidiRegionView::snap_changed, this), gui_context()); + trackview.editor().MouseModeChanged.connect(_mouse_mode_connection, invalidator (*this), + boost::bind (&MidiRegionView::mouse_mode_changed, this), + gui_context ()); + Config->ParameterChanged.connect (*this, invalidator (*this), boost::bind (&MidiRegionView::parameter_changed, this, _1), gui_context()); connect_to_diskstream (); SelectionCleared.connect (_selection_cleared_connection, invalidator (*this), boost::bind (&MidiRegionView::selection_cleared, this, _1), gui_context ()); + + 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& @@ -340,7 +347,7 @@ MidiRegionView::connect_to_diskstream () bool MidiRegionView::canvas_group_event(GdkEvent* ev) { - if (in_destructor) { + if (in_destructor || _recregion) { return false; } @@ -349,7 +356,6 @@ MidiRegionView::canvas_group_event(GdkEvent* ev) return RegionView::canvas_group_event (ev); } - const MouseMode m = trackview.editor().current_mouse_mode(); bool r; switch (ev->type) { @@ -367,15 +373,6 @@ MidiRegionView::canvas_group_event(GdkEvent* ev) // reset entered_regionview (among other things) return RegionView::canvas_group_event (ev); - case GDK_2BUTTON_PRESS: - // cannot use double-click to exit internal mode if single-click is being used - if ((m != MouseDraw) && - (m != MouseObject || - !Keyboard::modifier_state_contains (ev->button.state, Keyboard::insert_note_modifier()))) { - return trackview.editor().toggle_internal_editing_from_double_click (ev); - } - break; - case GDK_SCROLL: if (scroll (&ev->scroll)) { return true; @@ -393,8 +390,7 @@ MidiRegionView::canvas_group_event(GdkEvent* ev) case GDK_BUTTON_RELEASE: r = button_release (&ev->button); - delete _note_player; - _note_player = 0; + _note_player.reset(); return r; case GDK_MOTION_NOTIFY: @@ -412,10 +408,6 @@ MidiRegionView::canvas_group_event(GdkEvent* ev) bool MidiRegionView::enter_notify (GdkEventCrossing* ev) { - trackview.editor().MouseModeChanged.connect ( - _mouse_mode_connection, invalidator (*this), boost::bind (&MidiRegionView::mouse_mode_changed, this), gui_context () - ); - enter_internal(); _entered = true; @@ -425,8 +417,6 @@ MidiRegionView::enter_notify (GdkEventCrossing* ev) bool MidiRegionView::leave_notify (GdkEventCrossing*) { - _mouse_mode_connection.disconnect (); - leave_internal(); _entered = false; @@ -436,12 +426,17 @@ MidiRegionView::leave_notify (GdkEventCrossing*) void MidiRegionView::mouse_mode_changed () { - if (trackview.editor().internal_editing()) { - // Switched in to internal editing mode while entered - enter_internal(); - } else { - // Switched out of internal editing mode while entered - leave_internal(); + // Adjust frame colour (become more transparent for internal tools) + 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 + leave_internal(); + } } } @@ -458,6 +453,14 @@ MidiRegionView::enter_internal() Keyboard::magic_widget_grab_focus(); _grabbed_keyboard = true; } + + // Lower frame handles below notes so they don't steal events + if (frame_handle_start) { + frame_handle_start->lower_to_bottom(); + } + if (frame_handle_end) { + frame_handle_end->lower_to_bottom(); + } } void @@ -470,6 +473,14 @@ MidiRegionView::leave_internal() Keyboard::magic_widget_drop_focus(); _grabbed_keyboard = false; } + + // Raise frame handles above notes so they catch events + if (frame_handle_start) { + frame_handle_start->raise_to_top(); + } + if (frame_handle_end) { + frame_handle_end->raise_to_top(); + } } bool @@ -482,9 +493,8 @@ MidiRegionView::button_press (GdkEventButton* ev) Editor* editor = dynamic_cast (&trackview.editor()); MouseMode m = editor->current_mouse_mode(); - if (m == MouseObject && Keyboard::modifier_state_contains (ev->state, Keyboard::insert_note_modifier())) { - pre_press_cursor = editor->get_canvas_cursor (); - editor->set_canvas_cursor (editor->cursors()->midi_pencil); + if (m == MouseContent && Keyboard::modifier_state_contains (ev->state, Keyboard::insert_note_modifier())) { + _press_cursor_ctx = CursorContext::create(*editor, editor->cursors()->midi_pencil); } if (_mouse_state != SelectTouchDragging) { @@ -496,6 +506,7 @@ MidiRegionView::button_press (GdkEventButton* ev) } _pressed_button = ev->button; + _mouse_changed_selection = false; return true; } @@ -517,10 +528,7 @@ MidiRegionView::button_release (GdkEventButton* ev) PublicEditor& editor = trackview.editor (); - if (pre_press_cursor) { - dynamic_cast(&editor)->set_canvas_cursor (pre_press_cursor, false); - pre_press_cursor = 0; - } + _press_cursor_ctx.reset(); switch (_mouse_state) { case Pressed: // Clicked @@ -529,12 +537,14 @@ MidiRegionView::button_release (GdkEventButton* ev) case MouseRange: /* no motion occured - simple click */ clear_selection (); + _mouse_changed_selection = true; break; - case MouseObject: + case MouseContent: case MouseTimeFX: { clear_selection(); + _mouse_changed_selection = true; if (Keyboard::is_insert_note_event(ev)) { @@ -544,12 +554,12 @@ MidiRegionView::button_release (GdkEventButton* ev) event_y = ev->y; group->canvas_to_item (event_x, event_y); - Evoral::MusicalTime beats = get_grid_beats(editor.pixel_to_sample(event_x)); + 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::MusicalTime::tick(); + beats -= Evoral::Beats::tick(); create_note_at (editor.pixel_to_sample (event_x), event_y, beats, true); } @@ -558,12 +568,12 @@ MidiRegionView::button_release (GdkEventButton* ev) } case MouseDraw: { - Evoral::MusicalTime beats = get_grid_beats(editor.pixel_to_sample(event_x)); + 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::MusicalTime::tick(); + beats -= Evoral::Beats::tick(); create_note_at (editor.pixel_to_sample (event_x), event_y, beats, true); @@ -588,6 +598,11 @@ MidiRegionView::button_release (GdkEventButton* ev) break; } + if(_mouse_changed_selection) { + trackview.editor().begin_reversible_selection_op (_("Mouse Selection Change")); + trackview.editor().commit_reversible_selection_op (); + } + return false; } @@ -596,18 +611,18 @@ MidiRegionView::motion (GdkEventMotion* ev) { PublicEditor& editor = trackview.editor (); - if (!_ghost_note && editor.current_mouse_mode() == MouseObject && + if (!_ghost_note && editor.current_mouse_mode() == MouseContent && Keyboard::modifier_state_contains (ev->state, Keyboard::insert_note_modifier()) && _mouse_state != AddDragging) { create_ghost_note (ev->x, ev->y); - } else if (_ghost_note && editor.current_mouse_mode() == MouseObject && + } else if (_ghost_note && editor.current_mouse_mode() == MouseContent && Keyboard::modifier_state_contains (ev->state, Keyboard::insert_note_modifier())) { update_ghost_note (ev->x, ev->y); - } else if (_ghost_note && editor.current_mouse_mode() == MouseObject) { + } else if (_ghost_note && editor.current_mouse_mode() == MouseContent) { remove_ghost_note (); editor.verbose_cursor()->hide (); @@ -630,16 +645,17 @@ MidiRegionView::motion (GdkEventMotion* ev) MouseMode m = editor.current_mouse_mode(); - if (m == MouseDraw || (m == MouseObject && Keyboard::modifier_state_contains (ev->state, Keyboard::insert_note_modifier()))) { + if (m == MouseDraw || (m == MouseContent && Keyboard::modifier_state_contains (ev->state, Keyboard::insert_note_modifier()))) { editor.drags()->set (new NoteCreateDrag (dynamic_cast (&editor), group, this), (GdkEvent *) ev); _mouse_state = AddDragging; remove_ghost_note (); editor.verbose_cursor()->hide (); return true; - } else if (m == MouseObject) { + } else if (m == MouseContent) { editor.drags()->set (new MidiRubberbandSelectDrag (dynamic_cast (&editor), this), (GdkEvent *) ev); if (!Keyboard::modifier_state_equals (ev->state, Keyboard::TertiaryModifier)) { clear_selection (); + _mouse_changed_selection = true; } _mouse_state = SelectRectDragging; return true; @@ -722,14 +738,14 @@ MidiRegionView::key_press (GdkEventKey* ev) clear_selection(); _mouse_state = None; - } else if (unmodified && (ev->keyval == GDK_comma || ev->keyval == GDK_period)) { + } else if (ev->keyval == GDK_comma || ev->keyval == GDK_period) { bool start = (ev->keyval == GDK_comma); bool end = (ev->keyval == GDK_period); bool shorter = Keyboard::modifier_state_contains (ev->state, Keyboard::PrimaryModifier); bool fine = Keyboard::modifier_state_contains (ev->state, Keyboard::SecondaryModifier); - change_note_lengths (fine, shorter, Evoral::MusicalTime(), start, end); + change_note_lengths (fine, shorter, Evoral::Beats(), start, end); return true; @@ -744,22 +760,32 @@ MidiRegionView::key_press (GdkEventKey* ev) } else if (ev->keyval == GDK_Tab) { + trackview.editor().begin_reversible_selection_op (_("Select Adjacent Note")); + if (Keyboard::modifier_state_contains (ev->state, Keyboard::PrimaryModifier)) { goto_previous_note (Keyboard::modifier_state_contains (ev->state, Keyboard::TertiaryModifier)); } else { goto_next_note (Keyboard::modifier_state_contains (ev->state, Keyboard::TertiaryModifier)); } + + trackview.editor().commit_reversible_selection_op(); + return true; } else if (ev->keyval == GDK_ISO_Left_Tab) { /* Shift-TAB generates ISO Left Tab, for some reason */ + trackview.editor().begin_reversible_selection_op (_("Select Adjacent Note")); + if (Keyboard::modifier_state_contains (ev->state, Keyboard::PrimaryModifier)) { goto_previous_note (Keyboard::modifier_state_contains (ev->state, Keyboard::TertiaryModifier)); } else { goto_next_note (Keyboard::modifier_state_contains (ev->state, Keyboard::TertiaryModifier)); } + + trackview.editor().commit_reversible_selection_op(); + return true; @@ -912,16 +938,14 @@ 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::MusicalTime length, bool snap_t) +MidiRegionView::create_note_at (framepos_t t, double y, Evoral::Beats length, bool snap_t) { if (length < 2 * DBL_EPSILON) { return; } - MidiTimeAxisView* const mtv = dynamic_cast(&trackview); - MidiStreamView* const view = mtv->midi_view(); - - const double note = view->y_to_note(y); + MidiTimeAxisView* const mtv = dynamic_cast(&trackview); + MidiStreamView* const view = mtv->midi_view(); // Start of note in frames relative to region start if (snap_t) { @@ -929,11 +953,15 @@ MidiRegionView::create_note_at (framepos_t t, double y, Evoral::MusicalTime leng t = snap_frame_to_grid_underneath (t, grid_frames); } - const boost::shared_ptr new_note ( - new NoteType (mtv->get_channel_for_add (), - region_frames_to_region_beats(t + _region->start()), - length, - (uint8_t)note, 0x40)); + const MidiModel::TimeType beat_time = region_frames_to_region_beats( + t + _region->start()); + + const double note = view->y_to_note(y); + const uint8_t chan = mtv->get_channel_for_add(); + const uint8_t velocity = get_velocity_for_add(beat_time); + + const boost::shared_ptr new_note( + new NoteType (chan, beat_time, length, (uint8_t)note, velocity)); if (_model->contains (new_note)) { return; @@ -941,9 +969,11 @@ MidiRegionView::create_note_at (framepos_t t, double y, Evoral::MusicalTime leng view->update_note_range(new_note->note()); + trackview.editor().begin_reversible_command(_("add note")); MidiModel::NoteDiffCommand* cmd = _model->new_note_diff_command(_("add note")); cmd->add (new_note); _model->apply_command(*trackview.session(), cmd); + trackview.editor().commit_reversible_command(); play_midi_note (new_note); } @@ -977,8 +1007,8 @@ 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()); - - clear_events (); + /* Don't signal as nobody else needs to know until selection has been altered.*/ + clear_events (false); if (_enable_display) { redisplay_model(); @@ -989,6 +1019,7 @@ void MidiRegionView::start_note_diff_command (string name) { if (!_note_diff_command) { + trackview.editor().begin_reversible_command (name); _note_diff_command = _model->new_note_diff_command (name); } } @@ -1028,7 +1059,7 @@ MidiRegionView::note_diff_add_change (NoteBase* ev, void MidiRegionView::note_diff_add_change (NoteBase* ev, MidiModel::NoteDiffCommand::Property property, - Evoral::MusicalTime val) + Evoral::Beats val) { if (_note_diff_command) { _note_diff_command->change (ev->note(), property, val); @@ -1039,6 +1070,7 @@ void MidiRegionView::apply_diff (bool as_subcommand) { bool add_or_remove; + bool commit = false; if (!_note_diff_command) { return; @@ -1055,6 +1087,7 @@ MidiRegionView::apply_diff (bool as_subcommand) _model->apply_command_as_subcommand (*trackview.session(), _note_diff_command); } else { _model->apply_command (*trackview.session(), _note_diff_command); + commit = true; } _note_diff_command = 0; @@ -1065,6 +1098,9 @@ MidiRegionView::apply_diff (bool as_subcommand) } _marked_for_velocity.clear(); + if (commit) { + trackview.editor().commit_reversible_command (); + } } void @@ -1095,8 +1131,29 @@ MidiRegionView::find_canvas_note (boost::shared_ptr note) return 0; } +/** This version finds any canvas note matching the supplied note.*/ +NoteBase* +MidiRegionView::find_canvas_note (NoteType note) +{ + if (_optimization_iterator != _events.end()) { + ++_optimization_iterator; + } + + if (_optimization_iterator != _events.end() && (*(*_optimization_iterator)->note()) == note) { + return *_optimization_iterator; + } + + for (_optimization_iterator = _events.begin(); _optimization_iterator != _events.end(); ++_optimization_iterator) { + if (*((*_optimization_iterator)->note()) == note) { + return *_optimization_iterator; + } + } + + return 0; +} + void -MidiRegionView::get_events (Events& e, Evoral::Sequence::NoteOperator op, uint8_t val, int chan_mask) +MidiRegionView::get_events (Events& e, Evoral::Sequence::NoteOperator op, uint8_t val, int chan_mask) { MidiModel::Notes notes; _model->get_notes (notes, op, val, chan_mask); @@ -1112,8 +1169,20 @@ MidiRegionView::get_events (Events& e, Evoral::Sequence::No void MidiRegionView::redisplay_model() { - // Don't redisplay the model if we're currently recording and displaying that if (_active_notes) { + // Currently recording + const framecnt_t zoom = trackview.editor().get_current_zoom(); + if (zoom != _last_display_zoom) { + /* Update resolved canvas notes to reflect changes in zoom without + touching model. Leave active notes (with length 0) alone since + they are being extended. */ + for (Events::iterator i = _events.begin(); i != _events.end(); ++i) { + if ((*i)->note()->length() > 0) { + update_note(*i); + } + } + _last_display_zoom = zoom; + } return; } @@ -1143,15 +1212,7 @@ MidiRegionView::redisplay_model() if (!empty_when_starting && (cne = find_canvas_note (note)) != 0) { cne->validate (); - - Note* cn; - Hit* ch; - - if ((cn = dynamic_cast(cne)) != 0) { - update_note (cn); - } else if ((ch = dynamic_cast(cne)) != 0) { - update_hit (ch); - } + update_note (cne); if (visible) { cne->show (); @@ -1161,7 +1222,14 @@ MidiRegionView::redisplay_model() } else { - add_note (note, visible); + cne = add_note (note, visible); + } + + set >::iterator it; + for (it = _pending_note_selection.begin(); it != _pending_note_selection.end(); ++it) { + if (*(*it) == *note) { + add_to_selection (cne); + } } } else { @@ -1173,7 +1241,6 @@ MidiRegionView::redisplay_model() } } - /* remove note items that are no longer valid */ if (!empty_when_starting) { @@ -1204,6 +1271,7 @@ MidiRegionView::redisplay_model() _marked_for_selection.clear (); _marked_for_velocity.clear (); + _pending_note_selection.clear (); /* we may have caused _events to contain things out of order (e.g. if a note moved earlier or later). we don't generally need them in time order, but @@ -1247,11 +1315,11 @@ MidiRegionView::display_sysexes() bool have_periodic_system_messages = false; bool display_periodic_messages = true; - if (!Config->get_never_display_periodic_midi()) { + if (!ARDOUR_UI::config()->get_never_display_periodic_midi()) { for (MidiModel::SysExes::const_iterator i = _model->sysexes().begin(); i != _model->sysexes().end(); ++i) { - const boost::shared_ptr > mev = - boost::static_pointer_cast > (*i); + const boost::shared_ptr > mev = + boost::static_pointer_cast > (*i); if (mev) { if (mev->is_spp() || mev->is_mtc_quarter() || mev->is_mtc_full()) { @@ -1283,10 +1351,10 @@ MidiRegionView::display_sysexes() for (MidiModel::SysExes::const_iterator i = _model->sysexes().begin(); i != _model->sysexes().end(); ++i) { - const boost::shared_ptr > mev = - boost::static_pointer_cast > (*i); + const boost::shared_ptr > mev = + boost::static_pointer_cast > (*i); - Evoral::MusicalTime time = (*i)->time(); + Evoral::Beats time = (*i)->time(); if (mev) { if (mev->is_spp() || mev->is_mtc_quarter() || mev->is_mtc_full()) { @@ -1463,8 +1531,6 @@ MidiRegionView::apply_note_range (uint8_t min, uint8_t max, bool force) GhostRegion* MidiRegionView::add_ghost (TimeAxisView& tv) { - Note* note; - double unit_position = _region->position () / samples_per_pixel; MidiTimeAxisView* mtv = dynamic_cast(&tv); MidiGhostRegion* ghost; @@ -1479,9 +1545,7 @@ MidiRegionView::add_ghost (TimeAxisView& tv) } for (Events::iterator i = _events.begin(); i != _events.end(); ++i) { - if ((note = dynamic_cast(*i)) != 0) { - ghost->add_note(note); - } + ghost->add_note(*i); } ghost->set_height (); @@ -1524,24 +1588,24 @@ MidiRegionView::end_write() /** Resolve an active MIDI note (while recording). */ void -MidiRegionView::resolve_note(uint8_t note, Evoral::MusicalTime end_time) +MidiRegionView::resolve_note(uint8_t note, Evoral::Beats end_time) { if (midi_view()->note_mode() != Sustained) { return; } if (_active_notes && _active_notes[note]) { + /* Set note length so update_note() works. Note this is a local note + for recording, not from a model, so we can safely mess with it. */ + _active_notes[note]->note()->set_length( + end_time - _active_notes[note]->note()->time()); - /* XXX is end_time really region-centric? I think so, because - this is a new region that we're recording, so source zero is - the same as region zero - */ + /* End time is relative to the region being recorded. */ const framepos_t end_time_frames = region_beats_to_region_frames(end_time); _active_notes[note]->set_x1 (trackview.editor().sample_to_pixel(end_time_frames)); _active_notes[note]->set_outline_all (); _active_notes[note] = 0; - } } @@ -1555,18 +1619,18 @@ MidiRegionView::extend_active_notes() return; } - for (unsigned i=0; i < 128; ++i) { + for (unsigned i = 0; i < 128; ++i) { if (_active_notes[i]) { - _active_notes[i]->set_x1 (trackview.editor().sample_to_pixel(_region->length())); + _active_notes[i]->set_x1( + trackview.editor().sample_to_pixel(_region->length())); } } } - void MidiRegionView::play_midi_note(boost::shared_ptr note) { - if (_no_sound_notes || !Config->get_sound_midi_notes()) { + if (_no_sound_notes || !ARDOUR_UI::config()->get_sound_midi_notes()) { return; } @@ -1586,26 +1650,14 @@ MidiRegionView::play_midi_note(boost::shared_ptr note) void MidiRegionView::start_playing_midi_note(boost::shared_ptr note) { - if (_no_sound_notes || !Config->get_sound_midi_notes()) { - return; - } - - RouteUI* route_ui = dynamic_cast (&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 (); + const std::vector< boost::shared_ptr > notes(1, note); + start_playing_midi_chord(notes); } void MidiRegionView::start_playing_midi_chord (vector > notes) { - if (_no_sound_notes || !Config->get_sound_midi_notes()) { + if (_no_sound_notes || !ARDOUR_UI::config()->get_sound_midi_notes()) { return; } @@ -1615,8 +1667,7 @@ MidiRegionView::start_playing_midi_chord (vector > n return; } - delete _note_player; - _note_player = new NotePlayer (route_ui->midi_track()); + _note_player = boost::shared_ptr(new NotePlayer(route_ui->midi_track())); for (vector >::iterator n = notes.begin(); n != notes.end(); ++n) { _note_player->add (*n); @@ -1638,12 +1689,24 @@ MidiRegionView::note_in_region_range (const boost::shared_ptr note, bo return !outside; } +void +MidiRegionView::update_note (NoteBase* note, bool update_ghost_regions) +{ + Note* sus = NULL; + Hit* hit = NULL; + if ((sus = dynamic_cast(note))) { + update_sustained(sus, update_ghost_regions); + } else if ((hit = dynamic_cast(note))) { + update_hit(hit, update_ghost_regions); + } +} + /** Update a canvas note's size from its model note. * @param ev Canvas note to update. * @param update_ghost_regions true to update the note in any ghost regions that we have, otherwise false. */ void -MidiRegionView::update_note (Note* ev, bool update_ghost_regions) +MidiRegionView::update_sustained (Note* ev, bool update_ghost_regions) { boost::shared_ptr note = ev->note(); const double x = trackview.editor().sample_to_pixel (source_beats_to_region_frames (note->time())); @@ -1665,11 +1728,10 @@ MidiRegionView::update_note (Note* ev, bool update_ghost_regions) if (!note->length()) { if (_active_notes && note->note() < 128) { - // If this note is already active there's a stuck note, - // finish the old note rectangle - if (_active_notes[note->note()]) { - Note* const old_rect = _active_notes[note->note()]; - boost::shared_ptr old_note = old_rect->note(); + Note* const old_rect = _active_notes[note->note()]; + 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_outline_all (); } @@ -1684,7 +1746,11 @@ MidiRegionView::update_note (Note* ev, bool update_ghost_regions) /* outline all edges */ ev->set_outline_all (); } - + + // 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())); + if (update_ghost_regions) { for (std::vector::iterator i = ghosts.begin(); i != ghosts.end(); ++i) { MidiGhostRegion* gr = dynamic_cast (*i); @@ -1696,7 +1762,7 @@ MidiRegionView::update_note (Note* ev, bool update_ghost_regions) } void -MidiRegionView::update_hit (Hit* ev) +MidiRegionView::update_hit (Hit* ev, bool update_ghost_regions) { boost::shared_ptr note = ev->note(); @@ -1707,6 +1773,19 @@ MidiRegionView::update_hit (Hit* ev) ev->set_position (ArdourCanvas::Duple (x, y)); ev->set_height (diamond_size); + + // 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())); + + if (update_ghost_regions) { + for (std::vector::iterator i = ghosts.begin(); i != ghosts.end(); ++i) { + MidiGhostRegion* gr = dynamic_cast (*i); + if (gr) { + gr->update_note (ev); + } + } + } } /** Add a MIDI note to the view (with length). @@ -1715,7 +1794,7 @@ MidiRegionView::update_hit (Hit* ev) * notes, and resolve_note should be called when the corresponding note off * event arrives, to properly display the note. */ -void +NoteBase* MidiRegionView::add_note(const boost::shared_ptr note, bool visible) { NoteBase* event = 0; @@ -1724,18 +1803,10 @@ MidiRegionView::add_note(const boost::shared_ptr note, bool visible) Note* ev_rect = new Note (*this, _note_group, note); - update_note (ev_rect); + update_sustained (ev_rect); event = ev_rect; - MidiGhostRegion* gr; - - for (std::vector::iterator g = ghosts.begin(); g != ghosts.end(); ++g) { - if ((gr = dynamic_cast(*g)) != 0) { - gr->add_note(ev_rect); - } - } - } else if (midi_view()->note_mode() == Percussive) { const double diamond_size = std::max(1., floor(midi_stream_view()->note_height()) - 2.); @@ -1751,6 +1822,14 @@ MidiRegionView::add_note(const boost::shared_ptr note, bool visible) } if (event) { + MidiGhostRegion* gr; + + for (std::vector::iterator g = ghosts.begin(); g != ghosts.end(); ++g) { + if ((gr = dynamic_cast(*g)) != 0) { + gr->add_note(event); + } + } + if (_marked_for_selection.find(note) != _marked_for_selection.end()) { note_selected(event, true); } @@ -1773,11 +1852,12 @@ MidiRegionView::add_note(const boost::shared_ptr note, bool visible) MidiStreamView* const view = mtv->midi_view(); view->update_note_range (note->note()); + return event; } void MidiRegionView::step_add_note (uint8_t channel, uint8_t number, uint8_t velocity, - Evoral::MusicalTime pos, Evoral::MusicalTime len) + Evoral::Beats pos, Evoral::Beats len) { boost::shared_ptr new_note (new NoteType (channel, pos, len, number, velocity)); @@ -1806,7 +1886,7 @@ MidiRegionView::step_add_note (uint8_t channel, uint8_t number, uint8_t velocity } void -MidiRegionView::step_sustain (Evoral::MusicalTime beats) +MidiRegionView::step_sustain (Evoral::Beats beats) { change_note_lengths (false, false, beats, false, true); } @@ -1859,13 +1939,13 @@ MidiRegionView::patch_change_to_patch_key (MidiModel::PatchChangePtr p) /// Return true iff @p pc applies to the given time on the given channel. static bool -patch_applies (const ARDOUR::MidiModel::constPatchChangePtr pc, Evoral::MusicalTime time, uint8_t channel) +patch_applies (const ARDOUR::MidiModel::constPatchChangePtr pc, Evoral::Beats time, uint8_t channel) { return pc->time() <= time && pc->channel() == channel; } void -MidiRegionView::get_patch_key_at (Evoral::MusicalTime time, uint8_t channel, MIDI::Name::PatchPrimaryKey& key) const +MidiRegionView::get_patch_key_at (Evoral::Beats time, uint8_t channel, MIDI::Name::PatchPrimaryKey& key) const { // The earliest event not before time MidiModel::PatchChanges::iterator i = _model->patch_change_lower_bound (time); @@ -1878,42 +1958,43 @@ MidiRegionView::get_patch_key_at (Evoral::MusicalTime time, uint8_t channel, MID } if (i != _model->patch_changes().end() && patch_applies(*i, time, channel)) { - key.bank_number = (*i)->bank(); - key.program_number = (*i)->program (); + key.set_bank((*i)->bank()); + key.set_program((*i)->program ()); } else { - key.bank_number = key.program_number = 0; - } - - if (!key.is_sane()) { - error << string_compose(_("insane MIDI patch key %1:%2"), - key.bank_number, key.program_number) << endmsg; + key.set_bank(0); + key.set_program(0); } } void MidiRegionView::change_patch_change (PatchChange& pc, const MIDI::Name::PatchPrimaryKey& new_patch) { - MidiModel::PatchChangeDiffCommand* c = _model->new_patch_change_diff_command (_("alter patch change")); + string name = _("alter patch change"); + trackview.editor().begin_reversible_command (name); + MidiModel::PatchChangeDiffCommand* c = _model->new_patch_change_diff_command (name); - if (pc.patch()->program() != new_patch.program_number) { - c->change_program (pc.patch (), new_patch.program_number); + if (pc.patch()->program() != new_patch.program()) { + c->change_program (pc.patch (), new_patch.program()); } - int const new_bank = new_patch.bank_number; + int const new_bank = new_patch.bank(); if (pc.patch()->bank() != new_bank) { c->change_bank (pc.patch (), new_bank); } _model->apply_command (*trackview.session(), c); + trackview.editor().commit_reversible_command (); _patch_changes.clear (); display_patch_changes (); } void -MidiRegionView::change_patch_change (MidiModel::PatchChangePtr old_change, const Evoral::PatchChange & new_change) +MidiRegionView::change_patch_change (MidiModel::PatchChangePtr old_change, const Evoral::PatchChange & new_change) { - MidiModel::PatchChangeDiffCommand* c = _model->new_patch_change_diff_command (_("alter patch change")); + string name = _("alter patch change"); + trackview.editor().begin_reversible_command (name); + MidiModel::PatchChangeDiffCommand* c = _model->new_patch_change_diff_command (name); if (old_change->time() != new_change.time()) { c->change_time (old_change, new_change.time()); @@ -1932,6 +2013,7 @@ MidiRegionView::change_patch_change (MidiModel::PatchChangePtr old_change, const } _model->apply_command (*trackview.session(), c); + trackview.editor().commit_reversible_command (); _patch_changes.clear (); display_patch_changes (); @@ -1943,13 +2025,15 @@ MidiRegionView::change_patch_change (MidiModel::PatchChangePtr old_change, const * MidiTimeAxisView::get_channel_for_add()) */ void -MidiRegionView::add_patch_change (framecnt_t t, Evoral::PatchChange const & patch) +MidiRegionView::add_patch_change (framecnt_t t, Evoral::PatchChange const & patch) { MidiTimeAxisView* const mtv = dynamic_cast(&trackview); + string name = _("add patch change"); - MidiModel::PatchChangeDiffCommand* c = _model->new_patch_change_diff_command (_("add patch change")); + trackview.editor().begin_reversible_command (name); + MidiModel::PatchChangeDiffCommand* c = _model->new_patch_change_diff_command (name); c->add (MidiModel::PatchChangePtr ( - new Evoral::PatchChange ( + new Evoral::PatchChange ( absolute_frames_to_source_beats (_region->position() + t), mtv->get_channel_for_add(), patch.program(), patch.bank() ) @@ -1957,17 +2041,20 @@ MidiRegionView::add_patch_change (framecnt_t t, Evoral::PatchChangeapply_command (*trackview.session(), c); + trackview.editor().commit_reversible_command (); _patch_changes.clear (); display_patch_changes (); } void -MidiRegionView::move_patch_change (PatchChange& pc, Evoral::MusicalTime t) +MidiRegionView::move_patch_change (PatchChange& pc, Evoral::Beats t) { + trackview.editor().begin_reversible_command (_("move patch change")); MidiModel::PatchChangeDiffCommand* c = _model->new_patch_change_diff_command (_("move patch change")); c->change_time (pc.patch (), t); _model->apply_command (*trackview.session(), c); + trackview.editor().commit_reversible_command (); _patch_changes.clear (); display_patch_changes (); @@ -1976,56 +2063,26 @@ MidiRegionView::move_patch_change (PatchChange& pc, Evoral::MusicalTime t) void MidiRegionView::delete_patch_change (PatchChange* pc) { + trackview.editor().begin_reversible_command (_("delete patch change")); MidiModel::PatchChangeDiffCommand* c = _model->new_patch_change_diff_command (_("delete patch change")); c->remove (pc->patch ()); _model->apply_command (*trackview.session(), c); + trackview.editor().commit_reversible_command (); _patch_changes.clear (); display_patch_changes (); } void -MidiRegionView::previous_patch (PatchChange& patch) -{ - if (patch.patch()->program() < 127) { - MIDI::Name::PatchPrimaryKey key = patch_change_to_patch_key (patch.patch()); - key.program_number++; - change_patch_change (patch, key); - } -} - -void -MidiRegionView::next_patch (PatchChange& patch) -{ - if (patch.patch()->program() > 0) { - MIDI::Name::PatchPrimaryKey key = patch_change_to_patch_key (patch.patch()); - key.program_number--; - change_patch_change (patch, key); - } -} - -void -MidiRegionView::next_bank (PatchChange& patch) -{ - if (patch.patch()->program() < 127) { - MIDI::Name::PatchPrimaryKey key = patch_change_to_patch_key (patch.patch()); - if (key.bank_number > 0) { - key.bank_number--; - change_patch_change (patch, key); - } - } -} - -void -MidiRegionView::previous_bank (PatchChange& patch) +MidiRegionView::step_patch (PatchChange& patch, bool bank, int delta) { - if (patch.patch()->program() > 0) { - MIDI::Name::PatchPrimaryKey key = patch_change_to_patch_key (patch.patch()); - if (key.bank_number < 127) { - key.bank_number++; - change_patch_change (patch, key); - } + MIDI::Name::PatchPrimaryKey key = patch_change_to_patch_key(patch.patch()); + if (bank) { + key.set_bank(key.bank() + delta); + } else { + key.set_program(key.program() + delta); } + change_patch_change(patch, key); } void @@ -2159,6 +2216,24 @@ MidiRegionView::invert_selection () } } +/** Used for selection undo/redo. + The requested notes most likely won't exist in the view until the next model redisplay. +*/ +void +MidiRegionView::select_notes (list > notes) +{ + NoteBase* cne; + list >::iterator n; + + for (n = notes.begin(); n != notes.end(); ++n) { + if ((cne = find_canvas_note(*(*n))) != 0) { + add_to_selection (cne); + } else { + _pending_note_selection.insert(*n); + } + } +} + void MidiRegionView::select_matching_notes (uint8_t notenum, uint16_t channel_mask, bool add, bool extend) { @@ -2275,8 +2350,8 @@ MidiRegionView::note_selected (NoteBase* ev, bool add, bool extend) } else { /* find end of latest note selected, select all between that and the start of "ev" */ - Evoral::MusicalTime earliest = Evoral::MaxMusicalTime; - Evoral::MusicalTime latest = Evoral::MusicalTime(); + Evoral::Beats earliest = Evoral::MaxBeats; + Evoral::Beats latest = Evoral::Beats(); for (Selection::iterator i = _selection.begin(); i != _selection.end(); ++i) { if ((*i)->note()->end_time() > latest) { @@ -2434,7 +2509,7 @@ MidiRegionView::move_selection(double dx, double dy, double cumulative_dy) { typedef vector > PossibleChord; PossibleChord to_play; - Evoral::MusicalTime earliest = Evoral::MaxMusicalTime; + Evoral::Beats earliest = Evoral::MaxBeats; for (Selection::iterator i = _selection.begin(); i != _selection.end(); ++i) { if ((*i)->note()->time() < earliest) { @@ -2449,7 +2524,7 @@ MidiRegionView::move_selection(double dx, double dy, double cumulative_dy) (*i)->move_event(dx, dy); } - if (dy && !_selection.empty() && !_no_sound_notes && Config->get_sound_midi_notes()) { + if (dy && !_selection.empty() && !_no_sound_notes && ARDOUR_UI::config()->get_sound_midi_notes()) { if (to_play.size() > 1) { @@ -2507,7 +2582,7 @@ MidiRegionView::note_dropped(NoteBase *, frameoffset_t dt, int8_t dnote) for (Selection::iterator i = _selection.begin(); i != _selection.end() ; ++i) { framepos_t new_frames = source_beats_to_absolute_frames ((*i)->note()->time()) + dt; - Evoral::MusicalTime new_time = absolute_frames_to_source_beats (new_frames); + Evoral::Beats new_time = absolute_frames_to_source_beats (new_frames); if (new_time < 0) { continue; @@ -2570,7 +2645,7 @@ MidiRegionView::get_end_position_pixels() } framepos_t -MidiRegionView::source_beats_to_absolute_frames(Evoral::MusicalTime beats) const +MidiRegionView::source_beats_to_absolute_frames(Evoral::Beats beats) const { /* the time converter will return the frame corresponding to `beats' relative to the start of the source. The start of the source @@ -2580,7 +2655,7 @@ MidiRegionView::source_beats_to_absolute_frames(Evoral::MusicalTime beats) const return source_start + _source_relative_time_converter.to (beats); } -Evoral::MusicalTime +Evoral::Beats MidiRegionView::absolute_frames_to_source_beats(framepos_t frames) const { /* the `frames' argument needs to be converted into a frame count @@ -2592,12 +2667,12 @@ MidiRegionView::absolute_frames_to_source_beats(framepos_t frames) const } framepos_t -MidiRegionView::region_beats_to_region_frames(Evoral::MusicalTime beats) const +MidiRegionView::region_beats_to_region_frames(Evoral::Beats beats) const { return _region_relative_time_converter.to(beats); } -Evoral::MusicalTime +Evoral::Beats MidiRegionView::region_frames_to_region_beats(framepos_t frames) const { return _region_relative_time_converter.from(frames); @@ -2694,9 +2769,9 @@ MidiRegionView::update_resizing (NoteBase* primary, bool at_front, double delta_ } if (!cursor_set) { - const double snapped_x = snap_pixel_to_sample (current_x); - Evoral::MusicalTime beats = region_frames_to_region_beats (snapped_x); - Evoral::MusicalTime len = Evoral::MusicalTime(); + 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(); if (at_front) { if (beats < canvas_note->note()->end_time()) { @@ -2709,6 +2784,8 @@ MidiRegionView::update_resizing (NoteBase* primary, bool at_front, double delta_ } } + len = std::max(Evoral::Beats(1 / 512.0), len); + char buf[16]; snprintf (buf, sizeof (buf), "%.3g beats", len.to_double()); show_verbose_cursor (buf, 0, 0); @@ -2763,12 +2840,12 @@ MidiRegionView::commit_resizing (NoteBase* primary, bool at_front, double delta_ current_x = snap_pixel_to_sample (current_x) + _region->start (); /* and then to beats */ - const Evoral::MusicalTime x_beats = region_frames_to_region_beats (current_x); + const Evoral::Beats x_beats = region_frames_to_region_beats (current_x); if (at_front && x_beats < canvas_note->note()->end_time()) { note_diff_add_change (canvas_note, MidiModel::NoteDiffCommand::StartTime, x_beats); - Evoral::MusicalTime len = canvas_note->note()->time() - x_beats; + Evoral::Beats len = canvas_note->note()->time() - x_beats; len += canvas_note->note()->length(); if (!!len) { @@ -2777,12 +2854,9 @@ MidiRegionView::commit_resizing (NoteBase* primary, bool at_front, double delta_ } if (!at_front) { - const Evoral::MusicalTime len = x_beats - canvas_note->note()->time(); - - if (!!len) { - /* XXX convert to beats */ - note_diff_add_change (canvas_note, MidiModel::NoteDiffCommand::Length, len); - } + const Evoral::Beats len = std::max(Evoral::Beats(1 / 512.0), + x_beats - canvas_note->note()->time()); + note_diff_add_change (canvas_note, MidiModel::NoteDiffCommand::Length, len); } delete resize_rect; @@ -2837,12 +2911,12 @@ MidiRegionView::change_note_note (NoteBase* event, int8_t note, bool relative) } void -MidiRegionView::trim_note (NoteBase* event, Evoral::MusicalTime front_delta, Evoral::MusicalTime end_delta) +MidiRegionView::trim_note (NoteBase* event, Evoral::Beats front_delta, Evoral::Beats end_delta) { bool change_start = false; bool change_length = false; - Evoral::MusicalTime new_start; - Evoral::MusicalTime new_length; + Evoral::Beats new_start; + Evoral::Beats new_length; /* NOTE: the semantics of the two delta arguments are slightly subtle: @@ -2857,7 +2931,7 @@ MidiRegionView::trim_note (NoteBase* event, Evoral::MusicalTime front_delta, Evo if (front_delta < 0) { if (event->note()->time() < -front_delta) { - new_start = Evoral::MusicalTime(); + new_start = Evoral::Beats(); } else { new_start = event->note()->time() + front_delta; // moves earlier } @@ -2872,7 +2946,7 @@ MidiRegionView::trim_note (NoteBase* event, Evoral::MusicalTime front_delta, Evo } else { - Evoral::MusicalTime new_pos = event->note()->time() + front_delta; + Evoral::Beats new_pos = event->note()->time() + front_delta; if (new_pos < event->note()->end_time()) { new_start = event->note()->time() + front_delta; @@ -2931,14 +3005,14 @@ MidiRegionView::change_note_channel (NoteBase* event, int8_t chn, bool relative) } void -MidiRegionView::change_note_time (NoteBase* event, Evoral::MusicalTime delta, bool relative) +MidiRegionView::change_note_time (NoteBase* event, Evoral::Beats delta, bool relative) { - Evoral::MusicalTime new_time; + Evoral::Beats new_time; if (relative) { if (delta < 0.0) { if (event->note()->time() < -delta) { - new_time = Evoral::MusicalTime(); + new_time = Evoral::Beats(); } else { new_time = event->note()->time() + delta; } @@ -2953,7 +3027,7 @@ MidiRegionView::change_note_time (NoteBase* event, Evoral::MusicalTime delta, bo } void -MidiRegionView::change_note_length (NoteBase* event, Evoral::MusicalTime t) +MidiRegionView::change_note_length (NoteBase* event, Evoral::Beats t) { note_diff_add_change (event, MidiModel::NoteDiffCommand::Length, t); } @@ -3065,11 +3139,11 @@ MidiRegionView::transpose (bool up, bool fine, bool allow_smush) } void -MidiRegionView::change_note_lengths (bool fine, bool shorter, Evoral::MusicalTime delta, bool start, bool end) +MidiRegionView::change_note_lengths (bool fine, bool shorter, Evoral::Beats delta, bool start, bool end) { if (!delta) { if (fine) { - delta = Evoral::MusicalTime(1.0/128.0); + delta = Evoral::Beats(1.0/128.0); } else { /* grab the current grid distance */ delta = get_grid_beats(_region->position()); @@ -3089,8 +3163,8 @@ MidiRegionView::change_note_lengths (bool fine, bool shorter, Evoral::MusicalTim /* note the negation of the delta for start */ trim_note (*i, - (start ? -delta : Evoral::MusicalTime()), - (end ? delta : Evoral::MusicalTime())); + (start ? -delta : Evoral::Beats()), + (end ? delta : Evoral::Beats())); i = next; } @@ -3110,13 +3184,13 @@ MidiRegionView::nudge_notes (bool forward, bool fine) into a vector and sort before using the first one. */ - const framepos_t ref_point = source_beats_to_absolute_frames ((*(_selection.begin()))->note()->time()); - Evoral::MusicalTime delta; + const framepos_t ref_point = source_beats_to_absolute_frames ((*(_selection.begin()))->note()->time()); + Evoral::Beats delta; if (!fine) { /* non-fine, move by 1 bar regardless of snap */ - delta = Evoral::MusicalTime(trackview.session()->tempo_map().meter_at(ref_point).divisions_per_bar()); + delta = Evoral::Beats(trackview.session()->tempo_map().meter_at(ref_point).divisions_per_bar()); } else if (trackview.editor().snap_mode() == Editing::SnapOff) { @@ -3185,13 +3259,13 @@ MidiRegionView::note_entered(NoteBase* ev) { Editor* editor = dynamic_cast(&trackview.editor()); - pre_note_enter_cursor = editor->get_canvas_cursor (); - if (_mouse_state == SelectTouchDragging) { note_selected (ev, true); + } else if (editor->current_mouse_mode() == MouseContent) { + show_verbose_cursor (ev->note ()); + } else if (editor->current_mouse_mode() == MouseDraw) { + show_verbose_cursor (ev->note ()); } - - show_verbose_cursor (ev->note ()); } void @@ -3204,11 +3278,6 @@ MidiRegionView::note_left (NoteBase*) } editor->verbose_cursor()->hide (); - - if (pre_note_enter_cursor) { - editor->set_canvas_cursor (pre_note_enter_cursor); - pre_note_enter_cursor = 0; - } } void @@ -3257,43 +3326,33 @@ MidiRegionView::note_mouse_position (float x_fraction, float /*y_fraction*/, boo { Editor* editor = dynamic_cast(&trackview.editor()); Editing::MouseMode mm = editor->current_mouse_mode(); - bool trimmable = (mm == MouseObject || mm == MouseTimeFX || mm == MouseDraw); + bool trimmable = (mm == MouseContent || mm == MouseTimeFX || mm == MouseDraw); - if (can_set_cursor) { + Editor::EnterContext* ctx = editor->get_enter_context(NoteItem); + if (can_set_cursor && ctx) { if (trimmable && x_fraction > 0.0 && x_fraction < 0.2) { - editor->set_canvas_cursor (editor->cursors()->left_side_trim); + ctx->cursor_ctx->change(editor->cursors()->left_side_trim); } else if (trimmable && x_fraction >= 0.8 && x_fraction < 1.0) { - editor->set_canvas_cursor (editor->cursors()->right_side_trim); - } else if (pre_note_enter_cursor) { - editor->set_canvas_cursor (pre_note_enter_cursor); + ctx->cursor_ctx->change(editor->cursors()->right_side_trim); + } else { + ctx->cursor_ctx->change(editor->cursors()->grabber_note); } } } -void -MidiRegionView::set_frame_color() +uint32_t +MidiRegionView::get_fill_color() const { - uint32_t f; - - TimeAxisViewItem::set_frame_color (); - - if (!frame) { - return; - } - + const std::string mod_name = (_dragging ? "dragging region" : + trackview.editor().internal_editing() ? "editable region" : + "midi frame base"); if (_selected) { - f = ARDOUR_UI::config()->color ("selected region base"); - } else if (high_enough_for_name || !ARDOUR_UI::config()->get_color_regions_using_track_color()) { - f = ARDOUR_UI::config()->color_mod ("midi frame base", "midi frame base"); - } else { - f = fill_color; + 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); } - - if (!rect_visible) { - f = UINT_RGBA_CHANGE_A (f, 80); - } - - frame->set_fill_color (f); + return ARDOUR_UI::config()->color_mod (fill_color, mod_name); } void @@ -3383,8 +3442,6 @@ MidiRegionView::selection_as_cut_buffer () const bool MidiRegionView::paste (framepos_t pos, const ::Selection& selection, PasteContext& ctx) { - trackview.session()->begin_reversible_command (Operations::paste); - // Paste notes, if available MidiNoteSelection::const_iterator m = selection.midi_notes.get_nth(ctx.counts.n_notes()); if (m != selection.midi_notes.end()) { @@ -3399,8 +3456,6 @@ MidiRegionView::paste (framepos_t pos, const ::Selection& selection, PasteContex a->second->paste(pos, selection, ctx); } - trackview.session()->commit_reversible_command (); - return true; } @@ -3414,14 +3469,14 @@ MidiRegionView::paste_internal (framepos_t pos, unsigned paste_count, float time start_note_diff_command (_("paste")); - const Evoral::MusicalTime snap_beats = get_grid_beats(pos); - const Evoral::MusicalTime first_time = (*mcb.notes().begin())->time(); - const Evoral::MusicalTime last_time = (*mcb.notes().rbegin())->end_time(); - const Evoral::MusicalTime duration = last_time - first_time; - const Evoral::MusicalTime snap_duration = duration.snap_to(snap_beats); - const Evoral::MusicalTime paste_offset = snap_duration * paste_count; - const Evoral::MusicalTime pos_beats = absolute_frames_to_source_beats(pos) + paste_offset; - Evoral::MusicalTime end_point = Evoral::MusicalTime(); + const Evoral::Beats snap_beats = get_grid_beats(pos); + const Evoral::Beats first_time = (*mcb.notes().begin())->time(); + const Evoral::Beats last_time = (*mcb.notes().rbegin())->end_time(); + const Evoral::Beats duration = last_time - first_time; + const Evoral::Beats snap_duration = duration.snap_to(snap_beats); + const Evoral::Beats paste_offset = snap_duration * paste_count; + const Evoral::Beats pos_beats = absolute_frames_to_source_beats(pos) + paste_offset; + Evoral::Beats end_point = Evoral::Beats(); DEBUG_TRACE (DEBUG::CutNPaste, string_compose ("Paste data spans from %1 to %2 (%3) ; paste pos beats = %4 (based on %5 - %6)\n", first_time, @@ -3579,6 +3634,8 @@ MidiRegionView::selection_as_notelist (Notes& selected, bool allow_all_if_none_s void MidiRegionView::update_ghost_note (double x, double y) { + x = std::max(0.0, x); + MidiTimeAxisView* const mtv = dynamic_cast(&trackview); _last_ghost_x = x; @@ -3592,20 +3649,17 @@ MidiRegionView::update_ghost_note (double x, double y) framecnt_t grid_frames; framepos_t const f = snap_frame_to_grid_underneath (unsnapped_frame, grid_frames); - /* use region_frames... because we are converting a delta within the region - */ - - const Evoral::MusicalTime length = get_grid_beats(unsnapped_frame); + /* 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 ())); - /* note that this sets the time of the ghost note in beats relative to - the start of the source; that is how all note times are stored. - */ - _ghost_note->note()->set_time ( - std::max(Evoral::MusicalTime(), - absolute_frames_to_source_beats (f + _region->position ()))); + _ghost_note->note()->set_time (time); _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)); /* the ghost note does not appear in ghost regions, so pass false in here */ update_note (_ghost_note, false); @@ -3619,16 +3673,16 @@ MidiRegionView::create_ghost_note (double x, double y) remove_ghost_note (); boost::shared_ptr g (new NoteType); - _ghost_note = new Note (*this, _note_group, g); + if (midi_view()->note_mode() == Sustained) { + _ghost_note = new Note (*this, _note_group, g); + } else { + _ghost_note = new Hit (*this, _note_group, 10, g); + } _ghost_note->set_ignore_events (true); _ghost_note->set_outline_color (0x000000aa); - if (x < 0) { x = 0; } update_ghost_note (x, y); _ghost_note->show (); - _last_ghost_x = x; - _last_ghost_y = y; - show_verbose_cursor (_ghost_note->note ()); } @@ -3667,9 +3721,9 @@ MidiRegionView::maybe_select_by_position (GdkEventButton* ev, double /*x*/, doub uint16_t chn_mask = mtv->midi_track()->get_playback_channel_mask(); if (Keyboard::modifier_state_equals (ev->state, Keyboard::TertiaryModifier)) { - get_events (e, Evoral::Sequence::PitchGreaterThanOrEqual, (uint8_t) floor (note), chn_mask); + get_events (e, Evoral::Sequence::PitchGreaterThanOrEqual, (uint8_t) floor (note), chn_mask); } else if (Keyboard::modifier_state_equals (ev->state, Keyboard::PrimaryModifier)) { - get_events (e, Evoral::Sequence::PitchLessThanOrEqual, (uint8_t) floor (note), chn_mask); + get_events (e, Evoral::Sequence::PitchLessThanOrEqual, (uint8_t) floor (note), chn_mask); } else { return; } @@ -3714,7 +3768,7 @@ MidiRegionView::enable_display (bool yn) } void -MidiRegionView::show_step_edit_cursor (Evoral::MusicalTime pos) +MidiRegionView::show_step_edit_cursor (Evoral::Beats pos) { if (_step_edit_cursor == 0) { ArdourCanvas::Item* const group = get_canvas_group(); @@ -3731,7 +3785,7 @@ MidiRegionView::show_step_edit_cursor (Evoral::MusicalTime pos) } void -MidiRegionView::move_step_edit_cursor (Evoral::MusicalTime pos) +MidiRegionView::move_step_edit_cursor (Evoral::Beats pos) { _step_edit_cursor_position = pos; @@ -3751,7 +3805,7 @@ MidiRegionView::hide_step_edit_cursor () } void -MidiRegionView::set_step_edit_cursor_width (Evoral::MusicalTime beats) +MidiRegionView::set_step_edit_cursor_width (Evoral::Beats beats) { _step_edit_cursor_width = beats; @@ -3781,8 +3835,6 @@ MidiRegionView::data_recorded (boost::weak_ptr w) boost::shared_ptr buf = mtv->midi_track()->get_gui_feed_buffer (); - BeatsFramesConverter converter (trackview.session()->tempo_map(), mtv->midi_track()->get_capture_start_frame (0)); - framepos_t back = max_framepos; for (MidiBuffer::iterator i = buf->begin(); i != buf->end(); ++i) { @@ -3796,16 +3848,13 @@ MidiRegionView::data_recorded (boost::weak_ptr w) } } - /* ev.time() is in session frames, so (ev.time() - converter.origin_b()) is - frames from the start of the source, and so time_beats is in terms of the - source. - */ - - Evoral::MusicalTime const time_beats = converter.from (ev.time () - converter.origin_b ()); + /* convert from session frames to source beats */ + Evoral::Beats const time_beats = _source_relative_time_converter.from( + ev.time() - src->timeline_position() + _region->start()); if (ev.type() == MIDI_CMD_NOTE_ON) { boost::shared_ptr note ( - new NoteType (ev.channel(), time_beats, Evoral::MusicalTime(), ev.note(), ev.velocity())); + new NoteType (ev.channel(), time_beats, Evoral::Beats(), ev.note(), ev.velocity())); add_note (note, true); @@ -3898,8 +3947,8 @@ MidiRegionView::show_verbose_cursor (boost::shared_ptr n) const get_patch_key_at(n->time(), n->channel(), patch_key); name = device_names->note_name(mtv->gui_property(X_("midnam-custom-device-mode")), n->channel(), - patch_key.bank_number, - patch_key.program_number, + patch_key.bank(), + patch_key.program(), n->note()); } } @@ -3922,6 +3971,33 @@ MidiRegionView::show_verbose_cursor (string const & text, double xoffset, double trackview.editor().verbose_cursor()->set_offset (ArdourCanvas::Duple (xoffset, yoffset)); } +uint8_t +MidiRegionView::get_velocity_for_add (MidiModel::TimeType time) const +{ + if (_model->notes().empty()) { + return 0x40; // No notes, use default + } + + MidiModel::Notes::const_iterator m = _model->note_lower_bound(time); + if (m == _model->notes().begin()) { + // Before the start, use the velocity of the first note + return (*m)->velocity(); + } else if (m == _model->notes().end()) { + // Past the end, use the velocity of the last note + --m; + return (*m)->velocity(); + } + + // Interpolate velocity of surrounding notes + MidiModel::Notes::const_iterator n = m; + --n; + + const double frac = ((time - (*n)->time()).to_double() / + ((*m)->time() - (*n)->time()).to_double()); + + return (*n)->velocity() + (frac * ((*m)->velocity() - (*n)->velocity())); +} + /** @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. @@ -3931,7 +4007,7 @@ MidiRegionView::snap_frame_to_grid_underneath (framepos_t p, framecnt_t& grid_fr { PublicEditor& editor = trackview.editor (); - const Evoral::MusicalTime grid_beats = get_grid_beats(p); + const Evoral::Beats grid_beats = get_grid_beats(p); grid_frames = region_beats_to_region_frames (grid_beats); @@ -3962,8 +4038,7 @@ MidiRegionView::selection_cleared (MidiRegionView* rv) void MidiRegionView::note_button_release () { - delete _note_player; - _note_player = 0; + _note_player.reset(); } ChannelMode @@ -3981,14 +4056,14 @@ MidiRegionView::get_selected_channels () const } -Evoral::MusicalTime +Evoral::Beats MidiRegionView::get_grid_beats(framepos_t pos) const { - PublicEditor& editor = trackview.editor(); - bool success = false; - Evoral::MusicalTime beats = editor.get_grid_type_as_beats(success, pos); + PublicEditor& editor = trackview.editor(); + bool success = false; + Evoral::Beats beats = editor.get_grid_type_as_beats(success, pos); if (!success) { - beats = Evoral::MusicalTime(1); + beats = Evoral::Beats(1); } return beats; }