X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=gtk2_ardour%2Fmidi_region_view.cc;h=5ffbc8c27726bb53adcdae152b69329b75cac3d9;hb=3b04885cb754a7566b4f03dde042cddddea7a850;hp=d7ae77def59f56923d193583180f1a3330a90051;hpb=d4d5b30aebb8a54358bfb203c84cfd641bff79f3;p=ardour.git diff --git a/gtk2_ardour/midi_region_view.cc b/gtk2_ardour/midi_region_view.cc index d7ae77def5..5ffbc8c277 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" @@ -41,6 +39,7 @@ #include "evoral/Parameter.hpp" #include "evoral/MIDIParameters.hpp" +#include "evoral/MIDIEvent.hpp" #include "evoral/Control.hpp" #include "evoral/midi_util.h" @@ -51,15 +50,19 @@ #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" #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" @@ -67,7 +70,6 @@ #include "simpleline.h" #include "streamview.h" #include "utils.h" -#include "mouse_cursors.h" #include "patch_change_dialog.h" #include "verbose_cursor.h" @@ -79,20 +81,20 @@ 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) - , _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) @@ -106,27 +108,30 @@ 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), boost::bind (&MidiRegionView::parameter_changed, this, _1), gui_context()); connect_to_diskstream (); + + SelectionCleared.connect (_selection_cleared_connection, invalidator (*this), boost::bind (&MidiRegionView::selection_cleared, this, _1), gui_context ()); } 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) @@ -140,25 +145,38 @@ 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)); connect_to_diskstream (); + + SelectionCleared.connect (_selection_cleared_connection, invalidator (*this), boost::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) : 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) @@ -172,6 +190,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; @@ -184,15 +205,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) @@ -206,6 +225,9 @@ MidiRegionView::MidiRegionView (const MidiRegionView& other, boost::shared_ptrraise_to_top(); group->signal_event().connect( sigc::mem_fun(this, &MidiRegionView::canvas_event), false); @@ -261,14 +283,30 @@ MidiRegionView::init (Gdk::Color const & basic_color, bool wfd) 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), boost::bind (&MidiRegionView::parameter_changed, this, _1), gui_context()); connect_to_diskstream (); + + SelectionCleared.connect (_selection_cleared_connection, invalidator (*this), boost::bind (&MidiRegionView::selection_cleared, this, _1), gui_context ()); +} + +InstrumentInfo& +MidiRegionView::instrument_info () const +{ + RouteUI* route_ui = dynamic_cast (&trackview); + return route_ui->route()->instrument_info(); +} + +const boost::shared_ptr +MidiRegionView::midi_region() const +{ + return boost::dynamic_pointer_cast(_region); } void @@ -276,13 +314,15 @@ MidiRegionView::connect_to_diskstream () { midi_view()->midi_track()->DataRecorded.connect( *this, invalidator(*this), - ui_bind(&MidiRegionView::data_recorded, this, _1, _2), + 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: @@ -296,8 +336,15 @@ MidiRegionView::canvas_event(GdkEvent* ev) default: break; } - - if (!trackview.editor().internal_editing()) { + + if (ev->type == GDK_2BUTTON_PRESS) { + 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; } @@ -314,12 +361,12 @@ 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); @@ -329,7 +376,7 @@ MidiRegionView::canvas_event(GdkEvent* ev) case GDK_MOTION_NOTIFY: return motion (&ev->motion); - default: + default: break; } @@ -347,16 +394,27 @@ bool 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(); + _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); } + if (!trackview.editor().internal_editing()) { + Keyboard::magic_widget_drop_focus(); + } else { + Keyboard::magic_widget_grab_focus(); + 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; } @@ -364,21 +422,34 @@ bool MidiRegionView::leave_notify (GdkEventCrossing*) { _mouse_mode_connection.disconnect (); - + 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 (); 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 @@ -388,19 +459,22 @@ MidiRegionView::button_press (GdkEventButton* ev) return false; } - _last_x = ev->x; - _last_y = ev->y; - - group->w2i (_last_x, _last_y); - + Editor* editor = dynamic_cast (&trackview.editor()); + MouseMode m = editor->current_mouse_mode(); + + if (m == MouseObject && Keyboard::modifier_state_contains (ev->state, Keyboard::insert_note_modifier())) { + pre_press_cursor = editor->get_canvas_cursor (); + editor->set_canvas_cursor (editor->cursors()->midi_pencil); + } + if (_mouse_state != SelectTouchDragging) { - + _pressed_button = ev->button; _mouse_state = Pressed; - + return true; } - + _pressed_button = ev->button; return true; @@ -410,7 +484,6 @@ bool MidiRegionView::button_release (GdkEventButton* ev) { double event_x, event_y; - framepos_t event_frame = 0; if (ev->button != 1) { return false; @@ -418,88 +491,89 @@ 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 (); + + if (pre_press_cursor) { + dynamic_cast(&editor)->set_canvas_cursor (pre_press_cursor, false); + pre_press_cursor = 0; + } switch (_mouse_state) { - case Pressed: // Clicked + case Pressed: // Clicked + + switch (editor.current_mouse_mode()) { + case MouseRange: + /* no motion occured - simple click */ + clear_selection (); + break; - switch (trackview.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); + + /* 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 = 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); - + + /* 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; } default: break; } - - _mouse_state = None; - break; - - case SelectRectDragging: // Select drag done - + _mouse_state = None; - delete _drag_rect; - _drag_rect = 0; break; - case AddDragging: // Add drag done - + case SelectRectDragging: + case AddDragging: + editor.drags()->end_grab ((GdkEvent *) ev); _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(), frames_to_beats(length), true); - } - } + create_ghost_note (ev->x, ev->y); + break; - delete _drag_rect; - _drag_rect = 0; - create_ghost_note (ev->x, ev->y); - default: break; } @@ -510,160 +584,69 @@ 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 - event_frame = snap_pixel_to_frame (event_x); + if (!_ghost_note && editor.current_mouse_mode() == MouseObject && + 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() == MouseObject && + 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){ - - delete _ghost_note; - _ghost_note = 0; - - trackview.editor().verbose_cursor()->hide (); - } - else if (_ghost_note && trackview.editor().current_mouse_mode() == MouseRange) { + + } else if (_ghost_note && editor.current_mouse_mode() == MouseObject) { + + remove_ghost_note (); + editor.verbose_cursor()->hide (); + + } else if (_ghost_note && editor.current_mouse_mode() == MouseDraw) { + 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 - && !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(); - - _mouse_state = SelectRectDragging; - return true; - - // 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_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_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; - - if (_ghost_note){ - - delete _ghost_note; - _ghost_note = 0; - - trackview.editor().verbose_cursor()->hide (); - } + case Pressed: - return true; - } - - return false; - - case SelectRectDragging: // Select drag motion - 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 = trackview.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; - } - } - - 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; + if (_pressed_button == 1) { + + MouseMode m = editor.current_mouse_mode(); + + 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; } - - update_drag_selection(_drag_start_x, event_x, _drag_start_y, event_y); } - _last_x = event_x; - _last_y = event_y; + return false; + case SelectRectDragging: + case SelectVerticalDragging: + case AddDragging: + editor.drags()->motion_handler ((GdkEvent *) ev, false); + break; + case SelectTouchDragging: return false; @@ -682,128 +665,229 @@ 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); - + 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); + } 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 (); + 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 (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); - + 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); } 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); - + 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); } 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) { + + } else if (ev->keyval == GDK_c && unmodified) { + channel_edit (); return true; + } else if (ev->keyval == GDK_v && unmodified) { + velocity_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 () +{ + if (_selection.empty()) { + return; + } + + /* 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 (); + + 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::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 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) +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(); @@ -814,21 +898,17 @@ 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); - assert(start_frames >= 0); - - // Snap length - length = frames_to_beats( - snap_frame_to_frame(start_frames + beats_to_frames(length)) - start_frames); + if (snap_t) { + framecnt_t grid_frames; + t = snap_frame_to_grid_underneath (t, grid_frames); + } + assert (t >= 0); assert (length != 0); - if (sh) { - length = frames_to_beats (beats_to_frames (length) - 1); - } - const boost::shared_ptr new_note (new NoteType (mtv->get_channel_for_add (), - frames_to_beats(start_frames + _region->start()), length, + region_frames_to_region_beats(t + _region->start()), + length, (uint8_t)note, 0x40)); if (_model->contains (new_note)) { @@ -837,7 +917,7 @@ MidiRegionView::create_note_at(double x, double y, double length, bool sh) 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); @@ -870,7 +950,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 +1032,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 +1152,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 +1170,7 @@ MidiRegionView::redisplay_model() _patch_changes.clear(); _sys_exes.clear(); - + display_sysexes(); display_patch_changes (); @@ -1103,44 +1192,82 @@ 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) { if ((*i)->channel() != 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 */ - snprintf (buf, 16, "%d\n%d", (*i)->program() + 1, (*i)->bank() + 1); - 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); } } 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; @@ -1152,14 +1279,14 @@ 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(); 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 { @@ -1170,7 +1297,6 @@ MidiRegionView::display_sysexes() } } - MidiRegionView::~MidiRegionView () { in_destructor = true; @@ -1187,6 +1313,8 @@ MidiRegionView::~MidiRegionView () end_write(); } + _selection_cleared_connection.disconnect (); + _selection.clear(); clear_events(); @@ -1218,7 +1346,15 @@ MidiRegionView::reset_width_dependent_items (double pixel_width) if (_enable_display) { 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); } @@ -1238,7 +1374,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()); } @@ -1322,7 +1458,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; } @@ -1364,7 +1500,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 @@ -1393,51 +1533,71 @@ 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; } RouteUI* route_ui = dynamic_cast (&trackview); - + if (!route_ui || !route_ui->midi_track()) { 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; } RouteUI* route_ui = dynamic_cast (&trackview); - + if (!route_ui || !route_ui->midi_track()) { 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 (); } 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()); @@ -1453,25 +1613,21 @@ void 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 +1665,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 +1711,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 +1729,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 +1739,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 +1754,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()); } - + MidiTimeAxisView* const mtv = dynamic_cast(&trackview); MidiStreamView* const view = mtv->midi_view(); @@ -1626,12 +1782,18 @@ 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 (beats_to_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(); @@ -1640,51 +1802,59 @@ MidiRegionView::add_canvas_patch_change (MidiModel::PatchChangePtr patch, const 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) { ++i; } - + 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) { 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); } - 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); } @@ -1699,7 +1869,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 +1877,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()); } @@ -1731,16 +1901,18 @@ 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()), mtv->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 (); } @@ -1766,13 +1938,12 @@ MidiRegionView::delete_patch_change (CanvasPatchChange* pc) _patch_changes.clear (); display_patch_changes (); } - + 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); } @@ -1782,23 +1953,44 @@ 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) +{ + if (patch.patch()->program() < 127) { + MIDI::Name::PatchPrimaryKey key = patch_change_to_patch_key (patch.patch()); + if (key.bank_number > 0) { + key.bank_number--; + change_patch_change (patch, key); + } + } +} + +void +MidiRegionView::next_bank (CanvasPatchChange& patch) +{ + if (patch.patch()->program() > 0) { + MIDI::Name::PatchPrimaryKey key = patch_change_to_patch_key (patch.patch()); + if (key.bank_number < 127) { + key.bank_number++; + change_patch_change (patch, key); + } + } +} + 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 @@ -1832,40 +2024,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(); ) { + 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()) { @@ -1883,6 +2076,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) { @@ -1936,12 +2154,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") } @@ -1973,10 +2191,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) { @@ -2017,15 +2239,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 } } } @@ -2037,7 +2250,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); @@ -2074,7 +2287,39 @@ 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); + } + } +} + +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); } @@ -2110,7 +2355,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) { @@ -2139,7 +2384,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) { @@ -2151,13 +2396,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); } } } @@ -2197,8 +2442,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 = frames_to_beats (beats_to_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; @@ -2212,12 +2458,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); @@ -2233,6 +2473,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) { @@ -2240,32 +2483,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) { @@ -2287,15 +2507,37 @@ MidiRegionView::get_end_position_pixels() } framepos_t -MidiRegionView::beats_to_frames(double beats) const +MidiRegionView::source_beats_to_absolute_frames(double beats) const +{ + /* 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::absolute_frames_to_source_beats(framepos_t frames) const +{ + /* 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 _time_converter.to(beats); + return _region_relative_time_converter.to(beats); } double -MidiRegionView::frames_to_beats(framepos_t frames) const +MidiRegionView::region_frames_to_region_beats(framepos_t frames) const { - return _time_converter.from(frames); + return _region_relative_time_converter.from(frames); } void @@ -2341,7 +2583,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 @@ -2383,8 +2625,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) { @@ -2395,7 +2637,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; @@ -2424,6 +2666,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) { @@ -2440,8 +2687,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); @@ -2473,9 +2723,14 @@ MidiRegionView::commit_resizing (ArdourCanvas::CanvasNoteEvent* primary, bool at } void -MidiRegionView::change_note_channel (CanvasNoteEvent* event, int8_t channel) +MidiRegionView::abort_resizing () { - note_diff_add_change (event, MidiModel::NoteDiffCommand::Channel, (uint8_t) channel); + for (std::vector::iterator i = _resize_data.begin(); i != _resize_data.end(); ++i) { + delete (*i)->resize_rect; + delete *i; + } + + _resize_data.clear (); } void @@ -2490,8 +2745,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); } @@ -2582,6 +2837,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) { @@ -2611,9 +2888,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; if (_selection.empty()) { return; @@ -2642,15 +2920,27 @@ 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; } 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); } @@ -2714,7 +3004,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; } } @@ -2752,12 +3042,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; + framecnt_t distance; if (trackview.editor().snap_mode() == Editing::SnapOff) { - + /* grid is off - use nudge distance */ distance = trackview.editor().get_nudge_distance (ref_point, unused); @@ -2787,7 +3077,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; @@ -2821,8 +3111,8 @@ void 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); @@ -2842,9 +3132,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; } } @@ -2852,7 +3142,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); } @@ -2866,14 +3157,16 @@ 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) { + Editing::MouseMode mm = editor->current_mouse_mode(); + bool trimmable = (mm == MouseObject || mm == MouseTimeFX || mm == MouseDraw); + + 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); } } } @@ -2896,7 +3189,7 @@ MidiRegionView::set_frame_color() } else { f = fill_color; } - + if (!rect_visible) { f = UINT_RGBA_CHANGE_A (f, 0); } @@ -2907,15 +3200,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) { @@ -2929,10 +3216,8 @@ MidiRegionView::midi_channel_mode_changed(ChannelMode mode, uint16_t mask) } 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(); } @@ -2946,6 +3231,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()); @@ -2957,18 +3245,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(); } } @@ -3009,7 +3298,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 = absolute_frames_to_source_beats (pos); beat_delta = (*mcb.notes().begin())->time() - paste_pos_beats; paste_pos_beats = 0; @@ -3018,7 +3307,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) { @@ -3039,7 +3328,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) { @@ -3047,12 +3336,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); + _region->set_length (end_frame - _region->position()); trackview.session()->add_command (new StatefulDiffCommand (_region)); } apply_diff (true); - + trackview.session()->commit_reversible_command (); } @@ -3076,9 +3365,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()) { @@ -3087,27 +3375,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()) { @@ -3116,20 +3412,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 @@ -3145,7 +3451,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()); @@ -3157,23 +3463,32 @@ 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); + PublicEditor& editor = trackview.editor (); + + 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 + */ + bool success; - Evoral::MusicalTime beats = trackview.editor().get_grid_type_as_beats (success, f); + double length = editor.get_grid_type_as_beats (success, unsnapped_frame); if (!success) { - beats = 1; + length = 1; } - - double length = frames_to_beats (snap_frame_to_frame (f + beats_to_frames (beats)) - f); - - _ghost_note->note()->set_time (frames_to_beats (f + _region->start())); + + /* 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 ()); @@ -3187,8 +3502,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); @@ -3208,7 +3522,7 @@ MidiRegionView::snap_changed () if (!_ghost_note) { return; } - + create_ghost_note (_last_ghost_x, _last_ghost_y); } @@ -3251,7 +3565,7 @@ MidiRegionView::maybe_select_by_position (GdkEventButton* ev, double /*x*/, doub PublicEditor& editor (trackview.editor()); editor.get_selection().add (this); } -} +} void MidiRegionView::color_handler () @@ -3297,7 +3611,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); } @@ -3317,22 +3631,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 */ @@ -3340,14 +3653,22 @@ 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 ()); + /* 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) { @@ -3364,7 +3685,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); } @@ -3402,7 +3723,7 @@ MidiRegionView::trim_front_ending () void MidiRegionView::edit_patch_change (ArdourCanvas::CanvasPatchChange* pc) { - PatchChangeDialog d (&_time_converter, trackview.session(), *pc->patch (), Gtk::Stock::APPLY); + PatchChangeDialog d (&_source_relative_time_converter, trackview.session(), *pc->patch (), instrument_info(), Gtk::Stock::APPLY); if (d.run () != Gtk::RESPONSE_ACCEPT) { return; } @@ -3415,12 +3736,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); } @@ -3435,7 +3756,7 @@ MidiRegionView::show_verbose_cursor (string const & text, double xoffset, double 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); @@ -3446,3 +3767,52 @@ MidiRegionView::show_verbose_cursor (string const & text, double xoffset, double 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); +} + +void +MidiRegionView::note_button_release () +{ + delete _note_player; + _note_player = 0; +}