X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fmidi_region_view.cc;h=00bdb94dce74911508c11846a94b7a0811c3cd2c;hb=90619f4b9869ceccb29965e916ec07fe197b86da;hp=c46d96419d5ef6e4a9e39c3b5f8fa20fee998f24;hpb=74fa33486c4ee1acaa5a83b6c850971ea326d656;p=ardour.git diff --git a/gtk2_ardour/midi_region_view.cc b/gtk2_ardour/midi_region_view.cc index c46d96419d..00bdb94dce 100644 --- a/gtk2_ardour/midi_region_view.cc +++ b/gtk2_ardour/midi_region_view.cc @@ -51,9 +51,11 @@ #include "canvas_patch_change.h" #include "debug.h" #include "editor.h" +#include "editor_drag.h" #include "ghostregion.h" #include "gui_thread.h" #include "keyboard.h" +#include "midi_channel_dialog.h" #include "midi_cut_buffer.h" #include "midi_list_editor.h" #include "midi_region_view.h" @@ -79,6 +81,10 @@ using namespace Editing; using namespace ArdourCanvas; using Gtkmm2ext::Keyboard; +PBD::Signal1 MidiRegionView::SelectionCleared; + +#define MIDI_BP_ZERO ((Config->get_first_midi_bank_is_zero())?0:1) + MidiRegionView::MidiRegionView (ArdourCanvas::Group *parent, RouteTimeAxisView &tv, boost::shared_ptr r, double spu, Gdk::Color const & basic_color) : RegionView (parent, tv, r, spu, basic_color) @@ -111,7 +117,10 @@ MidiRegionView::MidiRegionView (ArdourCanvas::Group *parent, RouteTimeAxisView & _note_group->raise_to_top(); PublicEditor::DropDownKeys.connect (sigc::mem_fun (*this, &MidiRegionView::drop_down_keys)); + Config->ParameterChanged.connect (*this, invalidator (*this), ui_bind (&MidiRegionView::parameter_changed, this, _1), gui_context()); connect_to_diskstream (); + + SelectionCleared.connect (_selection_cleared_connection, invalidator (*this), ui_bind (&MidiRegionView::selection_cleared, this, _1), gui_context ()); } MidiRegionView::MidiRegionView (ArdourCanvas::Group *parent, RouteTimeAxisView &tv, @@ -145,6 +154,18 @@ MidiRegionView::MidiRegionView (ArdourCanvas::Group *parent, RouteTimeAxisView & PublicEditor::DropDownKeys.connect (sigc::mem_fun (*this, &MidiRegionView::drop_down_keys)); connect_to_diskstream (); + + SelectionCleared.connect (_selection_cleared_connection, invalidator (*this), ui_bind (&MidiRegionView::selection_cleared, this, _1), gui_context ()); +} + +void +MidiRegionView::parameter_changed (std::string const & p) +{ + if (p == "diplay-first-midi-bank-as-zero") { + if (_enable_display) { + redisplay_model(); + } + } } MidiRegionView::MidiRegionView (const MidiRegionView& other) @@ -221,7 +242,7 @@ MidiRegionView::init (Gdk::Color const & basic_color, bool wfd) { PublicEditor::DropDownKeys.connect (sigc::mem_fun (*this, &MidiRegionView::drop_down_keys)); - CanvasNoteEvent::CanvasNoteEventDeleted.connect (note_delete_connection, MISSING_INVALIDATOR, + CanvasNoteEvent::CanvasNoteEventDeleted.connect (note_delete_connection, MISSING_INVALIDATOR, ui_bind (&MidiRegionView::maybe_remove_deleted_note_from_selection, this, _1), gui_context()); @@ -268,7 +289,16 @@ MidiRegionView::init (Gdk::Color const & basic_color, bool wfd) ui_bind(&MidiRegionView::snap_changed, this), gui_context()); + Config->ParameterChanged.connect (*this, invalidator (*this), ui_bind (&MidiRegionView::parameter_changed, this, _1), gui_context()); connect_to_diskstream (); + + SelectionCleared.connect (_selection_cleared_connection, invalidator (*this), ui_bind (&MidiRegionView::selection_cleared, this, _1), gui_context ()); +} + +const boost::shared_ptr +MidiRegionView::midi_region() const +{ + return boost::dynamic_pointer_cast(_region); } void @@ -276,7 +306,7 @@ MidiRegionView::connect_to_diskstream () { midi_view()->midi_track()->DataRecorded.connect( *this, invalidator(*this), - ui_bind(&MidiRegionView::data_recorded, this, _1, _2), + ui_bind(&MidiRegionView::data_recorded, this, _1), gui_context()); } @@ -296,7 +326,7 @@ MidiRegionView::canvas_event(GdkEvent* ev) default: break; } - + if (!trackview.editor().internal_editing()) { return false; } @@ -319,7 +349,7 @@ MidiRegionView::canvas_event(GdkEvent* ev) case GDK_BUTTON_RELEASE: return button_release (&ev->button); - + case GDK_ENTER_NOTIFY: return enter_notify (&ev->crossing); @@ -329,7 +359,7 @@ MidiRegionView::canvas_event(GdkEvent* ev) case GDK_MOTION_NOTIFY: return motion (&ev->motion); - default: + default: break; } @@ -348,15 +378,19 @@ MidiRegionView::enter_notify (GdkEventCrossing* ev) { trackview.editor().MouseModeChanged.connect ( _mouse_mode_connection, invalidator (*this), ui_bind (&MidiRegionView::mouse_mode_changed, this), gui_context () - ); - - Keyboard::magic_widget_grab_focus(); - group->grab_focus(); + ); if (trackview.editor().current_mouse_mode() == MouseRange) { create_ghost_note (ev->x, ev->y); } + if (!trackview.editor().internal_editing()) { + Keyboard::magic_widget_drop_focus(); + } else { + Keyboard::magic_widget_grab_focus(); + group->grab_focus(); + } + return false; } @@ -364,9 +398,10 @@ bool MidiRegionView::leave_notify (GdkEventCrossing*) { _mouse_mode_connection.disconnect (); - + trackview.editor().verbose_cursor()->hide (); remove_ghost_note (); + return false; } @@ -379,6 +414,13 @@ MidiRegionView::mouse_mode_changed () remove_ghost_note (); trackview.editor().verbose_cursor()->hide (); } + + if (!trackview.editor().internal_editing()) { + Keyboard::magic_widget_drop_focus(); + } else { + Keyboard::magic_widget_grab_focus(); + group->grab_focus(); + } } bool @@ -390,17 +432,17 @@ MidiRegionView::button_press (GdkEventButton* ev) _last_x = ev->x; _last_y = ev->y; - + group->w2i (_last_x, _last_y); - + if (_mouse_state != SelectTouchDragging) { - + _pressed_button = ev->button; _mouse_state = Pressed; - + return true; } - + _pressed_button = ev->button; return true; @@ -410,7 +452,6 @@ bool MidiRegionView::button_release (GdkEventButton* ev) { double event_x, event_y; - framepos_t event_frame = 0; if (ev->button != 1) { return false; @@ -418,37 +459,37 @@ MidiRegionView::button_release (GdkEventButton* ev) event_x = ev->x; event_y = ev->y; - + group->w2i(event_x, event_y); group->ungrab(ev->time); - - event_frame = trackview.editor().pixel_to_frame(event_x); + + PublicEditor& editor = trackview.editor (); switch (_mouse_state) { - case Pressed: // Clicked + case Pressed: // Clicked - switch (trackview.editor().current_mouse_mode()) { + switch (editor.current_mouse_mode()) { case MouseObject: case MouseTimeFX: { clear_selection(); - - if (Keyboard::is_insert_note_event(ev)){ - + + if (Keyboard::is_insert_note_event(ev)) { + double event_x, event_y; - + event_x = ev->x; event_y = ev->y; group->w2i(event_x, event_y); bool success; - Evoral::MusicalTime beats = trackview.editor().get_grid_type_as_beats (success, trackview.editor().pixel_to_frame (event_x)); - + Evoral::MusicalTime beats = editor.get_grid_type_as_beats (success, editor.pixel_to_frame (event_x)); + if (!success) { beats = 1; } - - create_note_at (event_x, event_y, beats, true); + + create_note_at (event_x, event_y, beats, true, true); } break; @@ -456,42 +497,40 @@ MidiRegionView::button_release (GdkEventButton* ev) case MouseRange: { bool success; - Evoral::MusicalTime beats = trackview.editor().get_grid_type_as_beats (success, trackview.editor().pixel_to_frame (event_x)); - + Evoral::MusicalTime beats = editor.get_grid_type_as_beats (success, editor.pixel_to_frame (event_x)); + if (!success) { beats = 1; } - - create_note_at (event_x, event_y, beats, true); - + + create_note_at (event_x, event_y, beats, true, true); + break; } default: break; } - + _mouse_state = None; break; - + case SelectRectDragging: // Select drag done - + editor.drags()->end_grab ((GdkEvent *) ev); _mouse_state = None; - delete _drag_rect; - _drag_rect = 0; break; case AddDragging: // Add drag done _mouse_state = None; - - if (Keyboard::is_insert_note_event(ev) || trackview.editor().current_mouse_mode() == MouseRange){ - + + if (Keyboard::is_insert_note_event(ev) || trackview.editor().current_mouse_mode() == MouseRange) { + if (_drag_rect->property_x2() > _drag_rect->property_x1() + 2) { const double x = _drag_rect->property_x1(); const double length = trackview.editor().pixel_to_frame (_drag_rect->property_x2() - _drag_rect->property_x1()); - create_note_at (x, _drag_rect->property_y1(), frames_to_beats(length), true); + create_note_at (x, _drag_rect->property_y1(), region_frames_to_region_beats(length), true, false); } } @@ -499,7 +538,7 @@ MidiRegionView::button_release (GdkEventButton* ev) _drag_rect = 0; create_ghost_note (ev->x, ev->y); - + default: break; } @@ -517,91 +556,70 @@ MidiRegionView::motion (GdkEventMotion* ev) event_y = ev->y; group->w2i(event_x, event_y); + PublicEditor& editor = trackview.editor (); + // convert event_x to global frame - event_frame = snap_pixel_to_frame (event_x); + framecnt_t grid_frames; + event_frame = snap_frame_to_grid_underneath (editor.pixel_to_frame (event_x), grid_frames); + + if (!_ghost_note && editor.current_mouse_mode() != MouseRange + && Keyboard::modifier_state_contains (ev->state, Keyboard::insert_note_modifier()) + && _mouse_state != AddDragging) { - if (!_ghost_note && trackview.editor().current_mouse_mode() != MouseRange - && Keyboard::modifier_state_contains (ev->state, Keyboard::insert_note_modifier()) - && _mouse_state != AddDragging){ - create_ghost_note (ev->x, ev->y); - } - else if (_ghost_note && trackview.editor().current_mouse_mode() != MouseRange - && Keyboard::modifier_state_contains (ev->state, Keyboard::insert_note_modifier())){ - + } else if (_ghost_note && editor.current_mouse_mode() != MouseRange + && Keyboard::modifier_state_contains (ev->state, Keyboard::insert_note_modifier())) { + update_ghost_note (ev->x, ev->y); - } - else if (_ghost_note && trackview.editor().current_mouse_mode() != MouseRange){ - + } else if (_ghost_note && editor.current_mouse_mode() != MouseRange) { + delete _ghost_note; _ghost_note = 0; - - trackview.editor().verbose_cursor()->hide (); - } - else if (_ghost_note && trackview.editor().current_mouse_mode() == MouseRange) { + + editor.verbose_cursor()->hide (); + } else if (_ghost_note && editor.current_mouse_mode() == MouseRange) { update_ghost_note (ev->x, ev->y); } /* any motion immediately hides velocity text that may have been visible */ - + for (Selection::iterator i = _selection.begin(); i != _selection.end(); ++i) { (*i)->hide_velocity (); } switch (_mouse_state) { case Pressed: // Maybe start a drag, if we've moved a bit - + if (fabs (event_x - _last_x) < 1 && fabs (event_y - _last_y) < 1) { /* no appreciable movement since the button was pressed */ return false; } - // Select drag start - if (_pressed_button == 1 && trackview.editor().current_mouse_mode() == MouseObject + if (_pressed_button == 1 && editor.current_mouse_mode() == MouseObject && !Keyboard::modifier_state_contains (ev->state, Keyboard::insert_note_modifier())) { - - group->grab(GDK_POINTER_MOTION_MASK | GDK_BUTTON_RELEASE_MASK, - Gdk::Cursor(Gdk::FLEUR), ev->time); - - _last_x = event_x; - _last_y = event_y; - _drag_start_x = event_x; - _drag_start_y = event_y; - - _drag_rect = new ArdourCanvas::SimpleRect(*group); - _drag_rect->property_x1() = event_x; - _drag_rect->property_y1() = event_y; - _drag_rect->property_x2() = event_x; - _drag_rect->property_y2() = event_y; - _drag_rect->property_outline_what() = 0xFF; - _drag_rect->property_outline_color_rgba() - = ARDOUR_UI::config()->canvasvar_MidiSelectRectOutline.get(); - _drag_rect->property_fill_color_rgba() - = ARDOUR_UI::config()->canvasvar_MidiSelectRectFill.get(); + editor.drags()->set (new MidiRubberbandSelectDrag (dynamic_cast (&editor), this), (GdkEvent *) ev); _mouse_state = SelectRectDragging; return true; + } else if (editor.internal_editing()) { // Add note drag start - } else if (trackview.editor().internal_editing()) { - delete _ghost_note; - _ghost_note = 0; - group->grab(GDK_POINTER_MOTION_MASK | GDK_BUTTON_RELEASE_MASK, Gdk::Cursor(Gdk::FLEUR), ev->time); - + _last_x = event_x; _last_y = event_y; _drag_start_x = event_x; _drag_start_y = event_y; _drag_rect = new ArdourCanvas::SimpleRect(*group); - _drag_rect->property_x1() = trackview.editor().frame_to_pixel(event_frame); + _drag_rect->property_x1() = editor.frame_to_pixel(event_frame); _drag_rect->property_y1() = midi_stream_view()->note_to_y( midi_stream_view()->y_to_note(event_y)); - _drag_rect->property_x2() = trackview.editor().frame_to_pixel(event_frame); + _drag_rect->property_x2() = editor.frame_to_pixel(event_frame); + _drag_rect->property_y2() = _drag_rect->property_y1() + floor(midi_stream_view()->note_height()); _drag_rect->property_outline_what() = 0xFF; @@ -609,21 +627,21 @@ MidiRegionView::motion (GdkEventMotion* ev) _drag_rect->property_fill_color_rgba() = 0xFFFFFF66; _mouse_state = AddDragging; + + delete _ghost_note; + _ghost_note = 0; - if (_ghost_note){ - - delete _ghost_note; - _ghost_note = 0; - - trackview.editor().verbose_cursor()->hide (); - } + editor.verbose_cursor()->hide (); return true; } return false; - case SelectRectDragging: // Select drag motion + case SelectRectDragging: + editor.drags()->motion_handler ((GdkEvent *) ev, false); + break; + case AddDragging: // Add note drag motion if (ev->is_hint) { @@ -635,13 +653,23 @@ MidiRegionView::motion (GdkEventMotion* ev) event_y = t_y; } - if (_mouse_state == AddDragging){ - event_x = trackview.editor().frame_to_pixel(event_frame); + if (_mouse_state == AddDragging) { + event_x = editor.frame_to_pixel(event_frame); + + if (editor.snap_mode() == SnapNormal) { + /* event_frame will have been snapped to the start of the note we are under; + it's more intuitive if we use the end of that note here + */ + event_x = editor.frame_to_pixel (event_frame + grid_frames); + } else { + event_x = editor.frame_to_pixel (event_frame); + } + } if (_drag_rect) { - - if (event_x > _drag_start_x){ + + if (event_x > _drag_start_x) { _drag_rect->property_x2() = event_x; } else { @@ -649,18 +677,6 @@ MidiRegionView::motion (GdkEventMotion* ev) } } - if (_drag_rect && _mouse_state == SelectRectDragging) { - - if (event_y > _drag_start_y){ - _drag_rect->property_y2() = event_y; - } - else { - _drag_rect->property_y1() = event_y; - } - - update_drag_selection(_drag_start_x, event_x, _drag_start_y, event_y); - } - _last_x = event_x; _last_y = event_y; @@ -682,111 +698,174 @@ 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. + */ + return false; + } + trackview.editor().verbose_cursor()->hide (); bool fine = !Keyboard::modifier_state_equals (ev->state, Keyboard::SecondaryModifier); - + if (ev->direction == GDK_SCROLL_UP) { change_velocities (true, fine, false); } else if (ev->direction == GDK_SCROLL_DOWN) { change_velocities (false, fine, false); - } + } return true; } bool MidiRegionView::key_press (GdkEventKey* ev) -{ +{ /* since GTK bindings are generally activated on press, and since detectable auto-repeat is the name of the game and only sends repeated presses, carry out key actions at key press, not release. */ - - if (ev->keyval == GDK_Alt_L || ev->keyval == GDK_Alt_R){ + + 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) { + + } else if (ev->keyval == GDK_Escape && unmodified) { clear_selection(); _mouse_state = None; - - } else if (ev->keyval == GDK_comma || ev->keyval == GDK_period) { - + + } else if (unmodified && (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, 0.0, start, end); - + return true; - - } else if (ev->keyval == GDK_Delete) { - + + } else if (ev->keyval == GDK_Delete && unmodified) { + delete_selection(); return true; - + } else if (ev->keyval == GDK_Tab) { - - if (Keyboard::modifier_state_equals (ev->state, Keyboard::PrimaryModifier)) { - goto_previous_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)); + } + return true; + + } else if (ev->keyval == GDK_ISO_Left_Tab) { + + /* Shift-TAB generates ISO Left Tab, for some reason */ + + if (Keyboard::modifier_state_contains (ev->state, Keyboard::PrimaryModifier)) { + goto_previous_note (Keyboard::modifier_state_contains (ev->state, Keyboard::TertiaryModifier)); } else { - goto_next_note (); + goto_next_note (Keyboard::modifier_state_contains (ev->state, Keyboard::TertiaryModifier)); } return true; - + + + } else if (ev->keyval == GDK_Up) { - + bool allow_smush = Keyboard::modifier_state_contains (ev->state, Keyboard::TertiaryModifier); bool fine = !Keyboard::modifier_state_contains (ev->state, Keyboard::SecondaryModifier); - + if (Keyboard::modifier_state_contains (ev->state, Keyboard::PrimaryModifier)) { change_velocities (true, fine, allow_smush); } else { transpose (true, fine, allow_smush); } return true; - + } else if (ev->keyval == GDK_Down) { - + bool allow_smush = Keyboard::modifier_state_contains (ev->state, Keyboard::TertiaryModifier); bool fine = !Keyboard::modifier_state_contains (ev->state, Keyboard::SecondaryModifier); - + if (Keyboard::modifier_state_contains (ev->state, Keyboard::PrimaryModifier)) { change_velocities (false, fine, allow_smush); } else { transpose (false, fine, allow_smush); } return true; - - } else if (ev->keyval == GDK_Left) { - + + } else if (ev->keyval == GDK_Left && unmodified) { + nudge_notes (false); return true; - - } else if (ev->keyval == GDK_Right) { - + + } else if (ev->keyval == GDK_Right && unmodified) { + nudge_notes (true); return true; - - } else if (ev->keyval == GDK_Control_L) { - return true; + } else if (ev->keyval == GDK_c && unmodified) { + channel_edit (); + return true; } - + return false; } bool MidiRegionView::key_release (GdkEventKey* ev) { - if (ev->keyval == GDK_Alt_L || ev->keyval == GDK_Alt_R) { + if ((_mouse_state == SelectTouchDragging) && (ev->keyval == GDK_Alt_L || ev->keyval == GDK_Alt_R)) { _mouse_state = None; return true; } return false; } +void +MidiRegionView::channel_edit () +{ + bool first = true; + uint8_t current_channel = 0; + + if (_selection.empty()) { + return; + } + + for (Selection::iterator i = _selection.begin(); i != _selection.end(); ++i) { + if (first) { + current_channel = (*i)->note()->channel (); + first = false; + } + } + + MidiChannelDialog channel_dialog (current_channel); + int ret = channel_dialog.run (); + + switch (ret) { + case Gtk::RESPONSE_OK: + break; + default: + return; + } + + uint8_t new_channel = channel_dialog.active_channel (); + + start_note_diff_command (_("channel edit")); + + for (Selection::iterator i = _selection.begin(); i != _selection.end(); ) { + Selection::iterator next = i; + ++next; + change_note_channel (*i, new_channel); + i = next; + } + + apply_diff (); +} + void MidiRegionView::show_list_editor () { @@ -801,9 +880,10 @@ MidiRegionView::show_list_editor () * \param y vertical position in pixels * \param length duration of the note in beats, which will be snapped to the grid * \param sh true to make the note 1 frame shorter than the snapped version of \a length. + * \param snap_x true to snap x to the grid, otherwise false. */ void -MidiRegionView::create_note_at(double x, double y, double length, bool sh) +MidiRegionView::create_note_at (double x, double y, double length, bool sh, bool snap_x) { MidiTimeAxisView* const mtv = dynamic_cast(&trackview); MidiStreamView* const view = mtv->midi_view(); @@ -814,21 +894,25 @@ MidiRegionView::create_note_at(double x, double y, double length, bool sh) assert(note <= 127.0); // Start of note in frames relative to region start - framepos_t const start_frames = snap_pixel_to_frame (x); + framepos_t start_frames = trackview.editor().pixel_to_frame (x); + if (snap_x) { + framecnt_t grid_frames; + start_frames = snap_frame_to_grid_underneath (start_frames, grid_frames); + } assert(start_frames >= 0); // Snap length - length = frames_to_beats( - snap_frame_to_frame(start_frames + beats_to_frames(length)) - start_frames); + length = region_frames_to_region_beats( + snap_frame_to_frame (start_frames + region_beats_to_region_frames(length)) - start_frames); assert (length != 0); if (sh) { - length = frames_to_beats (beats_to_frames (length) - 1); + length = region_frames_to_region_beats (region_beats_to_region_frames (length) - 1); } - const boost::shared_ptr new_note (new NoteType (get_channel_for_add (), - frames_to_beats(start_frames + _region->start()), length, + const boost::shared_ptr new_note (new NoteType (mtv->get_channel_for_add (), + region_frames_to_region_beats(start_frames + _region->start()), length, (uint8_t)note, 0x40)); if (_model->contains (new_note)) { @@ -870,7 +954,7 @@ void MidiRegionView::display_model(boost::shared_ptr model) { _model = model; - + content_connection.disconnect (); _model->ContentsChanged.connect (content_connection, invalidator (*this), boost::bind (&MidiRegionView::redisplay_model, this), gui_context()); @@ -952,10 +1036,10 @@ MidiRegionView::apply_diff (bool as_subcommand) } else { _model->apply_command (*trackview.session(), _note_diff_command); } - + _note_diff_command = 0; midi_view()->midi_track()->playlist_modified(); - + if (add_or_remove) { _marked_for_selection.clear(); } @@ -1072,8 +1156,17 @@ MidiRegionView::redisplay_model() 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; } @@ -1081,7 +1174,7 @@ MidiRegionView::redisplay_model() _patch_changes.clear(); _sys_exes.clear(); - + display_sysexes(); display_patch_changes (); @@ -1106,6 +1199,7 @@ MidiRegionView::display_patch_changes () if (chn_mask & (1<channel() != channel) { continue; } - + MIDI::Name::PatchPrimaryKey patch_key ((*i)->bank_msb (), (*i)->bank_lsb (), (*i)->program ()); boost::shared_ptr patch = @@ -1128,8 +1222,8 @@ MidiRegionView::display_patch_changes_on_channel (uint8_t channel) add_canvas_patch_change (*i, patch->name()); } else { char buf[16]; - /* program and bank numbers are zero-based: convert to one-based */ - snprintf (buf, 16, "%d\n%d", (*i)->program() + 1, (*i)->bank() + 1); + /* program and bank numbers are zero-based: convert to one-based: MIDI_BP_ZERO */ + snprintf (buf, 16, "%d %d", (*i)->program() + MIDI_BP_ZERO , (*i)->bank() + MIDI_BP_ZERO); add_canvas_patch_change (*i, buf); } } @@ -1152,7 +1246,7 @@ MidiRegionView::display_sysexes() } string text = str.str(); - const double x = trackview.editor().frame_to_pixel(beats_to_frames(time)); + const double x = trackview.editor().frame_to_pixel(source_beats_to_absolute_frames(time)); double height = midi_stream_view()->contents_height(); @@ -1218,7 +1312,7 @@ MidiRegionView::reset_width_dependent_items (double pixel_width) if (_enable_display) { redisplay_model(); } - + move_step_edit_cursor (_step_edit_cursor_position); set_step_edit_cursor_width (_step_edit_cursor_width); } @@ -1238,7 +1332,7 @@ MidiRegionView::set_height (double height) if (name_pixbuf) { name_pixbuf->raise_to_top(); } - + for (PatchChanges::iterator x = _patch_changes.begin(); x != _patch_changes.end(); ++x) { (*x)->set_height (midi_stream_view()->contents_height()); } @@ -1364,7 +1458,11 @@ MidiRegionView::resolve_note(uint8_t note, double end_time) if (_active_notes && _active_notes[note]) { - const framepos_t end_time_frames = beats_to_frames(end_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 + */ + const framepos_t end_time_frames = region_beats_to_region_frames(end_time); _active_notes[note]->property_x2() = trackview.editor().frame_to_pixel(end_time_frames); _active_notes[note]->property_outline_what() = (guint32) 0xF; // all edges @@ -1398,7 +1496,7 @@ MidiRegionView::play_midi_note(boost::shared_ptr note) } RouteUI* route_ui = dynamic_cast (&trackview); - + if (!route_ui || !route_ui->midi_track()) { return; } @@ -1416,7 +1514,7 @@ MidiRegionView::play_midi_chord (vector > notes) } RouteUI* route_ui = dynamic_cast (&trackview); - + if (!route_ui || !route_ui->midi_track()) { return; } @@ -1432,12 +1530,10 @@ MidiRegionView::play_midi_chord (vector > notes) bool -MidiRegionView::note_in_region_range(const boost::shared_ptr note, bool& visible) const +MidiRegionView::note_in_region_range (const boost::shared_ptr note, bool& visible) const { - const framepos_t note_start_frames = beats_to_frames(note->time()); - - bool outside = (note_start_frames - _region->start() >= _region->length()) || - (note_start_frames < _region->start()); + const framepos_t note_start_frames = source_beats_to_region_frames (note->time()); + bool outside = (note_start_frames < 0) || (note_start_frames > _region->last_frame()); visible = (note->note() >= midi_stream_view()->lowest_note()) && (note->note() <= midi_stream_view()->highest_note()); @@ -1454,24 +1550,21 @@ MidiRegionView::update_note (CanvasNote* ev, bool update_ghost_regions) { boost::shared_ptr note = ev->note(); - const framepos_t note_start_frames = beats_to_frames(note->time()); - - /* trim note display to not overlap the end of its region */ - const framepos_t note_end_frames = min (beats_to_frames (note->end_time()), _region->start() + _region->length()); - - const double x = trackview.editor().frame_to_pixel(note_start_frames - _region->start()); + const double x = trackview.editor().frame_to_pixel (source_beats_to_region_frames (note->time())); const double y1 = midi_stream_view()->note_to_y(note->note()); - const double note_endpixel = trackview.editor().frame_to_pixel(note_end_frames - _region->start()); ev->property_x1() = x; ev->property_y1() = y1; - + + /* trim note display to not overlap the end of its region */ + if (note->length() > 0) { - ev->property_x2() = note_endpixel; + const framepos_t note_end_frames = min (source_beats_to_region_frames (note->end_time()), _region->length()); + ev->property_x2() = trackview.editor().frame_to_pixel (note_end_frames); } else { - ev->property_x2() = trackview.editor().frame_to_pixel(_region->length()); + ev->property_x2() = trackview.editor().frame_to_pixel (_region->length()); } - + ev->property_y2() = y1 + floor(midi_stream_view()->note_height()); if (note->length() == 0) { @@ -1509,8 +1602,8 @@ MidiRegionView::update_hit (CanvasHit* ev) { boost::shared_ptr note = ev->note(); - const framepos_t note_start_frames = beats_to_frames(note->time()); - const double x = trackview.editor().frame_to_pixel(note_start_frames - _region->start()); + const framepos_t note_start_frames = source_beats_to_region_frames(note->time()); + const double x = trackview.editor().frame_to_pixel(note_start_frames); const double diamond_size = midi_stream_view()->note_height() / 2.0; const double y = midi_stream_view()->note_to_y(note->note()) + ((diamond_size-2) / 4.0); @@ -1555,7 +1648,7 @@ MidiRegionView::add_note(const boost::shared_ptr note, bool visible) const double diamond_size = midi_stream_view()->note_height() / 2.0; - CanvasHit* ev_diamond = new CanvasHit(*this, *_note_group, diamond_size, note); + CanvasHit* ev_diamond = new CanvasHit (*this, *_note_group, diamond_size, note); update_hit (ev_diamond); @@ -1573,7 +1666,7 @@ MidiRegionView::add_note(const boost::shared_ptr note, bool visible) if (_marked_for_velocity.find(note) != _marked_for_velocity.end()) { event->show_velocity(); } - + event->on_channel_selection_change(_last_channel_selection); _events.push_back(event); @@ -1583,11 +1676,11 @@ MidiRegionView::add_note(const boost::shared_ptr note, bool visible) event->hide (); } } - + MidiTimeAxisView* const mtv = dynamic_cast(&trackview); MidiStreamView* const view = mtv->midi_view(); - view->update_note_range(note->note()); + view->update_note_range (note->note()); } void @@ -1598,13 +1691,13 @@ MidiRegionView::step_add_note (uint8_t channel, uint8_t number, uint8_t velocity /* potentially extend region to hold new note */ - framepos_t end_frame = _region->position() + beats_to_frames (new_note->end_time()); - framepos_t region_end = _region->position() + _region->length() - 1; + framepos_t end_frame = source_beats_to_absolute_frames (new_note->end_time()); + framepos_t region_end = _region->last_frame(); if (end_frame > region_end) { - _region->set_length (end_frame - _region->position(), this); + _region->set_length (end_frame - _region->position()); } - + MidiTimeAxisView* const mtv = dynamic_cast(&trackview); MidiStreamView* const view = mtv->midi_view(); @@ -1631,7 +1724,7 @@ MidiRegionView::add_canvas_patch_change (MidiModel::PatchChangePtr patch, const { assert (patch->time() >= 0); - const double x = trackview.editor().frame_to_pixel (beats_to_frames (patch->time())); + const double x = trackview.editor().frame_to_pixel (source_beats_to_region_frames (patch->time())); double const height = midi_stream_view()->contents_height(); @@ -1662,7 +1755,7 @@ MidiRegionView::get_patch_key_at (Evoral::MusicalTime time, uint8_t channel, MID while (i != _model->patch_changes().end() && (*i)->channel() != channel) { ++i; } - + if (i != _model->patch_changes().end()) { key.msb = (*i)->bank_msb (); key.lsb = (*i)->bank_lsb (); @@ -1670,7 +1763,7 @@ MidiRegionView::get_patch_key_at (Evoral::MusicalTime time, uint8_t channel, MID } else { key.msb = key.lsb = key.program_number = 0; } - + assert (key.is_sane()); } @@ -1679,7 +1772,7 @@ void MidiRegionView::change_patch_change (CanvasPatchChange& pc, const MIDI::Name::PatchPrimaryKey& new_patch) { MidiModel::PatchChangeDiffCommand* c = _model->new_patch_change_diff_command (_("alter patch change")); - + if (pc.patch()->program() != new_patch.program_number) { c->change_program (pc.patch (), new_patch.program_number); } @@ -1699,7 +1792,7 @@ void 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")); - + if (old_change->time() != new_change.time()) { c->change_time (old_change, new_change.time()); } @@ -1707,7 +1800,7 @@ MidiRegionView::change_patch_change (MidiModel::PatchChangePtr old_change, const if (old_change->channel() != new_change.channel()) { c->change_channel (old_change, new_change.channel()); } - + if (old_change->program() != new_change.program()) { c->change_program (old_change, new_change.program()); } @@ -1725,20 +1818,24 @@ MidiRegionView::change_patch_change (MidiModel::PatchChangePtr old_change, const /** Add a patch change to the region. * @param t Time in frames relative to region position * @param patch Patch to add; time and channel are ignored (time is converted from t, and channel comes from - * get_channel_for_add()) + * MidiTimeAxisView::get_channel_for_add()) */ void MidiRegionView::add_patch_change (framecnt_t t, Evoral::PatchChange const & patch) { + MidiTimeAxisView* const mtv = dynamic_cast(&trackview); + MidiModel::PatchChangeDiffCommand* c = _model->new_patch_change_diff_command (_("add patch change")); c->add (MidiModel::PatchChangePtr ( new Evoral::PatchChange ( - frames_to_beats (t + midi_region()->start()), get_channel_for_add(), patch.program(), patch.bank() - ) - )); - + absolute_frames_to_source_beats (_region->position() + t), + mtv->get_channel_for_add(), patch.program(), patch.bank() + ) + ) + ); + _model->apply_command (*trackview.session(), c); - + _patch_changes.clear (); display_patch_changes (); } @@ -1764,7 +1861,7 @@ MidiRegionView::delete_patch_change (CanvasPatchChange* pc) _patch_changes.clear (); display_patch_changes (); } - + void MidiRegionView::previous_patch (CanvasPatchChange& patch) { @@ -1787,16 +1884,52 @@ MidiRegionView::next_patch (CanvasPatchChange& patch) } } +void +MidiRegionView::previous_bank (CanvasPatchChange& patch) +{ + if (patch.patch()->program() < 127) { + MIDI::Name::PatchPrimaryKey key; + get_patch_key_at (patch.patch()->time(), patch.patch()->channel(), key); + if (key.lsb > 0) { + key.lsb--; + change_patch_change (patch, key); + } else { + if (key.msb > 0) { + key.lsb = 127; + key.msb--; + change_patch_change (patch, key); + } + } + } +} + +void +MidiRegionView::next_bank (CanvasPatchChange& patch) +{ + if (patch.patch()->program() > 0) { + MIDI::Name::PatchPrimaryKey key; + get_patch_key_at (patch.patch()->time(), patch.patch()->channel(), key); + if (key.lsb < 127) { + key.lsb++; + change_patch_change (patch, key); + } else { + if (key.msb < 127) { + key.lsb = 0; + key.msb++; + change_patch_change (patch, key); + } + } + } +} + void MidiRegionView::maybe_remove_deleted_note_from_selection (CanvasNoteEvent* cne) { if (_selection.empty()) { return; } - - if (_selection.erase (cne) > 0) { - cerr << "Erased a CNE from selection\n"; - } + + _selection.erase (cne); } void @@ -1830,40 +1963,41 @@ MidiRegionView::delete_note (boost::shared_ptr n) } void -MidiRegionView::clear_selection_except(ArdourCanvas::CanvasNoteEvent* ev) -{ - for (Selection::iterator i = _selection.begin(); i != _selection.end(); ++i) { - if ((*i)->selected() && (*i) != ev) { - (*i)->set_selected(false); - (*i)->hide_velocity(); - } - } - - _selection.clear(); -} - -void -MidiRegionView::unique_select(ArdourCanvas::CanvasNoteEvent* ev) +MidiRegionView::clear_selection_except (ArdourCanvas::CanvasNoteEvent* ev, bool signal) { for (Selection::iterator i = _selection.begin(); i != _selection.end(); ) { if ((*i) != ev) { - Selection::iterator tmp = i; ++tmp; (*i)->set_selected (false); + (*i)->hide_velocity (); _selection.erase (i); - + i = tmp; - } else { ++i; } } - /* don't bother with removing this regionview from the editor selection, - since we're about to add another note, and thus put/keep this - regionview in the editor selection. + /* 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(ArdourCanvas::CanvasNoteEvent* ev) +{ + 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()) { @@ -1881,6 +2015,31 @@ MidiRegionView::select_all_notes () } } +void +MidiRegionView::select_range (framepos_t start, framepos_t end) +{ + clear_selection (); + + for (Events::iterator i = _events.begin(); i != _events.end(); ++i) { + framepos_t t = source_beats_to_absolute_frames((*i)->note()->time()); + if (t >= start && t <= end) { + add_to_selection (*i); + } + } +} + +void +MidiRegionView::invert_selection () +{ + for (Events::iterator i = _events.begin(); i != _events.end(); ++i) { + if ((*i)->selected()) { + remove_from_selection(*i); + } else { + add_to_selection (*i); + } + } +} + void MidiRegionView::select_matching_notes (uint8_t notenum, uint16_t channel_mask, bool add, bool extend) { @@ -1934,12 +2093,12 @@ MidiRegionView::select_matching_notes (uint8_t notenum, uint16_t channel_mask, b if (select) { if ((cne = find_canvas_note (note)) != 0) { - // extend is false because we've taken care of it, + // extend is false because we've taken care of it, // since it extends by time range, not pitch. note_selected (cne, add, false); } } - + add = true; // we need to add all remaining matching notes, even if the passed in value was false (for "set") } @@ -1971,10 +2130,14 @@ MidiRegionView::toggle_matching_notes (uint8_t notenum, uint16_t channel_mask) } void -MidiRegionView::note_selected(ArdourCanvas::CanvasNoteEvent* ev, bool add, bool extend) +MidiRegionView::note_selected (ArdourCanvas::CanvasNoteEvent* ev, bool add, bool extend) { if (!add) { - clear_selection_except(ev); + clear_selection_except (ev); + if (!_selection.empty()) { + PublicEditor& editor (trackview.editor()); + editor.get_selection().add (this); + } } if (!extend) { @@ -2015,15 +2178,6 @@ MidiRegionView::note_selected(ArdourCanvas::CanvasNoteEvent* ev, bool add, bool add_to_selection (*i); } -#if 0 - /* if events were guaranteed to be time sorted, we could do this. - but as of sept 10th 2009, they no longer are. - */ - - if ((*i)->note()->time() > latest) { - break; - } -#endif } } } @@ -2035,7 +2189,7 @@ MidiRegionView::note_deselected(ArdourCanvas::CanvasNoteEvent* ev) } void -MidiRegionView::update_drag_selection(double x1, double x2, double y1, double y2) +MidiRegionView::update_drag_selection(double x1, double x2, double y1, double y2, bool extend) { if (x1 > x2) { swap (x1, x2); @@ -2072,7 +2226,7 @@ MidiRegionView::update_drag_selection(double x1, double x2, double y1, double y2 if (!(*i)->selected()) { add_to_selection (*i); } - } else if ((*i)->selected()) { + } else if ((*i)->selected() && !extend) { // Not inside rectangle remove_from_selection (*i); } @@ -2196,7 +2350,7 @@ MidiRegionView::note_dropped(CanvasNoteEvent *, frameoffset_t dt, int8_t dnote) for (Selection::iterator i = _selection.begin(); i != _selection.end() ; ++i) { - Evoral::MusicalTime new_time = frames_to_beats (beats_to_frames ((*i)->note()->time()) + dt); + Evoral::MusicalTime new_time = absolute_frames_to_source_beats (source_beats_to_absolute_frames ((*i)->note()->time()) + dt); if (new_time < 0) { continue; @@ -2210,12 +2364,6 @@ MidiRegionView::note_dropped(CanvasNoteEvent *, frameoffset_t dt, int8_t dnote) // keep notes in standard midi range clamp_to_0_127(new_pitch); - // keep original pitch if note is dragged outside valid midi range - if ((original_pitch != 0 && new_pitch == 0) - || (original_pitch != 127 && new_pitch == 127)) { - new_pitch = original_pitch; - } - lowest_note_in_selection = std::min(lowest_note_in_selection, new_pitch); highest_note_in_selection = std::max(highest_note_in_selection, new_pitch); @@ -2231,6 +2379,9 @@ MidiRegionView::note_dropped(CanvasNoteEvent *, frameoffset_t dt, int8_t dnote) } } +/** @param x Pixel relative to the region position. + * @return Snapped frame relative to the region position. + */ framepos_t MidiRegionView::snap_pixel_to_frame(double x) { @@ -2238,32 +2389,9 @@ MidiRegionView::snap_pixel_to_frame(double x) return snap_frame_to_frame (editor.pixel_to_frame (x)); } -/** Snap a frame offset within our region using the current snap settings. - * @param x Frame offset from this region's position. - * @return Snapped frame offset from this region's position. +/** @param x Pixel relative to the region position. + * @return Snapped pixel relative to the region position. */ -frameoffset_t -MidiRegionView::snap_frame_to_frame (frameoffset_t x) -{ - PublicEditor& editor = trackview.editor(); - - /* x is region relative, convert it to global absolute frames */ - framepos_t const session_frame = x + _region->position(); - - /* try a snap in either direction */ - framepos_t frame = session_frame; - editor.snap_to (frame, 0); - - /* if we went off the beginning of the region, snap forwards */ - if (frame < _region->position ()) { - frame = session_frame; - editor.snap_to (frame, 1); - } - - /* back to region relative */ - return frame - _region->position(); -} - double MidiRegionView::snap_to_pixel(double x) { @@ -2285,15 +2413,37 @@ MidiRegionView::get_end_position_pixels() } framepos_t -MidiRegionView::beats_to_frames(double beats) const +MidiRegionView::source_beats_to_absolute_frames(double beats) const { - return _time_converter.to(beats); + /* the time converter will return the frame corresponding to `beats' + relative to the start of the source. The start of the source + is an implied position given by region->position - region->start + */ + const framepos_t source_start = _region->position() - _region->start(); + return source_start + _source_relative_time_converter.to (beats); } double -MidiRegionView::frames_to_beats(framepos_t frames) const +MidiRegionView::absolute_frames_to_source_beats(framepos_t frames) const { - return _time_converter.from(frames); + /* the `frames' argument needs to be converted into a frame count + relative to the start of the source before being passed in to the + converter. + */ + const framepos_t source_start = _region->position() - _region->start(); + return _source_relative_time_converter.from (frames - source_start); +} + +framepos_t +MidiRegionView::region_beats_to_region_frames(double beats) const +{ + return _region_relative_time_converter.to(beats); +} + +double +MidiRegionView::region_frames_to_region_beats(framepos_t frames) const +{ + return _region_relative_time_converter.from(frames); } void @@ -2339,7 +2489,7 @@ MidiRegionView::begin_resizing (bool /*at_front*/) /** Update resizing notes while user drags. * @param primary `primary' note for the drag; ie the one that is used as the reference in non-relative mode. * @param at_front which end of the note (true == note on, false == note off) - * @param delta_x change in mouse position since the start of the drag + * @param delta_x change in mouse position since the start of the drag * @param relative true if relative resizing is taking place, false if absolute resizing. This only makes * 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 @@ -2381,8 +2531,8 @@ MidiRegionView::update_resizing (ArdourCanvas::CanvasNoteEvent* primary, bool at double beats; beats = snap_pixel_to_frame (current_x); - beats = frames_to_beats (beats); - + beats = region_frames_to_region_beats (beats); + double len; if (at_front) { @@ -2393,7 +2543,7 @@ MidiRegionView::update_resizing (ArdourCanvas::CanvasNoteEvent* primary, bool at len = 0; } } else { - if (beats >= canvas_note->note()->time()) { + if (beats >= canvas_note->note()->time()) { len = beats - canvas_note->note()->time(); } else { len = 0; @@ -2422,6 +2572,11 @@ MidiRegionView::commit_resizing (ArdourCanvas::CanvasNoteEvent* primary, bool at for (std::vector::iterator i = _resize_data.begin(); i != _resize_data.end(); ++i) { CanvasNote* canvas_note = (*i)->canvas_note; SimpleRect* resize_rect = (*i)->resize_rect; + + /* Get the new x position for this resize, which is in pixels relative + * to the region position. + */ + double current_x; if (at_front) { @@ -2438,8 +2593,11 @@ MidiRegionView::commit_resizing (ArdourCanvas::CanvasNoteEvent* primary, bool at } } - current_x = snap_pixel_to_frame (current_x); - current_x = frames_to_beats (current_x); + /* Convert that to a frame within the source */ + current_x = snap_pixel_to_frame (current_x) + _region->start (); + + /* and then to beats */ + current_x = region_frames_to_region_beats (current_x); if (at_front && current_x < canvas_note->note()->end_time()) { note_diff_add_change (canvas_note, MidiModel::NoteDiffCommand::StartTime, current_x); @@ -2470,12 +2628,6 @@ MidiRegionView::commit_resizing (ArdourCanvas::CanvasNoteEvent* primary, bool at apply_diff(); } -void -MidiRegionView::change_note_channel (CanvasNoteEvent* event, int8_t channel) -{ - note_diff_add_change (event, MidiModel::NoteDiffCommand::Channel, (uint8_t) channel); -} - void MidiRegionView::change_note_velocity(CanvasNoteEvent* event, int8_t velocity, bool relative) { @@ -2488,8 +2640,8 @@ MidiRegionView::change_note_velocity(CanvasNoteEvent* event, int8_t velocity, bo new_velocity = velocity; } - event->set_selected (event->selected()); // change color - + event->set_selected (event->selected()); // change color + note_diff_add_change (event, MidiModel::NoteDiffCommand::Velocity, new_velocity); } @@ -2580,6 +2732,28 @@ MidiRegionView::trim_note (CanvasNoteEvent* event, Evoral::MusicalTime front_del } } +void +MidiRegionView::change_note_channel (CanvasNoteEvent* event, int8_t chn, bool relative) +{ + uint8_t new_channel; + + if (relative) { + if (chn < 0.0) { + if (event->note()->channel() < -chn) { + new_channel = 0; + } else { + new_channel = event->note()->channel() + chn; + } + } else { + new_channel = event->note()->channel() + chn; + } + } else { + new_channel = (uint8_t) chn; + } + + note_diff_add_change (event, MidiModel::NoteDiffCommand::Channel, new_channel); +} + void MidiRegionView::change_note_time (CanvasNoteEvent* event, Evoral::MusicalTime delta, bool relative) { @@ -2645,10 +2819,10 @@ MidiRegionView::change_velocities (bool up, bool fine, bool allow_smush) } apply_diff(); - + if (!_selection.empty()) { char buf[24]; - snprintf (buf, sizeof (buf), "Vel %d", + snprintf (buf, sizeof (buf), "Vel %d", (int) (*_selection.begin())->note()->velocity()); show_verbose_cursor (buf, 10, 10); } @@ -2750,12 +2924,12 @@ MidiRegionView::nudge_notes (bool forward) into a vector and sort before using the first one. */ - framepos_t ref_point = _region->position() + beats_to_frames ((*(_selection.begin()))->note()->time()); + framepos_t ref_point = source_beats_to_absolute_frames ((*(_selection.begin()))->note()->time()); framepos_t unused; framepos_t distance; if (trackview.editor().snap_mode() == Editing::SnapOff) { - + /* grid is off - use nudge distance */ distance = trackview.editor().get_nudge_distance (ref_point, unused); @@ -2785,7 +2959,7 @@ MidiRegionView::nudge_notes (bool forward) return; } - Evoral::MusicalTime delta = frames_to_beats (fabs (distance)); + Evoral::MusicalTime delta = region_frames_to_region_beats (fabs (distance)); if (!forward) { delta = -delta; @@ -2819,7 +2993,7 @@ void MidiRegionView::note_entered(ArdourCanvas::CanvasNoteEvent* ev) { Editor* editor = dynamic_cast(&trackview.editor()); - + _pre_enter_cursor = editor->get_canvas_cursor (); if (_mouse_state == SelectTouchDragging) { @@ -2850,7 +3024,8 @@ void MidiRegionView::patch_entered (ArdourCanvas::CanvasPatchChange* ev) { ostringstream s; - s << ((int) ev->patch()->program() + 1) << ":" << (ev->patch()->bank() + 1); + /* XXX should get patch name if we can */ + s << _("Bank:") << (ev->patch()->bank() + MIDI_BP_ZERO) << '\n' << _("Program:") << ((int) ev->patch()->program()) + MIDI_BP_ZERO << '\n' << _("Channel:") << ((int) ev->patch()->channel() + 1); show_verbose_cursor (s.str(), 10, 20); } @@ -2864,7 +3039,7 @@ void MidiRegionView::note_mouse_position (float x_fraction, float /*y_fraction*/, bool can_set_cursor) { Editor* editor = dynamic_cast(&trackview.editor()); - + if (x_fraction > 0.0 && x_fraction < 0.25) { editor->set_canvas_cursor (editor->cursors()->left_side_trim); } else if (x_fraction >= 0.75 && x_fraction < 1.0) { @@ -2894,7 +3069,7 @@ MidiRegionView::set_frame_color() } else { f = fill_color; } - + if (!rect_visible) { f = UINT_RGBA_CHANGE_A (f, 0); } @@ -2944,6 +3119,9 @@ MidiRegionView::cut_copy_clear (Editing::CutCopyOp op) PublicEditor& editor (trackview.editor()); switch (op) { + case Delete: + /* XXX what to do ? */ + break; case Cut: case Copy: editor.get_cut_buffer().add (selection_as_cut_buffer()); @@ -2955,18 +3133,19 @@ MidiRegionView::cut_copy_clear (Editing::CutCopyOp op) if (op != Copy) { start_note_diff_command(); - + for (Selection::iterator i = _selection.begin(); i != _selection.end(); ++i) { switch (op) { case Copy: break; + case Delete: case Cut: case Clear: note_diff_remove_note (*i); break; } } - + apply_diff(); } } @@ -3007,7 +3186,7 @@ MidiRegionView::paste (framepos_t pos, float times, const MidiCutBuffer& mcb) Evoral::MusicalTime end_point = 0; duration = (*mcb.notes().rbegin())->end_time() - (*mcb.notes().begin())->time(); - paste_pos_beats = frames_to_beats (pos - _region->position()); + paste_pos_beats = region_frames_to_region_beats (pos - _region->position()); beat_delta = (*mcb.notes().begin())->time() - paste_pos_beats; paste_pos_beats = 0; @@ -3016,7 +3195,7 @@ MidiRegionView::paste (framepos_t pos, float times, const MidiCutBuffer& mcb) (*mcb.notes().rbegin())->end_time(), duration, pos, _region->position(), paste_pos_beats, beat_delta)); - + clear_selection (); for (int n = 0; n < (int) times; ++n) { @@ -3037,7 +3216,7 @@ MidiRegionView::paste (framepos_t pos, float times, const MidiCutBuffer& mcb) /* if we pasted past the current end of the region, extend the region */ - framepos_t end_frame = _region->position() + beats_to_frames (end_point); + framepos_t end_frame = source_beats_to_absolute_frames (end_point); framepos_t region_end = _region->position() + _region->length() - 1; if (end_frame > region_end) { @@ -3045,12 +3224,12 @@ MidiRegionView::paste (framepos_t pos, float times, const MidiCutBuffer& mcb) 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, this); + _region->set_length (end_frame); trackview.session()->add_command (new StatefulDiffCommand (_region)); } apply_diff (true); - + trackview.session()->commit_reversible_command (); } @@ -3074,9 +3253,8 @@ MidiRegionView::time_sort_events () } void -MidiRegionView::goto_next_note () +MidiRegionView::goto_next_note (bool add_to_selection) { - // framepos_t pos = -1; bool use_next = false; if (_events.back()->selected()) { @@ -3085,27 +3263,35 @@ MidiRegionView::goto_next_note () time_sort_events (); + MidiTimeAxisView* const mtv = dynamic_cast(&trackview); + uint16_t const channel_mask = mtv->channel_selector().get_selected_channels (); + for (Events::iterator i = _events.begin(); i != _events.end(); ++i) { if ((*i)->selected()) { use_next = true; continue; } else if (use_next) { - unique_select (*i); - // pos = _region->position() + beats_to_frames ((*i)->note()->time()); - return; + if (channel_mask & (1 << (*i)->note()->channel())) { + if (!add_to_selection) { + unique_select (*i); + } else { + note_selected (*i, true, false); + } + return; + } } } /* use the first one */ - unique_select (_events.front()); - + if (!_events.empty() && (channel_mask & (1 << _events.front()->note()->channel ()))) { + unique_select (_events.front()); + } } void -MidiRegionView::goto_previous_note () +MidiRegionView::goto_previous_note (bool add_to_selection) { - // framepos_t pos = -1; bool use_next = false; if (_events.front()->selected()) { @@ -3114,20 +3300,30 @@ MidiRegionView::goto_previous_note () time_sort_events (); + MidiTimeAxisView* const mtv = dynamic_cast(&trackview); + uint16_t const channel_mask = mtv->channel_selector().get_selected_channels (); + for (Events::reverse_iterator i = _events.rbegin(); i != _events.rend(); ++i) { if ((*i)->selected()) { use_next = true; continue; } else if (use_next) { - unique_select (*i); - // pos = _region->position() + beats_to_frames ((*i)->note()->time()); - return; + if (channel_mask & (1 << (*i)->note()->channel())) { + if (!add_to_selection) { + unique_select (*i); + } else { + note_selected (*i, true, false); + } + return; + } } } /* use the last one */ - unique_select (*(_events.rbegin())); + if (!_events.empty() && (channel_mask & (1 << (*_events.rbegin())->note()->channel ()))) { + unique_select (*(_events.rbegin())); + } } void @@ -3143,7 +3339,7 @@ MidiRegionView::selection_as_notelist (Notes& selected, bool allow_all_if_none_s had_selected = true; } } - + if (allow_all_if_none_selected && !had_selected) { for (Events::iterator i = _events.begin(); i != _events.end(); ++i) { selected.insert ((*i)->note()); @@ -3154,24 +3350,31 @@ MidiRegionView::selection_as_notelist (Notes& selected, bool allow_all_if_none_s void MidiRegionView::update_ghost_note (double x, double y) { + MidiTimeAxisView* const mtv = dynamic_cast(&trackview); + _last_ghost_x = x; _last_ghost_y = y; - - _note_group->w2i (x, y); - framepos_t const f = snap_pixel_to_frame (x); - bool success; - Evoral::MusicalTime beats = trackview.editor().get_grid_type_as_beats (success, f); + _note_group->w2i (x, y); - if (!success) { - beats = 1; - } + PublicEditor& editor = trackview.editor (); - double length = frames_to_beats (snap_frame_to_frame (f + beats_to_frames (beats)) - f); + framepos_t const unsnapped_frame = editor.pixel_to_frame (x); + framecnt_t grid_frames; + framepos_t const f = snap_frame_to_grid_underneath (unsnapped_frame, grid_frames); - _ghost_note->note()->set_time (frames_to_beats (f + _region->start())); + /* use region_frames... because we are converting a delta within the region + */ + + double length = region_frames_to_region_beats (snap_frame_to_frame (f + grid_frames) - f); + + /* 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 (absolute_frames_to_source_beats (f + _region->position ())); _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 ()); /* the ghost note does not appear in ghost regions, so pass false in here */ update_note (_ghost_note, false); @@ -3203,7 +3406,7 @@ MidiRegionView::snap_changed () if (!_ghost_note) { return; } - + create_ghost_note (_last_ghost_x, _last_ghost_y); } @@ -3246,7 +3449,7 @@ MidiRegionView::maybe_select_by_position (GdkEventButton* ev, double /*x*/, doub PublicEditor& editor (trackview.editor()); editor.get_selection().add (this); } -} +} void MidiRegionView::color_handler () @@ -3292,7 +3495,7 @@ MidiRegionView::move_step_edit_cursor (Evoral::MusicalTime pos) _step_edit_cursor_position = pos; if (_step_edit_cursor) { - double pixel = trackview.editor().frame_to_pixel (beats_to_frames (pos)); + double pixel = trackview.editor().frame_to_pixel (region_beats_to_region_frames (pos)); _step_edit_cursor->property_x1() = pixel; set_step_edit_cursor_width (_step_edit_cursor_width); } @@ -3312,22 +3515,21 @@ MidiRegionView::set_step_edit_cursor_width (Evoral::MusicalTime beats) _step_edit_cursor_width = beats; if (_step_edit_cursor) { - _step_edit_cursor->property_x2() = _step_edit_cursor->property_x1() + trackview.editor().frame_to_pixel (beats_to_frames (beats)); + _step_edit_cursor->property_x2() = _step_edit_cursor->property_x1() + trackview.editor().frame_to_pixel (region_beats_to_region_frames (beats)); } } /** Called when a diskstream on our track has received some data. Update the view, if applicable. - * @param buf Data that has been recorded. - * @param w Source that this data will end up in. + * @param w Source that the data will end up in. */ void -MidiRegionView::data_recorded (boost::shared_ptr buf, boost::weak_ptr w) +MidiRegionView::data_recorded (boost::weak_ptr w) { if (!_active_notes) { /* we aren't actively being recorded to */ return; } - + boost::shared_ptr src = w.lock (); if (!src || src != midi_region()->midi_source()) { /* recorded data was not destined for our source */ @@ -3335,10 +3537,13 @@ MidiRegionView::data_recorded (boost::shared_ptr buf, boost::weak_pt } MidiTimeAxisView* mtv = dynamic_cast (&trackview); + + 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) { Evoral::MIDIEvent const ev (*i, false); assert (ev.buffer ()); @@ -3359,7 +3564,7 @@ MidiRegionView::data_recorded (boost::shared_ptr buf, boost::weak_pt } else if (ev.note() > _current_range_max) { midi_stream_view()->apply_note_range (_current_range_min, ev.note(), true); } - + } else if (ev.type() == MIDI_CMD_NOTE_OFF) { resolve_note (ev.note (), time_beats); } @@ -3394,39 +3599,10 @@ MidiRegionView::trim_front_ending () } } -/** @return channel (counted from 0) to add an event to, based on the current setting - * of the channel selector. - */ -uint8_t -MidiRegionView::get_channel_for_add () const -{ - MidiTimeAxisView* const mtv = dynamic_cast(&trackview); - uint16_t const chn_mask = mtv->channel_selector().get_selected_channels(); - int chn_cnt = 0; - uint8_t channel = 0; - - /* pick the highest selected channel, unless all channels are selected, - which is interpreted to mean channel 1 (zero) - */ - - for (uint16_t i = 0; i < 16; ++i) { - if (chn_mask & (1<patch (), Gtk::Stock::APPLY); + PatchChangeDialog d (&_source_relative_time_converter, trackview.session(), *pc->patch (), Gtk::Stock::APPLY); if (d.run () != Gtk::RESPONSE_ACCEPT) { return; } @@ -3439,12 +3615,12 @@ void MidiRegionView::show_verbose_cursor (boost::shared_ptr n) const { char buf[24]; - snprintf (buf, sizeof (buf), "%s (%d) Chn %d\nVel %d", - Evoral::midi_note_name (n->note()).c_str(), + snprintf (buf, sizeof (buf), "%s (%d) Chn %d\nVel %d", + Evoral::midi_note_name (n->note()).c_str(), (int) n->note (), (int) n->channel() + 1, (int) n->velocity()); - + show_verbose_cursor (buf, 10, 20); } @@ -3458,6 +3634,57 @@ MidiRegionView::show_verbose_cursor (string const & text, double xoffset, double wx += xoffset; wy += yoffset; + /* Flip the cursor above the mouse pointer if it would overlap the bottom of the canvas */ + + double x1, y1, x2, y2; + trackview.editor().verbose_cursor()->canvas_item()->get_bounds (x1, y1, x2, y2); + + if ((wy + y2 - y1) > trackview.editor().canvas_height()) { + wy -= (y2 - y1) + 2 * yoffset; + } + trackview.editor().verbose_cursor()->set (text, wx, wy); trackview.editor().verbose_cursor()->show (); } + +/** @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. + */ +framepos_t +MidiRegionView::snap_frame_to_grid_underneath (framepos_t p, framecnt_t& grid_frames) const +{ + PublicEditor& editor = trackview.editor (); + + bool success; + Evoral::MusicalTime grid_beats = editor.get_grid_type_as_beats (success, p); + + if (!success) { + grid_beats = 1; + } + + 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; + } + + 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; + } + + /* Clear our selection in sympathy; but don't signal the fact */ + clear_selection (false); +}