X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fmidi_region_view.cc;h=24ad86f7d6f18c7a4571bf3af3828252ca6bd87a;hb=f14b079a9af6c03b6da03eb69ae49fe0968083b2;hp=227587d5a0793c849fc787effd9d78baf38c6b6b;hpb=818f2cffd7b7c95319eb5728b2e519cd96c62dc4;p=ardour.git diff --git a/gtk2_ardour/midi_region_view.cc b/gtk2_ardour/midi_region_view.cc index 227587d5a0..24ad86f7d6 100644 --- a/gtk2_ardour/midi_region_view.cc +++ b/gtk2_ardour/midi_region_view.cc @@ -48,7 +48,8 @@ #include "automation_time_axis.h" #include "canvas-hit.h" #include "canvas-note.h" -#include "canvas-program-change.h" +#include "canvas_patch_change.h" +#include "debug.h" #include "editor.h" #include "ghostregion.h" #include "gui_thread.h" @@ -58,7 +59,6 @@ #include "midi_region_view.h" #include "midi_streamview.h" #include "midi_time_axis.h" -#include "midi_time_axis.h" #include "midi_util.h" #include "note_player.h" #include "public_editor.h" @@ -68,6 +68,7 @@ #include "streamview.h" #include "utils.h" #include "mouse_cursors.h" +#include "patch_change_dialog.h" #include "i18n.h" @@ -94,6 +95,7 @@ MidiRegionView::MidiRegionView (ArdourCanvas::Group *parent, RouteTimeAxisView & , _step_edit_cursor (0) , _step_edit_cursor_width (1.0) , _step_edit_cursor_position (0.0) + , _channel_selection_scoped_note (0) , _temporary_note_group (0) , _mouse_state(None) , _pressed_button(0) @@ -127,6 +129,7 @@ MidiRegionView::MidiRegionView (ArdourCanvas::Group *parent, RouteTimeAxisView & , _step_edit_cursor (0) , _step_edit_cursor_width (1.0) , _step_edit_cursor_position (0.0) + , _channel_selection_scoped_note (0) , _temporary_note_group (0) , _mouse_state(None) , _pressed_button(0) @@ -158,6 +161,7 @@ MidiRegionView::MidiRegionView (const MidiRegionView& other) , _step_edit_cursor (0) , _step_edit_cursor_width (1.0) , _step_edit_cursor_position (0.0) + , _channel_selection_scoped_note (0) , _temporary_note_group (0) , _mouse_state(None) , _pressed_button(0) @@ -191,6 +195,7 @@ MidiRegionView::MidiRegionView (const MidiRegionView& other, boost::shared_ptrtype == GDK_SCROLL will never be seen - */ - switch (ev->type) { case GDK_SCROLL: return scroll (&ev->scroll); @@ -378,11 +379,14 @@ MidiRegionView::button_press (GdkEventButton* ev) { _last_x = ev->x; _last_y = ev->y; + group->w2i (_last_x, _last_y); - if (_mouse_state != SelectTouchDragging && ev->button == 1) { + if (_mouse_state != SelectTouchDragging) { + _pressed_button = ev->button; _mouse_state = Pressed; + return true; } @@ -399,61 +403,88 @@ 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); - - if (ev->button == 3) { - return false; - } else if (_pressed_button != 1) { - return false; - } + + event_frame = trackview.editor().pixel_to_frame(event_x); switch (_mouse_state) { - case Pressed: // Clicked + case Pressed: // Clicked + switch (trackview.editor().current_mouse_mode()) { case MouseObject: case MouseTimeFX: + { clear_selection(); - maybe_select_by_position (ev, event_x, event_y); - break; + + 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)); + + if (!success) { + beats = 1; + } + + create_note_at (event_x, event_y, beats, true); + } + break; + } case MouseRange: { bool success; Evoral::MusicalTime beats = trackview.editor().get_grid_type_as_beats (success, trackview.editor().pixel_to_frame (event_x)); - if (!success) { + + if (!success) { beats = 1; } + create_note_at (event_x, event_y, beats, true); - break; + + 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 + _mouse_state = None; - 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()); + + if (Keyboard::is_insert_note_event(ev) || trackview.editor().current_mouse_mode() == MouseRange){ + + if (_drag_rect->property_x2() > _drag_rect->property_x1() + 2) { + + const double x = _drag_rect->property_x1(); + const double length = trackview.editor().pixel_to_frame (_drag_rect->property_x2() - _drag_rect->property_x1()); - create_note_at (x, _drag_rect->property_y1(), frames_to_beats(length), true); + create_note_at (x, _drag_rect->property_y1(), frames_to_beats(length), true); + } } delete _drag_rect; _drag_rect = 0; create_ghost_note (ev->x, ev->y); - + default: break; } @@ -474,10 +505,29 @@ MidiRegionView::motion (GdkEventMotion* ev) // convert event_x to global frame event_frame = trackview.editor().pixel_to_frame(event_x) + _region->position(); trackview.editor().snap_to(event_frame); - // convert event_frame back to local coordinates relative to position + + // convert event_frame back to local coordinates relative to position event_frame -= _region->position(); - if (_ghost_note) { + 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())){ + + 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().hide_verbose_canvas_cursor (); + } + else if (_ghost_note && trackview.editor().current_mouse_mode() == MouseRange) { update_ghost_note (ev->x, ev->y); } @@ -489,16 +539,19 @@ MidiRegionView::motion (GdkEventMotion* ev) switch (_mouse_state) { case Pressed: // Maybe start a drag, if we've moved a bit - + if (fabs (event_x - _last_x) < 1 && fabs (event_y - _last_y) < 1) { /* no appreciable movement since the button was pressed */ return false; } // Select drag start - if (_pressed_button == 1 && trackview.editor().current_mouse_mode() == MouseObject) { - group->grab(GDK_POINTER_MOTION_MASK | GDK_BUTTON_RELEASE_MASK, + 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; @@ -526,6 +579,7 @@ MidiRegionView::motion (GdkEventMotion* ev) 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; @@ -544,6 +598,15 @@ MidiRegionView::motion (GdkEventMotion* ev) _drag_rect->property_fill_color_rgba() = 0xFFFFFF66; _mouse_state = AddDragging; + + if (_ghost_note){ + + delete _ghost_note; + _ghost_note = 0; + + trackview.editor().hide_verbose_canvas_cursor (); + } + return true; } @@ -551,6 +614,7 @@ MidiRegionView::motion (GdkEventMotion* ev) case SelectRectDragging: // Select drag motion case AddDragging: // Add note drag motion + if (ev->is_hint) { int t_x; int t_y; @@ -560,23 +624,30 @@ MidiRegionView::motion (GdkEventMotion* ev) event_y = t_y; } - if (_mouse_state == AddDragging) + if (_mouse_state == AddDragging){ event_x = trackview.editor().frame_to_pixel(event_frame); + } if (_drag_rect) { - if (event_x > _drag_start_x) + + if (event_x > _drag_start_x){ _drag_rect->property_x2() = event_x; - else + } + else { _drag_rect->property_x1() = event_x; + } } if (_drag_rect && _mouse_state == SelectRectDragging) { - if (event_y > _drag_start_y) + + if (event_y > _drag_start_y){ _drag_rect->property_y2() = event_y; - else + } + else { _drag_rect->property_y1() = event_y; + } - update_drag_selection(_drag_start_x, event_x, _drag_start_y, event_y); + update_drag_selection(_drag_start_x, event_x, _drag_start_y, event_y); } _last_x = event_x; @@ -726,7 +797,7 @@ MidiRegionView::create_note_at(double x, double y, double length, bool sh) MidiTimeAxisView* const mtv = dynamic_cast(&trackview); MidiStreamView* const view = mtv->midi_view(); - double note = midi_stream_view()->y_to_note(y); + double note = view->y_to_note(y); assert(note >= 0.0); assert(note <= 127.0); @@ -745,26 +816,7 @@ MidiRegionView::create_note_at(double x, double y, double length, bool sh) length = frames_to_beats (beats_to_frames (length) - 1); } - uint16_t chn_mask = mtv->channel_selector().get_selected_channels(); - int chn_cnt = 0; - uint8_t channel = 0; - - /* pick the highest selected channel, unless all channels are selected, - which is interpreted to mean channel 1 (zero) - */ - - for (uint16_t i = 0; i < 16; ++i) { - if (chn_mask & (1< new_note (new NoteType (channel, + const boost::shared_ptr new_note (new NoteType (get_channel_for_add (), frames_to_beats(start_frames + _region->start()), length, (uint8_t)note, 0x40)); @@ -798,7 +850,7 @@ MidiRegionView::clear_events() } _events.clear(); - _pgm_changes.clear(); + _patch_changes.clear(); _sys_exes.clear(); _optimization_iterator = _events.end(); } @@ -869,7 +921,7 @@ MidiRegionView::note_diff_add_change (ArdourCanvas::CanvasNoteEvent* ev, } void -MidiRegionView::apply_diff () +MidiRegionView::apply_diff (bool as_subcommand) { bool add_or_remove; @@ -884,7 +936,12 @@ MidiRegionView::apply_diff () } } - _model->apply_command(*trackview.session(), _note_diff_command); + if (as_subcommand) { + _model->apply_command_as_subcommand (*trackview.session(), _note_diff_command); + } else { + _model->apply_command (*trackview.session(), _note_diff_command); + } + _note_diff_command = 0; midi_view()->midi_track()->playlist_modified(); @@ -895,33 +952,6 @@ MidiRegionView::apply_diff () _marked_for_velocity.clear(); } -void -MidiRegionView::apply_diff_as_subcommand () -{ - bool add_or_remove; - - if (!_note_diff_command) { - return; - } - - if ((add_or_remove = _note_diff_command->adds_or_removes())) { - // Mark all selected notes for selection when model reloads - for (Selection::iterator i = _selection.begin(); i != _selection.end(); ++i) { - _marked_for_selection.insert((*i)->note()); - } - } - - _model->apply_command_as_subcommand(*trackview.session(), _note_diff_command); - _note_diff_command = 0; - midi_view()->midi_track()->playlist_modified(); - - if (add_or_remove) { - _marked_for_selection.clear(); - } - _marked_for_velocity.clear(); -} - - void MidiRegionView::abort_command() { @@ -1039,11 +1069,11 @@ MidiRegionView::redisplay_model() } } - _pgm_changes.clear(); + _patch_changes.clear(); _sys_exes.clear(); display_sysexes(); - display_program_changes(); + display_patch_changes (); _marked_for_selection.clear (); _marked_for_velocity.clear (); @@ -1057,66 +1087,40 @@ MidiRegionView::redisplay_model() } void -MidiRegionView::display_program_changes() +MidiRegionView::display_patch_changes () { MidiTimeAxisView* const mtv = dynamic_cast(&trackview); uint16_t chn_mask = mtv->channel_selector().get_selected_channels(); for (uint8_t i = 0; i < 16; ++i) { if (chn_mask & (1< control = - _model->control(Evoral::MIDI::ProgramChange (MidiPgmChangeAutomation, channel)); - - if (!control) { - return; - } - - Glib::Mutex::Lock lock (control->list()->lock()); + for (MidiModel::PatchChanges::const_iterator i = _model->patch_changes().begin(); i != _model->patch_changes().end(); ++i) { - for (AutomationList::const_iterator event = control->list()->begin(); - event != control->list()->end(); ++event) { - double event_time = (*event)->when; - double program_number = floor((*event)->value + 0.5); - - // Get current value of bank select MSB at time of the program change - Evoral::Parameter bank_select_msb(MidiCCAutomation, channel, MIDI_CTL_MSB_BANK); - boost::shared_ptr msb_control = _model->control(bank_select_msb); - uint8_t msb = 0; - if (msb_control != 0) { - msb = uint8_t(floor(msb_control->get_double(true, event_time) + 0.5)); - } - - // Get current value of bank select LSB at time of the program change - Evoral::Parameter bank_select_lsb(MidiCCAutomation, channel, MIDI_CTL_LSB_BANK); - boost::shared_ptr lsb_control = _model->control(bank_select_lsb); - uint8_t lsb = 0; - if (lsb_control != 0) { - lsb = uint8_t(floor(lsb_control->get_double(true, event_time) + 0.5)); + if ((*i)->channel() != channel) { + continue; } - - MIDI::Name::PatchPrimaryKey patch_key(msb, lsb, program_number); + + 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); - PCEvent program_change(event_time, uint8_t(program_number), channel); - if (patch != 0) { - add_canvas_program_change (program_change, patch->name()); + add_canvas_patch_change (*i, patch->name()); } else { - char buf[4]; - // program_number is zero-based: convert to one-based - snprintf(buf, 4, "%d", int(program_number+1)); - add_canvas_program_change (program_change, buf); + 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); } } } @@ -1145,7 +1149,7 @@ MidiRegionView::display_sysexes() boost::shared_ptr sysex = boost::shared_ptr( new CanvasSysEx(*this, *_note_group, text, height, x, 1.0)); - // Show unless program change is beyond the region bounds + // Show unless patch change is beyond the region bounds if (time - _region->start() >= _region->length() || time < _region->start()) { sysex->hide(); } else { @@ -1225,7 +1229,7 @@ MidiRegionView::set_height (double height) name_pixbuf->raise_to_top(); } - for (PgmChanges::iterator x = _pgm_changes.begin(); x != _pgm_changes.end(); ++x) { + for (PatchChanges::iterator x = _patch_changes.begin(); x != _patch_changes.end(); ++x) { (*x)->set_height (midi_stream_view()->contents_height()); } @@ -1298,16 +1302,16 @@ MidiRegionView::add_ghost (TimeAxisView& tv) ghost = new MidiGhostRegion (tv, trackview, unit_position); } - ghost->set_height (); - ghost->set_duration (_region->length() / samples_per_unit); - ghosts.push_back (ghost); - for (Events::iterator i = _events.begin(); i != _events.end(); ++i) { if ((note = dynamic_cast(*i)) != 0) { ghost->add_note(note); } } + ghost->set_height (); + 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()); return ghost; @@ -1349,7 +1353,9 @@ 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) - _region->start(); + + const framepos_t end_time_frames = beats_to_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 _active_notes[note] = 0; @@ -1429,8 +1435,12 @@ MidiRegionView::note_in_region_range(const boost::shared_ptr note, boo return !outside; } +/** Update a canvas note's size from its model note. + * @param ev Canvas note to update. + * @param update_ghost_regions true to update the note in any ghost regions that we have, otherwise false. + */ void -MidiRegionView::update_note (CanvasNote* ev) +MidiRegionView::update_note (CanvasNote* ev, bool update_ghost_regions) { boost::shared_ptr note = ev->note(); @@ -1445,11 +1455,13 @@ MidiRegionView::update_note (CanvasNote* ev) ev->property_x1() = x; ev->property_y1() = y1; + if (note->length() > 0) { ev->property_x2() = note_endpixel; } else { ev->property_x2() = trackview.editor().frame_to_pixel(_region->length()); } + ev->property_y2() = y1 + floor(midi_stream_view()->note_height()); if (note->length() == 0) { @@ -1471,6 +1483,15 @@ MidiRegionView::update_note (CanvasNote* ev) /* outline all edges */ ev->property_outline_what() = (guint32) 0xF; } + + if (update_ghost_regions) { + for (std::vector::iterator i = ghosts.begin(); i != ghosts.end(); ++i) { + MidiGhostRegion* gr = dynamic_cast (*i); + if (gr) { + gr->update_note (ev); + } + } + } } double @@ -1502,6 +1523,8 @@ MidiRegionView::add_note(const boost::shared_ptr note, bool visible) assert(note->time() >= 0); assert(midi_view()->note_mode() == Sustained || midi_view()->note_mode() == Percussive); + //ArdourCanvas::Group* const group = (ArdourCanvas::Group*) get_canvas_group(); + if (midi_view()->note_mode() == Sustained) { CanvasNote* ev_rect = new CanvasNote(*this, *_note_group, note); @@ -1540,6 +1563,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); @@ -1549,6 +1573,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()); } void @@ -1565,6 +1594,11 @@ MidiRegionView::step_add_note (uint8_t channel, uint8_t number, uint8_t velocity if (end_frame > region_end) { _region->set_length (end_frame - _region->position(), this); } + + MidiTimeAxisView* const mtv = dynamic_cast(&trackview); + MidiStreamView* const view = mtv->midi_view(); + + view->update_note_range(new_note->note()); _marked_for_selection.clear (); clear_selection (); @@ -1583,163 +1617,163 @@ MidiRegionView::step_sustain (Evoral::MusicalTime beats) } void -MidiRegionView::add_canvas_program_change (PCEvent& program, const string& displaytext) +MidiRegionView::add_canvas_patch_change (MidiModel::PatchChangePtr patch, const string& displaytext) { - assert(program.time >= 0); + assert (patch->time() >= 0); - const double x = trackview.editor().frame_to_pixel(beats_to_frames(program.time)); + const double x = trackview.editor().frame_to_pixel (beats_to_frames (patch->time())); - double height = midi_stream_view()->contents_height(); + double const height = midi_stream_view()->contents_height(); - boost::shared_ptr pgm_change = boost::shared_ptr( - new CanvasProgramChange(*this, *_note_group, + boost::shared_ptr patch_change = boost::shared_ptr( + new CanvasPatchChange(*this, *_note_group, displaytext, height, x, 1.0, _model_name, _custom_device_mode, - program.time, program.channel, program.value)); + patch) + ); - // Show unless program change is beyond the region bounds - if (program.time - _region->start() >= _region->length() || program.time < _region->start()) { - pgm_change->hide(); + // Show unless patch change is beyond the region bounds + if (patch->time() - _region->start() >= _region->length() || patch->time() < _region->start()) { + patch_change->hide(); } else { - pgm_change->show(); + patch_change->show(); } - _pgm_changes.push_back(pgm_change); + _patch_changes.push_back (patch_change); } void -MidiRegionView::get_patch_key_at(double time, uint8_t channel, MIDI::Name::PatchPrimaryKey& key) +MidiRegionView::get_patch_key_at (Evoral::MusicalTime time, uint8_t channel, MIDI::Name::PatchPrimaryKey& key) { - Evoral::Parameter bank_select_msb(MidiCCAutomation, channel, MIDI_CTL_MSB_BANK); - boost::shared_ptr msb_control = _model->control(bank_select_msb); - double msb = 0.0; - if (msb_control != 0) { - msb = int(msb_control->get_double(true, time)); + MidiModel::PatchChanges::iterator i = _model->patch_change_lower_bound (time); + while (i != _model->patch_changes().end() && (*i)->channel() != channel) { + ++i; } - - Evoral::Parameter bank_select_lsb(MidiCCAutomation, channel, MIDI_CTL_LSB_BANK); - boost::shared_ptr lsb_control = _model->control(bank_select_lsb); - double lsb = 0.0; - if (lsb_control != 0) { - lsb = lsb_control->get_double(true, time); - } - - Evoral::Parameter program_change(MidiPgmChangeAutomation, channel, 0); - boost::shared_ptr program_control = _model->control(program_change); - double program_number = -1.0; - if (program_control != 0) { - program_number = program_control->get_double(true, time); + + if (i != _model->patch_changes().end()) { + key.msb = (*i)->bank_msb (); + key.lsb = (*i)->bank_lsb (); + key.program_number = (*i)->program (); + } else { + key.msb = key.lsb = key.program_number = 0; } - - key.msb = (int) floor(msb + 0.5); - key.lsb = (int) floor(lsb + 0.5); - key.program_number = (int) floor(program_number + 0.5); - assert(key.is_sane()); + + assert (key.is_sane()); } void -MidiRegionView::alter_program_change(PCEvent& old_program, const MIDI::Name::PatchPrimaryKey& new_patch) +MidiRegionView::change_patch_change (CanvasPatchChange& pc, const MIDI::Name::PatchPrimaryKey& new_patch) { - // TODO: Get the real event here and alter them at the original times - Evoral::Parameter bank_select_msb(MidiCCAutomation, old_program.channel, MIDI_CTL_MSB_BANK); - boost::shared_ptr msb_control = _model->control(bank_select_msb); - if (msb_control != 0) { - msb_control->set_double(double(new_patch.msb), true, old_program.time); + 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); } - // TODO: Get the real event here and alter them at the original times - Evoral::Parameter bank_select_lsb(MidiCCAutomation, old_program.channel, MIDI_CTL_LSB_BANK); - boost::shared_ptr lsb_control = _model->control(bank_select_lsb); - if (lsb_control != 0) { - lsb_control->set_double(double(new_patch.lsb), true, old_program.time); + int const new_bank = (new_patch.msb << 7) | new_patch.lsb; + if (pc.patch()->bank() != new_bank) { + c->change_bank (pc.patch (), new_bank); } - Evoral::Parameter program_change(MidiPgmChangeAutomation, old_program.channel, 0); - boost::shared_ptr program_control = _model->control(program_change); + _model->apply_command (*trackview.session(), c); - assert(program_control != 0); - program_control->set_double(float(new_patch.program_number), true, old_program.time); - - _pgm_changes.clear (); - display_program_changes (); // XXX would be nice to limit to just old_program.channel + _patch_changes.clear (); + display_patch_changes (); } -/** @param t Time in frames relative to region position */ void -MidiRegionView::add_program_change (framecnt_t t, uint8_t channel, uint8_t value) +MidiRegionView::change_patch_change (MidiModel::PatchChangePtr old_change, const Evoral::PatchChange & new_change) { - boost::shared_ptr control = midi_region()->model()->control ( - Evoral::Parameter (MidiPgmChangeAutomation, channel, 0), true - ); + 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()); + } + + if (old_change->channel() != new_change.channel()) { + c->change_channel (old_change, new_change.channel()); + } - assert (control); + if (old_change->program() != new_change.program()) { + c->change_program (old_change, new_change.program()); + } - Evoral::MusicalTime const b = frames_to_beats (t + midi_region()->start()); + if (old_change->bank() != new_change.bank()) { + c->change_bank (old_change, new_change.bank()); + } - control->list()->add (b, value); + _model->apply_command (*trackview.session(), c); - _pgm_changes.clear (); - display_program_changes (); + _patch_changes.clear (); + display_patch_changes (); } +/** Add a patch change to the region. + * @param t Time in frames relative to region position + * @param patch Patch to add; time and channel are ignored (time is converted from t, and channel comes from + * get_channel_for_add()) + */ void -MidiRegionView::move_program_change (PCEvent pc, Evoral::MusicalTime t) +MidiRegionView::add_patch_change (framecnt_t t, Evoral::PatchChange const & patch) { - boost::shared_ptr control = _model->control (Evoral::Parameter (MidiPgmChangeAutomation, pc.channel, 0)); - assert (control); - - control->list()->erase (pc.time, pc.value); - control->list()->add (t, pc.value); - - _pgm_changes.clear (); - display_program_changes (); + MidiModel::PatchChangeDiffCommand* c = _model->new_patch_change_diff_command (_("add patch change")); + c->add (MidiModel::PatchChangePtr ( + new Evoral::PatchChange ( + frames_to_beats (t + midi_region()->start()), get_channel_for_add(), patch.program(), patch.bank() + ) + )); + + _model->apply_command (*trackview.session(), c); + + _patch_changes.clear (); + display_patch_changes (); } void -MidiRegionView::delete_program_change (CanvasProgramChange* pc) +MidiRegionView::move_patch_change (CanvasPatchChange& pc, Evoral::MusicalTime t) { - boost::shared_ptr control = _model->control (Evoral::Parameter (MidiPgmChangeAutomation, pc->channel(), 0)); - assert (control); + MidiModel::PatchChangeDiffCommand* c = _model->new_patch_change_diff_command (_("move patch change")); + c->change_time (pc.patch (), t); + _model->apply_command (*trackview.session(), c); - control->list()->erase (pc->event_time(), pc->program()); - _pgm_changes.clear (); - display_program_changes (); + _patch_changes.clear (); + display_patch_changes (); } void -MidiRegionView::program_selected(CanvasProgramChange& program, const MIDI::Name::PatchPrimaryKey& new_patch) +MidiRegionView::delete_patch_change (CanvasPatchChange* pc) { - PCEvent program_change_event(program.event_time(), program.program(), program.channel()); - alter_program_change(program_change_event, new_patch); -} + MidiModel::PatchChangeDiffCommand* c = _model->new_patch_change_diff_command (_("delete patch change")); + c->remove (pc->patch ()); + _model->apply_command (*trackview.session(), c); + _patch_changes.clear (); + display_patch_changes (); +} + void -MidiRegionView::previous_program(CanvasProgramChange& program) +MidiRegionView::previous_patch (CanvasPatchChange& patch) { - if (program.program() < 127) { + if (patch.patch()->program() < 127) { MIDI::Name::PatchPrimaryKey key; - get_patch_key_at(program.event_time(), program.channel(), key); - PCEvent program_change_event(program.event_time(), program.program(), program.channel()); - + get_patch_key_at (patch.patch()->time(), patch.patch()->channel(), key); key.program_number++; - alter_program_change(program_change_event, key); + change_patch_change (patch, key); } } void -MidiRegionView::next_program(CanvasProgramChange& program) +MidiRegionView::next_patch (CanvasPatchChange& patch) { - if (program.program() > 0) { + if (patch.patch()->program() > 0) { MIDI::Name::PatchPrimaryKey key; - get_patch_key_at(program.event_time(), program.channel(), key); - PCEvent program_change_event(program.event_time(), program.program(), program.channel()); - + get_patch_key_at (patch.patch()->time(), patch.patch()->channel(), key); key.program_number--; - alter_program_change(program_change_event, key); + change_patch_change (patch, key); } } @@ -1827,6 +1861,16 @@ MidiRegionView::unique_select(ArdourCanvas::CanvasNoteEvent* ev) } } +void +MidiRegionView::select_all_notes () +{ + clear_selection (); + + for (Events::iterator i = _events.begin(); i != _events.end(); ++i) { + add_to_selection (*i); + } +} + void MidiRegionView::select_matching_notes (uint8_t notenum, uint16_t channel_mask, bool add, bool extend) { @@ -2779,6 +2823,20 @@ MidiRegionView::note_left (ArdourCanvas::CanvasNoteEvent*) } } +void +MidiRegionView::patch_entered (ArdourCanvas::CanvasPatchChange* ev) +{ + ostringstream s; + s << ((int) ev->patch()->program() + 1) << ":" << (ev->patch()->bank() + 1); + trackview.editor().show_verbose_canvas_cursor_with (s.str().c_str(), 10, 20); +} + +void +MidiRegionView::patch_left (ArdourCanvas::CanvasPatchChange *) +{ + trackview.editor().hide_verbose_canvas_cursor (); +} + void MidiRegionView::note_mouse_position (float x_fraction, float /*y_fraction*/, bool can_set_cursor) { @@ -2798,12 +2856,16 @@ MidiRegionView::note_mouse_position (float x_fraction, float /*y_fraction*/, boo void MidiRegionView::set_frame_color() { - if (frame) { - if (_selected && should_show_selection) { - frame->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_SelectedFrameBase.get(); - } else { - frame->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_MidiFrameBase.get(); - } + if (!frame) { + return; + } + + if (_selected) { + frame->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_SelectedFrameBase.get(); + } else if (high_enough_for_name) { + frame->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_MidiFrameBase.get(); + } else { + frame->property_fill_color_rgba() = fill_color; } } @@ -2826,6 +2888,9 @@ MidiRegionView::midi_channel_mode_changed(ChannelMode mode, uint16_t mask) } _last_channel_selection = mask; + + _patch_changes.clear (); + display_patch_changes (); } void @@ -2889,6 +2954,7 @@ MidiRegionView::selection_as_cut_buffer () const return cb; } +/** This method handles undo */ void MidiRegionView::paste (framepos_t pos, float times, const MidiCutBuffer& mcb) { @@ -2896,6 +2962,10 @@ MidiRegionView::paste (framepos_t pos, float times, const MidiCutBuffer& mcb) return; } + DEBUG_TRACE (DEBUG::CutNPaste, string_compose ("MIDI paste @ %1 times %2\n", pos, times)); + + trackview.session()->begin_reversible_command (_("paste")); + start_note_diff_command (_("paste")); Evoral::MusicalTime beat_delta; @@ -2908,6 +2978,12 @@ MidiRegionView::paste (framepos_t pos, float times, const MidiCutBuffer& mcb) beat_delta = (*mcb.notes().begin())->time() - paste_pos_beats; paste_pos_beats = 0; + DEBUG_TRACE (DEBUG::CutNPaste, string_compose ("Paste data spans from %1 to %2 (%3) ; paste pos beats = %4 (based on %5 - %6 ; beat delta = %7\n", + (*mcb.notes().begin())->time(), + (*mcb.notes().rbegin())->end_time(), + duration, pos, _region->position(), + paste_pos_beats, beat_delta)); + clear_selection (); for (int n = 0; n < (int) times; ++n) { @@ -2933,14 +3009,16 @@ MidiRegionView::paste (framepos_t pos, float times, const MidiCutBuffer& mcb) if (end_frame > region_end) { - trackview.session()->begin_reversible_command (_("paste")); + DEBUG_TRACE (DEBUG::CutNPaste, string_compose ("Paste extended region from %1 to %2\n", region_end, end_frame)); _region->clear_changes (); _region->set_length (end_frame, this); trackview.session()->add_command (new StatefulDiffCommand (_region)); } - apply_diff (); + apply_diff (true); + + trackview.session()->commit_reversible_command (); } struct EventNoteTimeEarlyFirstComparator { @@ -3053,6 +3131,7 @@ MidiRegionView::update_ghost_note (double x, double y) bool success; Evoral::MusicalTime beats = trackview.editor().get_grid_type_as_beats (success, f); + if (!success) { beats = 1; } @@ -3063,7 +3142,8 @@ MidiRegionView::update_ghost_note (double x, double y) _ghost_note->note()->set_length (length); _ghost_note->note()->set_note (midi_stream_view()->y_to_note (y)); - update_note (_ghost_note); + /* the ghost note does not appear in ghost regions, so pass false in here */ + update_note (_ghost_note, false); show_verbose_canvas_cursor (_ghost_note->note ()); } @@ -3118,8 +3198,6 @@ MidiRegionView::maybe_select_by_position (GdkEventButton* ev, double /*x*/, doub double note = midi_stream_view()->y_to_note(y); Events e; MidiTimeAxisView* const mtv = dynamic_cast(&trackview); - - cerr << "Selecting by position\n"; uint16_t chn_mask = mtv->channel_selector().get_selected_channels(); @@ -3294,3 +3372,43 @@ MidiRegionView::trim_front_ending () midi_region()->fix_negative_start (); } } + +/** @return channel (counted from 0) to add an event to, based on the current setting + * of the channel selector. + */ +uint8_t +MidiRegionView::get_channel_for_add () const +{ + MidiTimeAxisView* const mtv = dynamic_cast(&trackview); + uint16_t const chn_mask = mtv->channel_selector().get_selected_channels(); + int chn_cnt = 0; + uint8_t channel = 0; + + /* pick the highest selected channel, unless all channels are selected, + which is interpreted to mean channel 1 (zero) + */ + + for (uint16_t i = 0; i < 16; ++i) { + if (chn_mask & (1<patch (), Gtk::Stock::APPLY); + if (d.run () != Gtk::RESPONSE_ACCEPT) { + return; + } + + change_patch_change (pc->patch(), d.patch ()); +}