X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fmidi_region_view.cc;h=ac982a3040146771de7a4e9030031230160e5215;hb=ba8953605dd8359f0ec8a2aacb51102deda05df7;hp=8a6ad8c95dc84bbde8e468c7dbc0e685b5b36f34;hpb=14d601a0ffe1ceb452aba103eb35ce03320acd21;p=ardour.git diff --git a/gtk2_ardour/midi_region_view.cc b/gtk2_ardour/midi_region_view.cc index 8a6ad8c95d..ac982a3040 100644 --- a/gtk2_ardour/midi_region_view.cc +++ b/gtk2_ardour/midi_region_view.cc @@ -24,15 +24,13 @@ #include -#include +#include "gtkmm2ext/gtk_ui.h" #include #include "pbd/memento_command.h" #include "pbd/stateful_diff_command.h" -#include "ardour/playlist.h" -#include "ardour/tempo.h" #include "ardour/midi_region.h" #include "ardour/midi_source.h" #include "ardour/midi_model.h" @@ -50,6 +48,7 @@ #include "canvas-hit.h" #include "canvas-note.h" #include "canvas_patch_change.h" +#include "canvas-sysex.h" #include "debug.h" #include "editor.h" #include "editor_drag.h" @@ -63,6 +62,8 @@ #include "midi_streamview.h" #include "midi_time_axis.h" #include "midi_util.h" +#include "midi_velocity_dialog.h" +#include "mouse_cursors.h" #include "note_player.h" #include "public_editor.h" #include "rgb_macros.h" @@ -70,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" @@ -89,17 +89,13 @@ PBD::Signal1 MidiRegionView::SelectionCleared; 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) - , _force_channel(-1) , _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) @@ -113,30 +109,37 @@ 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_player (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()); + + MidiTimeAxisView *time_axis = dynamic_cast(&tv); + if (time_axis) { + _last_channel_mode = time_axis->channel_selector().get_channel_mode(); + _last_channel_selection = time_axis->channel_selector().get_selected_channels(); + } + + 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, boost::shared_ptr r, double spu, Gdk::Color& basic_color, TimeAxisViewItem::Visibility visibility) : 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) @@ -150,13 +153,22 @@ 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_player (0) { _note_group->raise_to_top(); PublicEditor::DropDownKeys.connect (sigc::mem_fun (*this, &MidiRegionView::drop_down_keys)); + MidiTimeAxisView *time_axis = dynamic_cast(&tv); + if (time_axis) { + _last_channel_mode = time_axis->channel_selector().get_channel_mode(); + _last_channel_selection = time_axis->channel_selector().get_selected_channels(); + } + 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 @@ -172,15 +184,13 @@ MidiRegionView::parameter_changed (std::string const & p) MidiRegionView::MidiRegionView (const MidiRegionView& other) : sigc::trackable(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) @@ -194,6 +204,9 @@ 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) + , _note_player (0) { Gdk::Color c; int r,g,b,a; @@ -206,15 +219,13 @@ MidiRegionView::MidiRegionView (const MidiRegionView& other) MidiRegionView::MidiRegionView (const MidiRegionView& other, boost::shared_ptr region) : RegionView (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) @@ -228,6 +239,9 @@ MidiRegionView::MidiRegionView (const MidiRegionView& other, boost::shared_ptrraise_to_top(); - group->signal_event().connect( - sigc::mem_fun(this, &MidiRegionView::canvas_event), false); + group->signal_event().connect (sigc::mem_fun (this, &MidiRegionView::canvas_event), false); midi_view()->signal_channel_mode_changed().connect( sigc::mem_fun(this, &MidiRegionView::midi_channel_mode_changed)); - midi_view()->signal_midi_patch_settings_changed().connect( - sigc::mem_fun(this, &MidiRegionView::midi_patch_settings_changed)); + instrument_info().Changed.connect (_instrument_changed_connection, invalidator (*this), + boost::bind (&MidiRegionView::instrument_settings_changed, this), gui_context()); trackview.editor().SnapChanged.connect(snap_changed_connection, invalidator(*this), - ui_bind(&MidiRegionView::snap_changed, this), + boost::bind (&MidiRegionView::snap_changed, this), gui_context()); - 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 ()); +} + +InstrumentInfo& +MidiRegionView::instrument_info () const +{ + RouteUI* route_ui = dynamic_cast (&trackview); + return route_ui->route()->instrument_info(); } const boost::shared_ptr @@ -307,13 +327,15 @@ 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()); } bool MidiRegionView::canvas_event(GdkEvent* ev) { + bool r; + switch (ev->type) { case GDK_ENTER_NOTIFY: case GDK_LEAVE_NOTIFY: @@ -328,7 +350,19 @@ MidiRegionView::canvas_event(GdkEvent* ev) break; } - if (!trackview.editor().internal_editing()) { + if (ev->type == GDK_2BUTTON_PRESS) { + // cannot use double-click to exit internal mode if single-click is being used + MouseMode m = trackview.editor().current_mouse_mode(); + + if ((m != MouseObject || !Keyboard::modifier_state_contains (ev->button.state, Keyboard::insert_note_modifier())) && (m != MouseDraw)) { + return trackview.editor().toggle_internal_editing_from_double_click (ev); + } + } + + if ((!trackview.editor().internal_editing() && trackview.editor().current_mouse_mode() != MouseGain) || + (trackview.editor().current_mouse_mode() == MouseTimeFX) || + (trackview.editor().current_mouse_mode() == MouseZoom)) { + // handle non-draw modes elsewhere return false; } @@ -345,11 +379,11 @@ 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); + r = button_release (&ev->button); + delete _note_player; + _note_player = 0; + return r; case GDK_ENTER_NOTIFY: return enter_notify (&ev->crossing); @@ -378,10 +412,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); } @@ -392,6 +426,13 @@ MidiRegionView::enter_notify (GdkEventCrossing* ev) group->grab_focus(); } + // if current operation is non-operational in a midi region, change the cursor to so indicate + if (trackview.editor().current_mouse_mode() == MouseGain) { + Editor* editor = dynamic_cast (&trackview.editor()); + pre_enter_cursor = editor->get_canvas_cursor(); + editor->set_canvas_cursor(editor->cursors()->timebar); + } + return false; } @@ -403,13 +444,18 @@ MidiRegionView::leave_notify (GdkEventCrossing*) trackview.editor().verbose_cursor()->hide (); remove_ghost_note (); + if (pre_enter_cursor) { + Editor* editor = dynamic_cast (&trackview.editor()); + editor->set_canvas_cursor(pre_enter_cursor); + } + return false; } 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 (); @@ -431,16 +477,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; } @@ -466,10 +515,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: { @@ -490,12 +549,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)); @@ -504,7 +568,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; } @@ -515,30 +584,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; @@ -550,35 +602,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); } @@ -589,98 +632,39 @@ MidiRegionView::motion (GdkEventMotion* ev) } switch (_mouse_state) { - case Pressed: // Maybe start a drag, if we've moved a bit + case Pressed: - 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); - - _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); + clear_selection (); + _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; @@ -708,13 +692,18 @@ MidiRegionView::scroll (GdkEventScroll* ev) trackview.editor().verbose_cursor()->hide (); - bool fine = !Keyboard::modifier_state_equals (ev->state, Keyboard::SecondaryModifier); + bool fine = !Keyboard::modifier_state_contains (ev->state, Keyboard::SecondaryModifier); + bool together = Keyboard::modifier_state_contains (ev->state, Keyboard::TertiaryModifier); if (ev->direction == GDK_SCROLL_UP) { - change_velocities (true, fine, false); + change_velocities (true, fine, false, together); } else if (ev->direction == GDK_SCROLL_DOWN) { - change_velocities (false, fine, false); + change_velocities (false, fine, false, together); + } else { + /* left, right: we don't use them */ + return false; } + return true; } @@ -747,7 +736,11 @@ MidiRegionView::key_press (GdkEventKey* ev) return true; - } else if (ev->keyval == GDK_Delete && unmodified) { + } else if ((ev->keyval == GDK_BackSpace || ev->keyval == GDK_Delete) && unmodified) { + + if (_selection.empty()) { + return false; + } delete_selection(); return true; @@ -778,9 +771,10 @@ MidiRegionView::key_press (GdkEventKey* ev) bool allow_smush = Keyboard::modifier_state_contains (ev->state, Keyboard::TertiaryModifier); bool fine = !Keyboard::modifier_state_contains (ev->state, Keyboard::SecondaryModifier); + bool together = Keyboard::modifier_state_contains (ev->state, Keyboard::Level4Modifier); if (Keyboard::modifier_state_contains (ev->state, Keyboard::PrimaryModifier)) { - change_velocities (true, fine, allow_smush); + change_velocities (true, fine, allow_smush, together); } else { transpose (true, fine, allow_smush); } @@ -790,9 +784,10 @@ MidiRegionView::key_press (GdkEventKey* ev) bool allow_smush = Keyboard::modifier_state_contains (ev->state, Keyboard::TertiaryModifier); bool fine = !Keyboard::modifier_state_contains (ev->state, Keyboard::SecondaryModifier); + bool together = Keyboard::modifier_state_contains (ev->state, Keyboard::Level4Modifier); if (Keyboard::modifier_state_contains (ev->state, Keyboard::PrimaryModifier)) { - change_velocities (false, fine, allow_smush); + change_velocities (false, fine, allow_smush, together); } else { transpose (false, fine, allow_smush); } @@ -811,6 +806,10 @@ MidiRegionView::key_press (GdkEventKey* ev) } else if (ev->keyval == GDK_c && unmodified) { channel_edit (); return true; + + } else if (ev->keyval == GDK_v && unmodified) { + velocity_edit (); + return true; } return false; @@ -829,20 +828,15 @@ MidiRegionView::key_release (GdkEventKey* ev) 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; - } - } + /* pick a note somewhat at random (since Selection is a set<>) to + * provide the "current" channel for the dialog. + */ + + uint8_t current_channel = (*_selection.begin())->note()->channel (); MidiChannelDialog channel_dialog (current_channel); int ret = channel_dialog.run (); @@ -867,24 +861,59 @@ MidiRegionView::channel_edit () apply_diff (); } +void +MidiRegionView::velocity_edit () +{ + if (_selection.empty()) { + return; + } + + /* pick a note somewhat at random (since Selection is a set<>) to + * provide the "current" velocity for the dialog. + */ + + uint8_t current_velocity = (*_selection.begin())->note()->velocity (); + MidiVelocityDialog velocity_dialog (current_velocity); + int ret = velocity_dialog.run (); + + switch (ret) { + case Gtk::RESPONSE_OK: + break; + default: + return; + } + + uint8_t new_velocity = velocity_dialog.velocity (); + + start_note_diff_command (_("velocity edit")); + + for (Selection::iterator i = _selection.begin(); i != _selection.end(); ) { + Selection::iterator next = i; + ++next; + change_note_velocity (*i, new_velocity, false); + i = next; + } + + apply_diff (); +} + 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(); @@ -895,25 +924,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)) { @@ -922,7 +943,7 @@ MidiRegionView::create_note_at (double x, double y, double length, bool sh, bool view->update_note_range(new_note->note()); - MidiModel::NoteDiffCommand* cmd = _model->new_note_diff_command("add note"); + MidiModel::NoteDiffCommand* cmd = _model->new_note_diff_command(_("add note")); cmd->add (new_note); _model->apply_command(*trackview.session(), cmd); @@ -930,9 +951,9 @@ MidiRegionView::create_note_at (double x, double y, double length, bool sh, bool } void -MidiRegionView::clear_events() +MidiRegionView::clear_events (bool with_selection_signal) { - clear_selection(); + clear_selection (with_selection_signal); MidiGhostRegion* gr; for (std::vector::iterator g = ghosts.begin(); g != ghosts.end(); ++g) { @@ -1197,15 +1218,15 @@ MidiRegionView::display_patch_changes () uint16_t chn_mask = mtv->channel_selector().get_selected_channels(); for (uint8_t i = 0; i < 16; ++i) { - if (chn_mask & (1<patch_changes().begin(); i != _model->patch_changes().end(); ++i) { @@ -1213,20 +1234,8 @@ MidiRegionView::display_patch_changes_on_channel (uint8_t channel) continue; } - MIDI::Name::PatchPrimaryKey patch_key ((*i)->bank_msb (), (*i)->bank_lsb (), (*i)->program ()); - - boost::shared_ptr patch = - MIDI::Name::MidiPatchManager::instance().find_patch( - _model_name, _custom_device_mode, channel, patch_key); - - if (patch != 0) { - add_canvas_patch_change (*i, patch->name()); - } else { - char buf[16]; - /* 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); - } + string patch_name = instrument_info().get_patch_name ((*i)->bank(), (*i)->program(), channel); + add_canvas_patch_change (*i, patch_name, active_channel); } } @@ -1296,12 +1305,12 @@ MidiRegionView::display_sysexes() } string text = str.str(); - const double x = trackview.editor().frame_to_pixel(source_beats_to_absolute_frames(time)); + const double x = trackview.editor().frame_to_pixel(source_beats_to_region_frames(time)); double height = midi_stream_view()->contents_height(); boost::shared_ptr sysex = boost::shared_ptr( - new CanvasSysEx(*this, *_note_group, text, height, x, 1.0)); + new CanvasSysEx(*this, *_note_group, text, height, x, 1.0, (*i))); // Show unless message is beyond the region bounds if (time - _region->start() >= _region->length() || time < _region->start()) { @@ -1330,8 +1339,10 @@ MidiRegionView::~MidiRegionView () end_write(); } + _selection_cleared_connection.disconnect (); + _selection.clear(); - clear_events(); + clear_events (false); delete _note_group; delete _note_diff_command; @@ -1362,6 +1373,14 @@ MidiRegionView::reset_width_dependent_items (double pixel_width) redisplay_model(); } + for (PatchChanges::iterator x = _patch_changes.begin(); x != _patch_changes.end(); ++x) { + if ((*x)->width() >= _pixel_width) { + (*x)->hide(); + } else { + (*x)->show(); + } + } + move_step_edit_cursor (_step_edit_cursor_position); set_step_edit_cursor_width (_step_edit_cursor_width); } @@ -1465,7 +1484,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; } @@ -1540,7 +1559,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; } @@ -1550,15 +1569,17 @@ MidiRegionView::play_midi_note(boost::shared_ptr note) return; } - NotePlayer* np = new NotePlayer (route_ui->midi_track()); + NotePlayer* np = new NotePlayer (route_ui->midi_track ()); np->add (note); np->play (); + + /* NotePlayer deletes itself */ } void -MidiRegionView::play_midi_chord (vector > notes) +MidiRegionView::start_playing_midi_note(boost::shared_ptr note) { - if (_no_sound_notes || !trackview.editor().sound_notes()) { + if (_no_sound_notes || !Config->get_sound_midi_notes()) { return; } @@ -1568,13 +1589,33 @@ MidiRegionView::play_midi_chord (vector > notes) return; } - NotePlayer* np = new NotePlayer (route_ui->midi_track()); + delete _note_player; + _note_player = new NotePlayer (route_ui->midi_track ()); + _note_player->add (note); + _note_player->on (); +} + +void +MidiRegionView::start_playing_midi_chord (vector > notes) +{ + 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()); for (vector >::iterator n = notes.begin(); n != notes.end(); ++n) { - np->add (*n); + _note_player->add (*n); } - np->play (); + _note_player->on (); } @@ -1598,7 +1639,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()); @@ -1768,37 +1808,53 @@ MidiRegionView::step_sustain (Evoral::MusicalTime beats) change_note_lengths (false, false, beats, false, true); } +/** Add a new patch change flag to the canvas. + * @param patch the patch change to add + * @param the text to display in the flag + * @param active_channel true to display the flag as on an active channel, false to grey it out for an inactive channel. + */ void -MidiRegionView::add_canvas_patch_change (MidiModel::PatchChangePtr patch, const string& displaytext) +MidiRegionView::add_canvas_patch_change (MidiModel::PatchChangePtr patch, const string& displaytext, bool active_channel) { 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(); boost::shared_ptr patch_change = boost::shared_ptr( - new CanvasPatchChange(*this, *_note_group, + new CanvasPatchChange(*this, *group, displaytext, height, x, 1.0, - _model_name, - _custom_device_mode, - patch) + instrument_info(), + patch, + active_channel) ); - // Show unless patch change is beyond the region bounds - if (patch->time() - _region->start() >= _region->length() || patch->time() < _region->start()) { - patch_change->hide(); + if (patch_change->width() < _pixel_width) { + // Show unless patch change is beyond the region bounds + if (region_frames < 0 || region_frames >= _region->length()) { + patch_change->hide(); + } else { + patch_change->show(); + } } else { - patch_change->show(); + patch_change->hide (); } _patch_changes.push_back (patch_change); } -void -MidiRegionView::get_patch_key_at (Evoral::MusicalTime time, uint8_t channel, MIDI::Name::PatchPrimaryKey& key) +MIDI::Name::PatchPrimaryKey +MidiRegionView::patch_change_to_patch_key (MidiModel::PatchChangePtr p) +{ + return MIDI::Name::PatchPrimaryKey (p->program(), p->bank()); +} + +void +MidiRegionView::get_patch_key_at (double time, uint8_t channel, MIDI::Name::PatchPrimaryKey& key) { MidiModel::PatchChanges::iterator i = _model->patch_change_lower_bound (time); while (i != _model->patch_changes().end() && (*i)->channel() != channel) { @@ -1806,17 +1862,15 @@ MidiRegionView::get_patch_key_at (Evoral::MusicalTime time, uint8_t channel, MID } if (i != _model->patch_changes().end()) { - key.msb = (*i)->bank_msb (); - key.lsb = (*i)->bank_lsb (); + key.bank_number = (*i)->bank(); key.program_number = (*i)->program (); } else { - key.msb = key.lsb = key.program_number = 0; + key.bank_number = key.program_number = 0; } assert (key.is_sane()); } - void MidiRegionView::change_patch_change (CanvasPatchChange& pc, const MIDI::Name::PatchPrimaryKey& new_patch) { @@ -1826,7 +1880,7 @@ MidiRegionView::change_patch_change (CanvasPatchChange& pc, const MIDI::Name::Pa c->change_program (pc.patch (), new_patch.program_number); } - int const new_bank = (new_patch.msb << 7) | new_patch.lsb; + int const new_bank = new_patch.bank_number; if (pc.patch()->bank() != new_bank) { c->change_bank (pc.patch (), new_bank); } @@ -1915,8 +1969,7 @@ void MidiRegionView::previous_patch (CanvasPatchChange& patch) { if (patch.patch()->program() < 127) { - MIDI::Name::PatchPrimaryKey key; - get_patch_key_at (patch.patch()->time(), patch.patch()->channel(), key); + MIDI::Name::PatchPrimaryKey key = patch_change_to_patch_key (patch.patch()); key.program_number++; change_patch_change (patch, key); } @@ -1926,47 +1979,32 @@ void MidiRegionView::next_patch (CanvasPatchChange& patch) { if (patch.patch()->program() > 0) { - MIDI::Name::PatchPrimaryKey key; - get_patch_key_at (patch.patch()->time(), patch.patch()->channel(), key); + MIDI::Name::PatchPrimaryKey key = patch_change_to_patch_key (patch.patch()); key.program_number--; change_patch_change (patch, key); } } void -MidiRegionView::previous_bank (CanvasPatchChange& patch) +MidiRegionView::next_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--; + MIDI::Name::PatchPrimaryKey key = patch_change_to_patch_key (patch.patch()); + if (key.bank_number > 0) { + key.bank_number--; 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) +MidiRegionView::previous_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++; + MIDI::Name::PatchPrimaryKey key = patch_change_to_patch_key (patch.patch()); + if (key.bank_number < 127) { + key.bank_number++; change_patch_change (patch, key); - } else { - if (key.msb < 127) { - key.lsb = 0; - key.msb++; - change_patch_change (patch, key); - } } } } @@ -2014,7 +2052,7 @@ MidiRegionView::delete_note (boost::shared_ptr n) void MidiRegionView::clear_selection_except (ArdourCanvas::CanvasNoteEvent* ev, bool signal) { - for (Selection::iterator i = _selection.begin(); i != _selection.end(); ) { + for (Selection::iterator i = _selection.begin(); i != _selection.end(); ) { if ((*i) != ev) { Selection::iterator tmp = i; ++tmp; @@ -2022,7 +2060,7 @@ MidiRegionView::clear_selection_except (ArdourCanvas::CanvasNoteEvent* ev, bool (*i)->set_selected (false); (*i)->hide_velocity (); _selection.erase (i); - + i = tmp; } else { ++i; @@ -2282,6 +2320,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) { @@ -2311,7 +2381,7 @@ MidiRegionView::add_to_selection (CanvasNoteEvent* ev) if (_selection.insert (ev).second) { ev->set_selected (true); - play_midi_note ((ev)->note()); + start_playing_midi_note ((ev)->note()); } if (add_mrv_selection) { @@ -2340,7 +2410,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) { @@ -2352,13 +2422,13 @@ MidiRegionView::move_selection(double dx, double dy, double cumulative_dy) shifted.push_back (moved_note); } - play_midi_chord (shifted); + start_playing_midi_chord (shifted); } else if (!to_play.empty()) { boost::shared_ptr moved_note (new NoteType (*to_play.front())); moved_note->set_note (moved_note->note() + cumulative_dy); - play_midi_note (moved_note); + start_playing_midi_note (moved_note); } } } @@ -2398,8 +2468,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; @@ -2677,6 +2748,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) { @@ -2832,9 +2914,10 @@ MidiRegionView::change_note_length (CanvasNoteEvent* event, Evoral::MusicalTime } void -MidiRegionView::change_velocities (bool up, bool fine, bool allow_smush) +MidiRegionView::change_velocities (bool up, bool fine, bool allow_smush, bool all_together) { int8_t delta; + int8_t value = 0; if (_selection.empty()) { return; @@ -2863,7 +2946,19 @@ MidiRegionView::change_velocities (bool up, bool fine, bool allow_smush) for (Selection::iterator i = _selection.begin(); i != _selection.end();) { Selection::iterator next = i; ++next; - change_note_velocity (*i, delta, true); + + if (all_together) { + if (i == _selection.begin()) { + change_note_velocity (*i, delta, true); + value = (*i)->note()->velocity() + delta; + } else { + change_note_velocity (*i, value, false); + } + + } else { + change_note_velocity (*i, delta, true); + } + i = next; } @@ -2935,7 +3030,7 @@ MidiRegionView::change_note_lengths (bool fine, bool shorter, Evoral::MusicalTim delta = trackview.editor().get_grid_type_as_beats (success, _region->position()); if (!success) { /* XXX cannot get grid type as beats ... should always be possible ... FIX ME */ - cerr << "Grid type not available as beats - TO BE FIXED\n"; + error << string_compose (_("programming error: %1"), "Grid type not available as beats - TO BE FIXED") << endmsg; return; } } @@ -2975,7 +3070,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) { @@ -3043,7 +3138,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); @@ -3063,39 +3158,65 @@ 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; } } void -MidiRegionView::patch_entered (ArdourCanvas::CanvasPatchChange* ev) +MidiRegionView::patch_entered (ArdourCanvas::CanvasPatchChange* p) { ostringstream s; /* 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); + s << _("Bank:") << (p->patch()->bank() + MIDI_BP_ZERO) << '\n' + << _("Program:") << ((int) p->patch()->program()) + MIDI_BP_ZERO << '\n' + << _("Channel:") << ((int) p->patch()->channel() + 1); show_verbose_cursor (s.str(), 10, 20); + p->grab_focus(); } void MidiRegionView::patch_left (ArdourCanvas::CanvasPatchChange *) { trackview.editor().verbose_cursor()->hide (); + /* focus will transfer back via the enter-notify event sent to this + * midi region view. + */ +} + +void +MidiRegionView::sysex_entered (ArdourCanvas::CanvasSysEx* p) +{ + ostringstream s; + s << p->text(); + show_verbose_cursor (s.str(), 10, 20); + p->grab_focus(); +} + +void +MidiRegionView::sysex_left (ArdourCanvas::CanvasSysEx *) +{ + trackview.editor().verbose_cursor()->hide (); + /* focus will transfer back via the enter-notify event sent to this + * midi region view. + */ } 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); } } } @@ -3129,15 +3250,9 @@ MidiRegionView::set_frame_color() void MidiRegionView::midi_channel_mode_changed(ChannelMode mode, uint16_t mask) { - switch (mode) { - case AllChannels: - case FilterChannels: - _force_channel = -1; - break; - case ForceChannel: - _force_channel = mask; + if (mode == ForceChannel) { mask = 0xFFFF; // Show all notes as active (below) - }; + } // Update notes for selection for (Events::iterator i = _events.begin(); i != _events.end(); ++i) { @@ -3145,16 +3260,15 @@ MidiRegionView::midi_channel_mode_changed(ChannelMode mode, uint16_t mask) } _last_channel_selection = mask; + _last_channel_mode = mode; _patch_changes.clear (); display_patch_changes (); } void -MidiRegionView::midi_patch_settings_changed(std::string model, std::string custom_device_mode) +MidiRegionView::instrument_settings_changed () { - _model_name = model; - _custom_device_mode = custom_device_mode; redisplay_model(); } @@ -3235,7 +3349,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; @@ -3273,7 +3387,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)); } @@ -3411,11 +3525,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. @@ -3434,8 +3553,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); @@ -3597,6 +3715,19 @@ MidiRegionView::data_recorded (boost::weak_ptr w) Evoral::MIDIEvent const ev (*i, false); assert (ev.buffer ()); + if(ev.is_channel_event()) { + if (_last_channel_mode == FilterChannels) { + if(((uint16_t(1) << ev.channel()) & _last_channel_selection) == 0) { + continue; + } + } + } + + /* 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) { @@ -3651,7 +3782,10 @@ MidiRegionView::trim_front_ending () void MidiRegionView::edit_patch_change (ArdourCanvas::CanvasPatchChange* pc) { - PatchChangeDialog d (&_source_relative_time_converter, trackview.session(), *pc->patch (), Gtk::Stock::APPLY); + PatchChangeDialog d (&_source_relative_time_converter, trackview.session(), *pc->patch (), instrument_info(), Gtk::Stock::APPLY); + + d.set_position (Gtk::WIN_POS_MOUSE); + if (d.run () != Gtk::RESPONSE_ACCEPT) { return; } @@ -3659,6 +3793,16 @@ MidiRegionView::edit_patch_change (ArdourCanvas::CanvasPatchChange* pc) change_patch_change (pc->patch(), d.patch ()); } +void +MidiRegionView::delete_sysex (CanvasSysEx* sysex) +{ + MidiModel::SysExDiffCommand* c = _model->new_sysex_diff_command (_("delete sysex")); + c->remove (sysex->sysex()); + _model->apply_command (*trackview.session(), c); + + _sys_exes.clear (); + display_sysexes(); +} void MidiRegionView::show_verbose_cursor (boost::shared_ptr n) const @@ -3737,3 +3881,10 @@ MidiRegionView::selection_cleared (MidiRegionView* rv) /* Clear our selection in sympathy; but don't signal the fact */ clear_selection (false); } + +void +MidiRegionView::note_button_release () +{ + delete _note_player; + _note_player = 0; +}