X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fmidi_region_view.cc;h=154cd158dc25bf325300d4a98dbb0b7f389e8f02;hb=ec1ef5d6b574258d6451aa60749c4241f3c42f5f;hp=00bdb94dce74911508c11846a94b7a0811c3cd2c;hpb=fecf120f1e778f1a2344e0adcaf3aed0b0c4e5e3;p=ardour.git diff --git a/gtk2_ardour/midi_region_view.cc b/gtk2_ardour/midi_region_view.cc index 00bdb94dce..154cd158dc 100644 --- a/gtk2_ardour/midi_region_view.cc +++ b/gtk2_ardour/midi_region_view.cc @@ -24,7 +24,7 @@ #include -#include +#include "gtkmm2ext/gtk_ui.h" #include @@ -41,6 +41,7 @@ #include "evoral/Parameter.hpp" #include "evoral/MIDIParameters.hpp" +#include "evoral/MIDIEvent.hpp" #include "evoral/Control.hpp" #include "evoral/midi_util.h" @@ -62,6 +63,7 @@ #include "midi_streamview.h" #include "midi_time_axis.h" #include "midi_util.h" +#include "mouse_cursors.h" #include "note_player.h" #include "public_editor.h" #include "rgb_macros.h" @@ -69,7 +71,6 @@ #include "simpleline.h" #include "streamview.h" #include "utils.h" -#include "mouse_cursors.h" #include "patch_change_dialog.h" #include "verbose_cursor.h" @@ -92,13 +93,10 @@ MidiRegionView::MidiRegionView (ArdourCanvas::Group *parent, RouteTimeAxisView & , _last_channel_selection(0xFFFF) , _current_range_min(0) , _current_range_max(0) - , _model_name(string()) - , _custom_device_mode(string()) , _active_notes(0) , _note_group(new ArdourCanvas::Group(*group)) , _note_diff_command (0) , _ghost_note(0) - , _drag_rect (0) , _step_edit_cursor (0) , _step_edit_cursor_width (1.0) , _step_edit_cursor_position (0.0) @@ -112,15 +110,16 @@ MidiRegionView::MidiRegionView (ArdourCanvas::Group *parent, RouteTimeAxisView & , _no_sound_notes (false) , _last_event_x (0) , _last_event_y (0) - , _pre_enter_cursor (0) + , pre_enter_cursor (0) + , pre_press_cursor (0) { _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()); + 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), ui_bind (&MidiRegionView::selection_cleared, this, _1), gui_context ()); + SelectionCleared.connect (_selection_cleared_connection, invalidator (*this), boost::bind (&MidiRegionView::selection_cleared, this, _1), gui_context ()); } MidiRegionView::MidiRegionView (ArdourCanvas::Group *parent, RouteTimeAxisView &tv, @@ -129,13 +128,12 @@ MidiRegionView::MidiRegionView (ArdourCanvas::Group *parent, RouteTimeAxisView & : RegionView (parent, tv, r, spu, basic_color, false, visibility) , _force_channel(-1) , _last_channel_selection(0xFFFF) - , _model_name(string()) - , _custom_device_mode(string()) + , _current_range_min(0) + , _current_range_max(0) , _active_notes(0) , _note_group(new ArdourCanvas::Group(*parent)) , _note_diff_command (0) , _ghost_note(0) - , _drag_rect (0) , _step_edit_cursor (0) , _step_edit_cursor_width (1.0) , _step_edit_cursor_position (0.0) @@ -149,13 +147,15 @@ MidiRegionView::MidiRegionView (ArdourCanvas::Group *parent, RouteTimeAxisView & , _no_sound_notes (false) , _last_event_x (0) , _last_event_y (0) + , pre_enter_cursor (0) + , pre_press_cursor (0) { _note_group->raise_to_top(); 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 ()); + SelectionCleared.connect (_selection_cleared_connection, invalidator (*this), boost::bind (&MidiRegionView::selection_cleared, this, _1), gui_context ()); } void @@ -173,13 +173,12 @@ MidiRegionView::MidiRegionView (const MidiRegionView& other) , RegionView (other) , _force_channel(-1) , _last_channel_selection(0xFFFF) - , _model_name(string()) - , _custom_device_mode(string()) + , _current_range_min(0) + , _current_range_max(0) , _active_notes(0) , _note_group(new ArdourCanvas::Group(*get_canvas_group())) , _note_diff_command (0) , _ghost_note(0) - , _drag_rect (0) , _step_edit_cursor (0) , _step_edit_cursor_width (1.0) , _step_edit_cursor_position (0.0) @@ -193,6 +192,8 @@ MidiRegionView::MidiRegionView (const MidiRegionView& other) , _no_sound_notes (false) , _last_event_x (0) , _last_event_y (0) + , pre_enter_cursor (0) + , pre_press_cursor (0) { Gdk::Color c; int r,g,b,a; @@ -207,13 +208,12 @@ MidiRegionView::MidiRegionView (const MidiRegionView& other, boost::shared_ptr (region)) , _force_channel(-1) , _last_channel_selection(0xFFFF) - , _model_name(string()) - , _custom_device_mode(string()) + , _current_range_min(0) + , _current_range_max(0) , _active_notes(0) , _note_group(new ArdourCanvas::Group(*get_canvas_group())) , _note_diff_command (0) , _ghost_note(0) - , _drag_rect (0) , _step_edit_cursor (0) , _step_edit_cursor_width (1.0) , _step_edit_cursor_position (0.0) @@ -227,6 +227,8 @@ MidiRegionView::MidiRegionView (const MidiRegionView& other, boost::shared_ptrParameterChanged.connect (*this, invalidator (*this), ui_bind (&MidiRegionView::parameter_changed, this, _1), 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), ui_bind (&MidiRegionView::selection_cleared, this, _1), gui_context ()); + SelectionCleared.connect (_selection_cleared_connection, invalidator (*this), boost::bind (&MidiRegionView::selection_cleared, this, _1), gui_context ()); } const boost::shared_ptr @@ -306,7 +308,7 @@ MidiRegionView::connect_to_diskstream () { midi_view()->midi_track()->DataRecorded.connect( *this, invalidator(*this), - ui_bind(&MidiRegionView::data_recorded, this, _1), + boost::bind (&MidiRegionView::data_recorded, this, _1), gui_context()); } @@ -327,6 +329,10 @@ MidiRegionView::canvas_event(GdkEvent* ev) break; } + if (ev->type == GDK_2BUTTON_PRESS) { + return trackview.editor().toggle_internal_editing_from_double_click (ev); + } + if (!trackview.editor().internal_editing()) { return false; } @@ -344,9 +350,6 @@ MidiRegionView::canvas_event(GdkEvent* ev) case GDK_BUTTON_PRESS: return button_press (&ev->button); - case GDK_2BUTTON_PRESS: - return true; - case GDK_BUTTON_RELEASE: return button_release (&ev->button); @@ -377,10 +380,10 @@ bool MidiRegionView::enter_notify (GdkEventCrossing* ev) { trackview.editor().MouseModeChanged.connect ( - _mouse_mode_connection, invalidator (*this), ui_bind (&MidiRegionView::mouse_mode_changed, this), gui_context () + _mouse_mode_connection, invalidator (*this), boost::bind (&MidiRegionView::mouse_mode_changed, this), gui_context () ); - if (trackview.editor().current_mouse_mode() == MouseRange) { + if (trackview.editor().current_mouse_mode() == MouseDraw && _mouse_state != AddDragging) { create_ghost_note (ev->x, ev->y); } @@ -408,7 +411,7 @@ MidiRegionView::leave_notify (GdkEventCrossing*) void MidiRegionView::mouse_mode_changed () { - if (trackview.editor().current_mouse_mode() == MouseRange && trackview.editor().internal_editing()) { + if (trackview.editor().current_mouse_mode() == MouseDraw && trackview.editor().internal_editing()) { create_ghost_note (_last_event_x, _last_event_y); } else { remove_ghost_note (); @@ -430,16 +433,19 @@ MidiRegionView::button_press (GdkEventButton* ev) return false; } - _last_x = ev->x; - _last_y = ev->y; + Editor* editor = dynamic_cast (&trackview.editor()); + MouseMode m = editor->current_mouse_mode(); - group->w2i (_last_x, _last_y); + 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 (_mouse_state != SelectTouchDragging) { - + _pressed_button = ev->button; _mouse_state = Pressed; - + return true; } @@ -465,10 +471,20 @@ 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; + } + switch (_mouse_state) { case Pressed: // Clicked switch (editor.current_mouse_mode()) { + case MouseRange: + /* no motion occured - simple click */ + clear_selection (); + break; + case MouseObject: case MouseTimeFX: { @@ -489,12 +505,17 @@ MidiRegionView::button_release (GdkEventButton* ev) beats = 1; } - create_note_at (event_x, event_y, beats, true, true); + /* 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 -= 1.0 / Timecode::BBT_Time::ticks_per_beat; + + create_note_at (editor.pixel_to_frame (event_x), event_y, beats, true); } break; } - case MouseRange: + case MouseDraw: { bool success; Evoral::MusicalTime beats = editor.get_grid_type_as_beats (success, editor.pixel_to_frame (event_x)); @@ -503,7 +524,12 @@ MidiRegionView::button_release (GdkEventButton* ev) beats = 1; } - create_note_at (event_x, event_y, beats, true, true); + /* 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 -= 1.0 / Timecode::BBT_Time::ticks_per_beat; + + create_note_at (editor.pixel_to_frame (event_x), event_y, beats, true); break; } @@ -514,30 +540,13 @@ MidiRegionView::button_release (GdkEventButton* ev) _mouse_state = None; break; - case SelectRectDragging: // Select drag done + case SelectRectDragging: + case AddDragging: editor.drags()->end_grab ((GdkEvent *) ev); _mouse_state = None; + create_ghost_note (ev->x, ev->y); break; - case AddDragging: // Add drag done - - _mouse_state = None; - - 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(), region_frames_to_region_beats(length), true, false); - } - } - - delete _drag_rect; - _drag_rect = 0; - - create_ghost_note (ev->x, ev->y); default: break; @@ -549,35 +558,26 @@ MidiRegionView::button_release (GdkEventButton* ev) bool MidiRegionView::motion (GdkEventMotion* ev) { - double event_x, event_y; - framepos_t event_frame = 0; - - event_x = ev->x; - event_y = ev->y; - group->w2i(event_x, event_y); - PublicEditor& editor = trackview.editor (); - - // convert event_x to global frame - 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 && editor.current_mouse_mode() == MouseObject && + 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() != MouseRange - && Keyboard::modifier_state_contains (ev->state, Keyboard::insert_note_modifier())) { + + } else if (_ghost_note && editor.current_mouse_mode() == MouseObject && + 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() != MouseRange) { - delete _ghost_note; - _ghost_note = 0; + } else if (_ghost_note && editor.current_mouse_mode() == MouseObject) { + remove_ghost_note (); editor.verbose_cursor()->hide (); - } else if (_ghost_note && editor.current_mouse_mode() == MouseRange) { + + } else if (_ghost_note && editor.current_mouse_mode() == MouseDraw) { + update_ghost_note (ev->x, ev->y); } @@ -588,98 +588,39 @@ MidiRegionView::motion (GdkEventMotion* ev) } 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; - } - - if (_pressed_button == 1 && editor.current_mouse_mode() == MouseObject - && !Keyboard::modifier_state_contains (ev->state, Keyboard::insert_note_modifier())) { - - 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 - - group->grab(GDK_POINTER_MOTION_MASK | GDK_BUTTON_RELEASE_MASK, - Gdk::Cursor(Gdk::FLEUR), ev->time); + case Pressed: - _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() = 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() = editor.frame_to_pixel(event_frame); + if (_pressed_button == 1) { - _drag_rect->property_y2() = _drag_rect->property_y1() - + floor(midi_stream_view()->note_height()); - _drag_rect->property_outline_what() = 0xFF; - _drag_rect->property_outline_color_rgba() = 0xFFFFFF99; - _drag_rect->property_fill_color_rgba() = 0xFFFFFF66; - - _mouse_state = AddDragging; + MouseMode m = editor.current_mouse_mode(); - delete _ghost_note; - _ghost_note = 0; - - editor.verbose_cursor()->hide (); - - return true; + if (m == MouseDraw || (m == MouseObject && 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) { + + editor.drags()->set (new MidiRubberbandSelectDrag (dynamic_cast (&editor), this), (GdkEvent *) ev); + _mouse_state = SelectRectDragging; + return true; + } else if (m == MouseRange) { + editor.drags()->set (new MidiVerticalSelectDrag (dynamic_cast (&editor), this), (GdkEvent *) ev); + _mouse_state = SelectVerticalDragging; + return true; + } } return false; case SelectRectDragging: + case SelectVerticalDragging: + case AddDragging: editor.drags()->motion_handler ((GdkEvent *) ev, false); break; - case AddDragging: // Add note drag motion - - if (ev->is_hint) { - int t_x; - int t_y; - GdkModifierType state; - gdk_window_get_pointer(ev->window, &t_x, &t_y, &state); - event_x = t_x; - event_y = t_y; - } - - 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) { - _drag_rect->property_x2() = event_x; - } - else { - _drag_rect->property_x1() = event_x; - } - } - - _last_x = event_x; - _last_y = event_y; - case SelectTouchDragging: return false; @@ -870,20 +811,19 @@ void MidiRegionView::show_list_editor () { if (!_list_editor) { - _list_editor = new MidiListEditor (trackview.session(), midi_region()); + _list_editor = new MidiListEditor (trackview.session(), midi_region(), midi_view()->midi_track()); } _list_editor->present (); } /** Add a note to the model, and the view, at a canvas (click) coordinate. - * \param x horizontal position in pixels + * \param t time in frames relative to the position of the region * \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. + * \param length duration of the note in beats + * \param snap_t true to snap t to the grid, otherwise false. */ void -MidiRegionView::create_note_at (double x, double y, double length, bool sh, bool snap_x) +MidiRegionView::create_note_at (framepos_t t, double y, double length, bool snap_t) { MidiTimeAxisView* const mtv = dynamic_cast(&trackview); MidiStreamView* const view = mtv->midi_view(); @@ -894,25 +834,17 @@ MidiRegionView::create_note_at (double x, double y, double length, bool sh, bool assert(note <= 127.0); // Start of note in frames relative to region start - framepos_t start_frames = trackview.editor().pixel_to_frame (x); - if (snap_x) { + if (snap_t) { framecnt_t grid_frames; - start_frames = snap_frame_to_grid_underneath (start_frames, grid_frames); + t = snap_frame_to_grid_underneath (t, grid_frames); } - assert(start_frames >= 0); - - // Snap length - length = region_frames_to_region_beats( - snap_frame_to_frame (start_frames + region_beats_to_region_frames(length)) - start_frames); + assert (t >= 0); assert (length != 0); - if (sh) { - length = region_frames_to_region_beats (region_beats_to_region_frames (length) - 1); - } - const boost::shared_ptr new_note (new NoteType (mtv->get_channel_for_add (), - region_frames_to_region_beats(start_frames + _region->start()), length, + region_frames_to_region_beats(t + _region->start()), + length, (uint8_t)note, 0x40)); if (_model->contains (new_note)) { @@ -1232,9 +1164,58 @@ MidiRegionView::display_patch_changes_on_channel (uint8_t channel) void MidiRegionView::display_sysexes() { + bool have_periodic_system_messages = false; + bool display_periodic_messages = true; + + if (!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); + + if (mev) { + if (mev->is_spp() || mev->is_mtc_quarter() || mev->is_mtc_full()) { + have_periodic_system_messages = true; + break; + } + } + } + + if (have_periodic_system_messages) { + double zoom = trackview.editor().get_current_zoom (); // frames per pixel + + /* get an approximate value for the number of samples per video frame */ + + double video_frame = trackview.session()->frame_rate() * (1.0/30); + + /* if we are zoomed out beyond than the cutoff (i.e. more + * frames per pixel than frames per 4 video frames), don't + * show periodic sysex messages. + */ + + if (zoom > (video_frame*4)) { + display_periodic_messages = false; + } + } + } else { + display_periodic_messages = false; + } + for (MidiModel::SysExes::const_iterator i = _model->sysexes().begin(); i != _model->sysexes().end(); ++i) { + + const boost::shared_ptr > mev = + boost::static_pointer_cast > (*i); + Evoral::MusicalTime time = (*i)->time(); - assert(time >= 0); + assert (time >= 0); + + if (mev) { + if (mev->is_spp() || mev->is_mtc_quarter() || mev->is_mtc_full()) { + if (!display_periodic_messages) { + continue; + } + } + } ostringstream str; str << hex; @@ -1253,7 +1234,7 @@ MidiRegionView::display_sysexes() boost::shared_ptr sysex = boost::shared_ptr( new CanvasSysEx(*this, *_note_group, text, height, x, 1.0)); - // Show unless patch change is beyond the region bounds + // Show unless message is beyond the region bounds if (time - _region->start() >= _region->length() || time < _region->start()) { sysex->hide(); } else { @@ -1264,7 +1245,6 @@ MidiRegionView::display_sysexes() } } - MidiRegionView::~MidiRegionView () { in_destructor = true; @@ -1416,7 +1396,7 @@ MidiRegionView::add_ghost (TimeAxisView& tv) ghost->set_duration (_region->length() / samples_per_unit); ghosts.push_back (ghost); - GhostRegion::CatchDeletion.connect (*this, invalidator (*this), ui_bind (&RegionView::remove_ghost, this, _1), gui_context()); + GhostRegion::CatchDeletion.connect (*this, invalidator (*this), boost::bind (&RegionView::remove_ghost, this, _1), gui_context()); return ghost; } @@ -1491,7 +1471,7 @@ MidiRegionView::extend_active_notes() void MidiRegionView::play_midi_note(boost::shared_ptr note) { - if (_no_sound_notes || !trackview.editor().sound_notes()) { + if (_no_sound_notes || !Config->get_sound_midi_notes()) { return; } @@ -1509,7 +1489,7 @@ MidiRegionView::play_midi_note(boost::shared_ptr note) void MidiRegionView::play_midi_chord (vector > notes) { - if (_no_sound_notes || !trackview.editor().sound_notes()) { + if (_no_sound_notes || !Config->get_sound_midi_notes()) { return; } @@ -1549,7 +1529,6 @@ void MidiRegionView::update_note (CanvasNote* ev, bool update_ghost_regions) { boost::shared_ptr note = ev->note(); - 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()); @@ -1724,7 +1703,8 @@ MidiRegionView::add_canvas_patch_change (MidiModel::PatchChangePtr patch, const { assert (patch->time() >= 0); - const double x = trackview.editor().frame_to_pixel (source_beats_to_region_frames (patch->time())); + framecnt_t region_frames = source_beats_to_region_frames (patch->time()); + const double x = trackview.editor().frame_to_pixel (region_frames); double const height = midi_stream_view()->contents_height(); @@ -1739,7 +1719,7 @@ MidiRegionView::add_canvas_patch_change (MidiModel::PatchChangePtr patch, const ); // Show unless patch change is beyond the region bounds - if (patch->time() - _region->start() >= _region->length() || patch->time() < _region->start()) { + if (region_frames < 0 || region_frames >= _region->length()) { patch_change->hide(); } else { patch_change->show(); @@ -1965,6 +1945,8 @@ MidiRegionView::delete_note (boost::shared_ptr n) void MidiRegionView::clear_selection_except (ArdourCanvas::CanvasNoteEvent* ev, bool signal) { + bool changed = false; + for (Selection::iterator i = _selection.begin(); i != _selection.end(); ) { if ((*i) != ev) { Selection::iterator tmp = i; @@ -1973,7 +1955,8 @@ MidiRegionView::clear_selection_except (ArdourCanvas::CanvasNoteEvent* ev, bool (*i)->set_selected (false); (*i)->hide_velocity (); _selection.erase (i); - + changed = true; + i = tmp; } else { ++i; @@ -1984,7 +1967,7 @@ MidiRegionView::clear_selection_except (ArdourCanvas::CanvasNoteEvent* ev, bool selection. */ - if (signal) { + if (changed && signal) { SelectionCleared (this); /* EMIT SIGNAL */ } } @@ -2233,6 +2216,38 @@ MidiRegionView::update_drag_selection(double x1, double x2, double y1, double y2 } } +void +MidiRegionView::update_vertical_drag_selection (double y1, double y2, bool extend) +{ + if (y1 > y2) { + swap (y1, y2); + } + + // TODO: Make this faster by storing the last updated selection rect, and only + // adjusting things that are in the area that appears/disappeared. + // We probably need a tree to be able to find events in O(log(n)) time. + + for (Events::iterator i = _events.begin(); i != _events.end(); ++i) { + + /* check if any corner of the note is inside the rect + + Notes: + 1) this is computing "touched by", not "contained by" the rect. + 2) this does not require that events be sorted in time. + */ + + if (((*i)->y1() >= y1 && (*i)->y1() <= y2)) { + // within y- (note-) range + if (!(*i)->selected()) { + add_to_selection (*i); + } + } else if ((*i)->selected() && !extend) { + // Not inside rectangle + remove_from_selection (*i); + } + } +} + void MidiRegionView::remove_from_selection (CanvasNoteEvent* ev) { @@ -2291,7 +2306,7 @@ MidiRegionView::move_selection(double dx, double dy, double cumulative_dy) (*i)->move_event(dx, dy); } - if (dy && !_selection.empty() && !_no_sound_notes && trackview.editor().sound_notes()) { + if (dy && !_selection.empty() && !_no_sound_notes && Config->get_sound_midi_notes()) { if (to_play.size() > 1) { @@ -2349,8 +2364,9 @@ MidiRegionView::note_dropped(CanvasNoteEvent *, frameoffset_t dt, int8_t dnote) start_note_diff_command (_("move notes")); for (Selection::iterator i = _selection.begin(); i != _selection.end() ; ++i) { - - Evoral::MusicalTime new_time = absolute_frames_to_source_beats (source_beats_to_absolute_frames ((*i)->note()->time()) + dt); + + framepos_t new_frames = source_beats_to_absolute_frames ((*i)->note()->time()) + dt; + Evoral::MusicalTime new_time = absolute_frames_to_source_beats (new_frames); if (new_time < 0) { continue; @@ -2628,6 +2644,17 @@ MidiRegionView::commit_resizing (ArdourCanvas::CanvasNoteEvent* primary, bool at apply_diff(); } +void +MidiRegionView::abort_resizing () +{ + for (std::vector::iterator i = _resize_data.begin(); i != _resize_data.end(); ++i) { + delete (*i)->resize_rect; + delete *i; + } + + _resize_data.clear (); +} + void MidiRegionView::change_note_velocity(CanvasNoteEvent* event, int8_t velocity, bool relative) { @@ -2926,7 +2953,7 @@ MidiRegionView::nudge_notes (bool forward) framepos_t ref_point = source_beats_to_absolute_frames ((*(_selection.begin()))->note()->time()); framepos_t unused; - framepos_t distance; + framecnt_t distance; if (trackview.editor().snap_mode() == Editing::SnapOff) { @@ -2994,7 +3021,7 @@ MidiRegionView::note_entered(ArdourCanvas::CanvasNoteEvent* ev) { Editor* editor = dynamic_cast(&trackview.editor()); - _pre_enter_cursor = editor->get_canvas_cursor (); + pre_enter_cursor = editor->get_canvas_cursor (); if (_mouse_state == SelectTouchDragging) { note_selected (ev, true); @@ -3014,9 +3041,9 @@ MidiRegionView::note_left (ArdourCanvas::CanvasNoteEvent*) editor->verbose_cursor()->hide (); - if (_pre_enter_cursor) { - editor->set_canvas_cursor (_pre_enter_cursor); - _pre_enter_cursor = 0; + if (pre_enter_cursor) { + editor->set_canvas_cursor (pre_enter_cursor); + pre_enter_cursor = 0; } } @@ -3039,14 +3066,16 @@ void MidiRegionView::note_mouse_position (float x_fraction, float /*y_fraction*/, bool can_set_cursor) { Editor* editor = dynamic_cast(&trackview.editor()); + Editing::MouseMode mm = editor->current_mouse_mode(); + bool trimmable = (mm == MouseObject || mm == MouseTimeFX || mm == MouseDraw); - if (x_fraction > 0.0 && x_fraction < 0.25) { + if (trimmable && x_fraction > 0.0 && x_fraction < 0.2) { editor->set_canvas_cursor (editor->cursors()->left_side_trim); - } else if (x_fraction >= 0.75 && x_fraction < 1.0) { + } else if (trimmable && x_fraction >= 0.8 && x_fraction < 1.0) { editor->set_canvas_cursor (editor->cursors()->right_side_trim); } else { - if (_pre_enter_cursor && can_set_cursor) { - editor->set_canvas_cursor (_pre_enter_cursor); + if (pre_enter_cursor && can_set_cursor) { + editor->set_canvas_cursor (pre_enter_cursor); } } } @@ -3186,7 +3215,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 = region_frames_to_region_beats (pos - _region->position()); + paste_pos_beats = absolute_frames_to_source_beats (pos); beat_delta = (*mcb.notes().begin())->time() - paste_pos_beats; paste_pos_beats = 0; @@ -3224,7 +3253,7 @@ 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); + _region->set_length (end_frame - _region->position()); trackview.session()->add_command (new StatefulDiffCommand (_region)); } @@ -3362,11 +3391,16 @@ MidiRegionView::update_ghost_note (double x, double y) 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); - + /* 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); + bool success; + double length = editor.get_grid_type_as_beats (success, unsnapped_frame); + + if (!success) { + length = 1; + } /* 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. @@ -3385,8 +3419,7 @@ MidiRegionView::update_ghost_note (double x, double y) void MidiRegionView::create_ghost_note (double x, double y) { - delete _ghost_note; - _ghost_note = 0; + remove_ghost_note (); boost::shared_ptr g (new NoteType); _ghost_note = new NoEventCanvasNote (*this, *_note_group, g); @@ -3548,6 +3581,11 @@ MidiRegionView::data_recorded (boost::weak_ptr w) Evoral::MIDIEvent const ev (*i, false); assert (ev.buffer ()); + /* 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 ()); if (ev.type() == MIDI_CMD_NOTE_ON) {