X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fmidi_region_view.cc;h=40f267717b6d03c9337c4a1acf9def2dd97e006b;hb=41b8a010da914eace2e300ef0a3c0800ff6183e1;hp=4967886b7cdc7b948054665b650cd85bf4068c8b;hpb=e3ac55f7b18503b33b453dd3e3d8bd4be530533d;p=ardour.git diff --git a/gtk2_ardour/midi_region_view.cc b/gtk2_ardour/midi_region_view.cc index 4967886b7c..40f267717b 100644 --- a/gtk2_ardour/midi_region_view.cc +++ b/gtk2_ardour/midi_region_view.cc @@ -50,6 +50,7 @@ #include "gui_thread.h" #include "keyboard.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" @@ -81,9 +82,12 @@ MidiRegionView::MidiRegionView (ArdourCanvas::Group *parent, RouteTimeAxisView & , _custom_device_mode(string()) , _active_notes(0) , _note_group(new ArdourCanvas::Group(*parent)) - , _delta_command(NULL) + , _delta_command(0) + , _diff_command(0) , _mouse_state(None) , _pressed_button(0) + , _sort_needed (true) + , _optimization_iterator (_events.end()) { _note_group->raise_to_top(); } @@ -99,10 +103,13 @@ MidiRegionView::MidiRegionView (ArdourCanvas::Group *parent, RouteTimeAxisView & , _custom_device_mode(string()) , _active_notes(0) , _note_group(new ArdourCanvas::Group(*parent)) - , _delta_command(NULL) + , _delta_command(0) + , _diff_command(0) , _mouse_state(None) , _pressed_button(0) - + , _sort_needed (true) + , _optimization_iterator (_events.end()) + { _note_group->raise_to_top(); } @@ -118,16 +125,19 @@ MidiRegionView::MidiRegionView (const MidiRegionView& other) , _custom_device_mode(string()) , _active_notes(0) , _note_group(new ArdourCanvas::Group(*get_canvas_group())) - , _delta_command(NULL) + , _delta_command(0) + , _diff_command(0) , _mouse_state(None) , _pressed_button(0) + , _sort_needed (true) + , _optimization_iterator (_events.end()) { Gdk::Color c; int r,g,b,a; UINT_TO_RGBA (other.fill_color, &r, &g, &b, &a); c.set_rgb_p (r/255.0, g/255.0, b/255.0); - + init (c, false); } @@ -140,9 +150,12 @@ MidiRegionView::MidiRegionView (const MidiRegionView& other, boost::shared_ptrmidi_source(0)->load_model(); } - cerr << "Looking up model for midi region\n"; _model = midi_region()->midi_source(0)->model(); - cerr << " model = " << _model << endl; _enable_display = false; RegionView::init (basic_color, false); @@ -175,7 +186,7 @@ MidiRegionView::init (Gdk::Color const & basic_color, bool wfd) region_sync_changed (); region_resized (BoundsChanged); region_locked (); - + reset_width_dependent_items (_pixel_width); set_colors (); @@ -192,7 +203,7 @@ MidiRegionView::init (Gdk::Color const & basic_color, bool wfd) midi_view()->signal_channel_mode_changed().connect( mem_fun(this, &MidiRegionView::midi_channel_mode_changed)); - + midi_view()->signal_midi_patch_settings_changed().connect( mem_fun(this, &MidiRegionView::midi_patch_settings_changed)); } @@ -210,26 +221,116 @@ MidiRegionView::canvas_event(GdkEvent* ev) static double last_x, last_y; double event_x, event_y; nframes64_t event_frame = 0; + bool fine; - static ArdourCanvas::SimpleRect* drag_rect = NULL; + static ArdourCanvas::SimpleRect* drag_rect = 0; + + /* XXX: note that as of August 2009, the GnomeCanvas does not propagate scroll events + to its items, which means that ev->type == GDK_SCROLL will never be seen + */ switch (ev->type) { + case GDK_SCROLL: + fine = Keyboard::modifier_state_equals (ev->scroll.state, Keyboard::Level4Modifier); + + if (ev->scroll.direction == GDK_SCROLL_UP) { + change_velocities (true, fine, false); + return true; + } else if (ev->scroll.direction == GDK_SCROLL_DOWN) { + change_velocities (false, fine, false); + return true; + } else { + return false; + } + break; + case GDK_KEY_PRESS: - if (ev->key.keyval == GDK_Shift_L || ev->key.keyval == GDK_Control_L) { + + /* 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->key.keyval == GDK_Alt_L || ev->key.keyval == GDK_Alt_R){ _mouse_state = SelectTouchDragging; return true; + } else if (ev->key.keyval == GDK_Escape) { clear_selection(); _mouse_state = None; + + } else if (ev->key.keyval == GDK_comma || ev->key.keyval == GDK_period) { + + bool start = (ev->key.keyval == GDK_comma); + bool end = (ev->key.keyval == GDK_period); + bool shorter = Keyboard::modifier_state_contains (ev->key.state, Keyboard::PrimaryModifier); + fine = Keyboard::modifier_state_contains (ev->key.state, Keyboard::SecondaryModifier); + + change_note_lengths (fine, shorter, start, end); + + return true; + + } else if (ev->key.keyval == GDK_Delete) { + + delete_selection(); + return true; + + } else if (ev->key.keyval == GDK_Tab) { + + if (Keyboard::modifier_state_equals (ev->key.state, Keyboard::PrimaryModifier)) { + goto_previous_note (); + } else { + goto_next_note (); + } + return true; + + } else if (ev->key.keyval == GDK_Up) { + + bool allow_smush = Keyboard::modifier_state_contains (ev->key.state, Keyboard::SecondaryModifier); + bool fine = Keyboard::modifier_state_contains (ev->key.state, Keyboard::TertiaryModifier); + + if (Keyboard::modifier_state_contains (ev->key.state, Keyboard::PrimaryModifier)) { + change_velocities (true, fine, allow_smush); + } else { + transpose (true, fine, allow_smush); + } + return true; + + } else if (ev->key.keyval == GDK_Down) { + + bool allow_smush = Keyboard::modifier_state_contains (ev->key.state, Keyboard::SecondaryModifier); + fine = Keyboard::modifier_state_contains (ev->key.state, Keyboard::TertiaryModifier); + + if (Keyboard::modifier_state_contains (ev->key.state, Keyboard::PrimaryModifier)) { + change_velocities (false, fine, allow_smush); + } else { + transpose (false, fine, allow_smush); + } + return true; + + } else if (ev->key.keyval == GDK_Left) { + + nudge_notes (false); + return true; + + } else if (ev->key.keyval == GDK_Right) { + + nudge_notes (true); + return true; + + } else if (ev->key.keyval == GDK_Control_L) { + return true; + + } else if (ev->key.keyval == GDK_r) { + /* if we're not step editing, this really doesn't matter */ + midi_view()->step_edit_rest (); + return true; } + return false; case GDK_KEY_RELEASE: - if (ev->key.keyval == GDK_Delete) { - delete_selection(); - apply_command(); - return true; - } else if (ev->key.keyval == GDK_Shift_L || ev->key.keyval == GDK_Control_L) { + if (ev->key.keyval == GDK_Alt_L || ev->key.keyval == GDK_Alt_R) { _mouse_state = None; return true; } @@ -268,7 +369,7 @@ MidiRegionView::canvas_event(GdkEvent* ev) case Pressed: // Drag start // Select drag start - if (_pressed_button == 1 && editor.current_mouse_mode() == MouseRange) { + if (_pressed_button == 1 && editor.current_mouse_mode() == MouseObject) { group->grab(GDK_POINTER_MOTION_MASK | GDK_BUTTON_RELEASE_MASK, Gdk::Cursor(Gdk::FLEUR), ev->motion.time); last_x = event_x; @@ -291,7 +392,7 @@ MidiRegionView::canvas_event(GdkEvent* ev) return true; // Add note drag start - } else if (editor.current_mouse_mode() == MouseObject) { + } else if (editor.current_mouse_mode() == MouseRange) { group->grab(GDK_POINTER_MOTION_MASK | GDK_BUTTON_RELEASE_MASK, Gdk::Cursor(Gdk::FLEUR), ev->motion.time); last_x = event_x; @@ -365,27 +466,31 @@ MidiRegionView::canvas_event(GdkEvent* ev) group->ungrab(ev->button.time); event_frame = trackview.editor().pixel_to_frame(event_x); - if (_pressed_button != 1) { + if (ev->button.button == 3) { + return false; + } else if (_pressed_button != 1) { return false; } - + switch (_mouse_state) { case Pressed: // Clicked switch (editor.current_mouse_mode()) { - case MouseRange: + case MouseObject: case MouseTimeFX: clear_selection(); break; - case MouseObject: + case MouseRange: create_note_at(event_x, event_y, _default_note_length); - default: break; + break; + default: + break; } _mouse_state = None; break; case SelectRectDragging: // Select drag done _mouse_state = None; delete drag_rect; - drag_rect = NULL; + drag_rect = 0; break; case AddDragging: // Add drag done _mouse_state = None; @@ -393,12 +498,12 @@ MidiRegionView::canvas_event(GdkEvent* ev) 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)); } delete drag_rect; - drag_rect = NULL; + drag_rect = 0; default: break; } @@ -408,6 +513,12 @@ MidiRegionView::canvas_event(GdkEvent* ev) return false; } +void +MidiRegionView::show_list_editor () +{ + MidiListEditor* mle = new MidiListEditor (trackview.session(), midi_region()); + mle->show (); +} /** Add a note to the model, and the view, at a canvas (click) coordinate. * \param x horizontal position in pixels @@ -441,6 +552,8 @@ MidiRegionView::create_note_at(double x, double y, double length) MidiModel::DeltaCommand* cmd = _model->new_delta_command("add note"); cmd->add(new_note); _model->apply_command(trackview.session(), cmd); + + play_midi_note (new_note); } void @@ -462,23 +575,24 @@ MidiRegionView::clear_events() _events.clear(); _pgm_changes.clear(); _sys_exes.clear(); + _optimization_iterator = _events.end(); } void MidiRegionView::display_model(boost::shared_ptr model) { - cerr << "MRV: display mode, enable = " << _enable_display << endl; _model = model; content_connection.disconnect (); content_connection = _model->ContentsChanged.connect(sigc::mem_fun(this, &MidiRegionView::redisplay_model)); - + clear_events (); + if (_enable_display) { redisplay_model(); } } - - + + void MidiRegionView::start_delta_command(string name) { @@ -488,7 +602,15 @@ MidiRegionView::start_delta_command(string name) } void -MidiRegionView::command_add_note(const boost::shared_ptr note, bool selected, bool show_velocity) +MidiRegionView::start_diff_command(string name) +{ + if (!_diff_command) { + _diff_command = _model->new_diff_command(name); + } +} + +void +MidiRegionView::delta_add_note(const boost::shared_ptr note, bool selected, bool show_velocity) { if (_delta_command) { _delta_command->add(note); @@ -502,15 +624,35 @@ MidiRegionView::command_add_note(const boost::shared_ptr note, bool se } void -MidiRegionView::command_remove_note(ArdourCanvas::CanvasNoteEvent* ev) +MidiRegionView::delta_remove_note(ArdourCanvas::CanvasNoteEvent* ev) { if (_delta_command && ev->note()) { _delta_command->remove(ev->note()); } } - + +void +MidiRegionView::diff_add_change (ArdourCanvas::CanvasNoteEvent* ev, + MidiModel::DiffCommand::Property property, + uint8_t val) +{ + if (_diff_command) { + _diff_command->change (ev->note(), property, val); + } +} + +void +MidiRegionView::diff_add_change (ArdourCanvas::CanvasNoteEvent* ev, + MidiModel::DiffCommand::Property property, + Evoral::MusicalTime val) +{ + if (_diff_command) { + _diff_command->change (ev->note(), property, val); + } +} + void -MidiRegionView::apply_command() +MidiRegionView::apply_delta() { if (!_delta_command) { return; @@ -520,53 +662,187 @@ MidiRegionView::apply_command() for (Selection::iterator i = _selection.begin(); i != _selection.end(); ++i) { _marked_for_selection.insert((*i)->note()); } - + _model->apply_command(trackview.session(), _delta_command); - _delta_command = NULL; + _delta_command = 0; + midi_view()->midi_track()->diskstream()->playlist_modified(); + + _marked_for_selection.clear(); + _marked_for_velocity.clear(); +} + +void +MidiRegionView::apply_diff () +{ + if (!_diff_command) { + return; + } + + _model->apply_command(trackview.session(), _diff_command); + _diff_command = 0; + midi_view()->midi_track()->diskstream()->playlist_modified(); + + _marked_for_velocity.clear(); +} + +void +MidiRegionView::apply_delta_as_subcommand() +{ + if (!_delta_command) { + return; + } + + // 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(), _delta_command); + _delta_command = 0; + midi_view()->midi_track()->diskstream()->playlist_modified(); + + _marked_for_selection.clear(); + _marked_for_velocity.clear(); +} + +void +MidiRegionView::apply_diff_as_subcommand() +{ + if (!_diff_command) { + return; + } + + // 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(), _diff_command); + _diff_command = 0; midi_view()->midi_track()->diskstream()->playlist_modified(); _marked_for_selection.clear(); _marked_for_velocity.clear(); } - void MidiRegionView::abort_command() { delete _delta_command; - _delta_command = NULL; + _delta_command = 0; + delete _diff_command; + _diff_command = 0; clear_selection(); } +CanvasNoteEvent* +MidiRegionView::find_canvas_note (boost::shared_ptr note) +{ + if (_optimization_iterator != _events.end()) { + ++_optimization_iterator; + } + + if (_optimization_iterator != _events.end() && (*_optimization_iterator)->note() == note) { + return *_optimization_iterator; + } + + for (_optimization_iterator = _events.begin(); _optimization_iterator != _events.end(); ++_optimization_iterator) { + if ((*_optimization_iterator)->note() == note) { + return *_optimization_iterator; + } + } + + return 0; +} void MidiRegionView::redisplay_model() { - cerr << "MRV: display mode, active notes = " << _active_notes << endl; // Don't redisplay the model if we're currently recording and displaying that if (_active_notes) { return; } - if (_model) { - clear_events(); - _model->read_lock(); - - MidiModel::Notes notes = _model->notes(); - - for (size_t i = 0; i < _model->n_notes(); ++i) { - add_note(_model->note_at(i)); - } - - display_sysexes(); + if (!_model) { + cerr << "MidiRegionView::redisplay_model called without a model" << endmsg; + return; + } + + for (Events::iterator i = _events.begin(); i != _events.end(); ++i) { + (*i)->invalidate (); + } - display_program_changes(); + _model->read_lock(); - _model->read_unlock(); + MidiModel::Notes& notes (_model->notes()); + _optimization_iterator = _events.begin(); - } else { - cerr << "MidiRegionView::redisplay_model called without a model" << endmsg; + for (MidiModel::Notes::iterator n = notes.begin(); n != notes.end(); ++n) { + + boost::shared_ptr note (*n); + CanvasNoteEvent* cne; + bool visible; + + if (note_in_region_range (note, visible)) { + + if ((cne = find_canvas_note (note)) != 0) { + + cne->validate (); + + CanvasNote* cn; + CanvasHit* ch; + + if ((cn = dynamic_cast(cne)) != 0) { + update_note (cn); + } else if ((ch = dynamic_cast(cne)) != 0) { + update_hit (ch); + } + + if (visible) { + cne->show (); + } else { + cne->hide (); + } + + } else { + + add_note (note, visible); + } + + } else { + + if ((cne = find_canvas_note (note)) != 0) { + cne->validate (); + cne->hide (); + } + } + } + + /* remove note items that are no longer valid */ + + for (Events::iterator i = _events.begin(); i != _events.end(); ) { + if (!(*i)->valid ()) { + delete *i; + i = _events.erase (i); + } else { + ++i; + } } + + display_sysexes(); + display_program_changes(); + + _model->read_unlock(); + + _marked_for_selection.clear (); + _marked_for_velocity.clear (); + + /* we may have caused _events to contain things out of order (e.g. if a note + moved earlier or later). we don't generally need them in time order, but + make a note that a sort is required for those cases that require it. + */ + + _sort_needed = true; } void @@ -604,7 +880,7 @@ MidiRegionView::display_program_changes() MIDI::Name::PatchPrimaryKey patch_key(msb, lsb, program_number); - boost::shared_ptr patch = + boost::shared_ptr patch = MIDI::Name::MidiPatchManager::instance().find_patch( _model_name, _custom_device_mode, channel, patch_key); @@ -620,13 +896,13 @@ MidiRegionView::display_program_changes() } } -void +void MidiRegionView::display_sysexes() { for (MidiModel::SysExes::const_iterator i = _model->sysexes().begin(); i != _model->sysexes().end(); ++i) { - ARDOUR::MidiModel::TimeType time = (*i)->time(); + Evoral::MusicalTime time = (*i)->time(); assert(time >= 0); - + ostringstream str; str << hex; for (uint32_t b = 0; b < (*i)->size(); ++b) { @@ -636,22 +912,23 @@ MidiRegionView::display_sysexes() } } string text = str.str(); - + ArdourCanvas::Group* const group = (ArdourCanvas::Group*)get_canvas_group(); + const double x = trackview.editor().frame_to_pixel(beats_to_frames(time)); - + double height = midi_stream_view()->contents_height(); - + boost::shared_ptr sysex = boost::shared_ptr( new CanvasSysEx(*this, *group, text, height, x, 1.0)); - + // Show unless program change is beyond the region bounds if (time - _region->start() >= _region->length() || time < _region->start()) { sysex->hide(); } else { sysex->show(); } - + _sys_exes.push_back(sysex); } } @@ -677,13 +954,13 @@ void MidiRegionView::region_resized (Change what_changed) { RegionView::region_resized(what_changed); - + if (what_changed & ARDOUR::PositionChanged) { set_duration(_region->length(), 0); if (_enable_display) { redisplay_model(); } - } + } } void @@ -704,11 +981,11 @@ MidiRegionView::set_height (double height) const double old_height = _height; RegionView::set_height(height); _height = height - FUDGE; - + apply_note_range(midi_stream_view()->lowest_note(), midi_stream_view()->highest_note(), height != old_height + FUDGE); - + if (name_pixbuf) { name_pixbuf->raise_to_top(); } @@ -728,46 +1005,42 @@ MidiRegionView::apply_note_range (uint8_t min, uint8_t max, bool force) if (!force && _current_range_min == min && _current_range_max == max) { return; } - + _current_range_min = min; _current_range_max = max; for (Events::const_iterator i = _events.begin(); i != _events.end(); ++i) { CanvasNoteEvent* event = *i; - Item* item = dynamic_cast(event); - assert(item); - if (event && event->note()) { - if (event->note()->note() < _current_range_min - || event->note()->note() > _current_range_max) { - if (canvas_item_visible(item)) { - item->hide(); - } - } else { - if (!canvas_item_visible(item)) { - item->show(); - } + boost::shared_ptr note (event->note()); - if (CanvasNote* note = dynamic_cast(event)) { - const double y1 = midi_stream_view()->note_to_y(event->note()->note()); - const double y2 = y1 + floor(midi_stream_view()->note_height()); - - note->property_y1() = y1; - note->property_y2() = y2; - } else if (CanvasHit* hit = dynamic_cast(event)) { - double x = trackview.editor().frame_to_pixel( - beats_to_frames(event->note()->time()) - _region->start()); - const double diamond_size = midi_stream_view()->note_height() / 2.0; - double y = midi_stream_view()->note_to_y(event->note()->note()) - + ((diamond_size-2.0) / 4.0); - - hit->set_height(diamond_size); - hit->move(x-hit->x1(), y-hit->y1()); - hit->show(); - } - } + if (note->note() < _current_range_min || + note->note() > _current_range_max) { + event->hide(); + } else { + event->show(); + } + + if (CanvasNote* cnote = dynamic_cast(event)) { + + const double y1 = midi_stream_view()->note_to_y(note->note()); + const double y2 = y1 + floor(midi_stream_view()->note_height()); + + cnote->property_y1() = y1; + cnote->property_y2() = y2; + + } else if (CanvasHit* chit = dynamic_cast(event)) { + + double x = trackview.editor().frame_to_pixel( + beats_to_frames(note->time()) - _region->start()); + const double diamond_size = midi_stream_view()->note_height() / 2.0; + double y = midi_stream_view()->note_to_y(event->note()->note()) + + ((diamond_size-2.0) / 4.0); + + chit->set_height (diamond_size); + chit->move (x - chit->x1(), y - chit->y1()); + chit->show (); } } - } GhostRegion* @@ -812,7 +1085,7 @@ MidiRegionView::begin_write() assert(!_active_notes); _active_notes = new CanvasNote*[128]; for (unsigned i=0; i < 128; ++i) { - _active_notes[i] = NULL; + _active_notes[i] = 0; } } @@ -823,7 +1096,7 @@ void MidiRegionView::end_write() { delete[] _active_notes; - _active_notes = NULL; + _active_notes = 0; _marked_for_selection.clear(); _marked_for_velocity.clear(); } @@ -842,7 +1115,7 @@ MidiRegionView::resolve_note(uint8_t note, double end_time) const nframes64_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] = NULL; + _active_notes[note] = 0; } } @@ -863,7 +1136,7 @@ MidiRegionView::extend_active_notes() } } -void +void MidiRegionView::play_midi_note(boost::shared_ptr note) { if (!trackview.editor().sound_notes()) { @@ -872,10 +1145,10 @@ MidiRegionView::play_midi_note(boost::shared_ptr note) RouteUI* route_ui = dynamic_cast (&trackview); assert(route_ui); - + route_ui->midi_track()->write_immediate_event( note->on_event().size(), note->on_event().buffer()); - + const double note_length_beats = (note->off_event().time() - note->on_event().time()); nframes_t note_length_ms = beats_to_frames(note_length_beats) * (1000 / (double)route_ui->session().nominal_frame_rate()); @@ -888,7 +1161,7 @@ MidiRegionView::play_midi_note_off(boost::shared_ptr note) { RouteUI* route_ui = dynamic_cast (&trackview); assert(route_ui); - + route_ui->midi_track()->write_immediate_event( note->off_event().size(), note->off_event().buffer()); @@ -896,16 +1169,75 @@ MidiRegionView::play_midi_note_off(boost::shared_ptr note) } bool -MidiRegionView::note_in_visible_range(const boost::shared_ptr note) const +MidiRegionView::note_in_region_range(const boost::shared_ptr note, bool& visible) const { const nframes64_t note_start_frames = beats_to_frames(note->time()); - bool outside = (note_start_frames - _region->start() >= _region->length()) - || (note_start_frames < _region->start()) - || (note->note() < midi_stream_view()->lowest_note()) - || (note->note() > midi_stream_view()->highest_note()); + + bool outside = (note_start_frames - _region->start() >= _region->length()) || + (note_start_frames < _region->start()); + + visible = (note->note() >= midi_stream_view()->lowest_note()) && + (note->note() <= midi_stream_view()->highest_note()); + return !outside; } +void +MidiRegionView::update_note (CanvasNote* ev) +{ + boost::shared_ptr note = ev->note(); + + const nframes64_t note_start_frames = beats_to_frames(note->time()); + const nframes64_t note_end_frames = beats_to_frames(note->end_time()); + + const double x = trackview.editor().frame_to_pixel(note_start_frames - _region->start()); + 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; + 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) { + if (_active_notes) { + assert(note->note() < 128); + // If this note is already active there's a stuck note, + // finish the old note rectangle + if (_active_notes[note->note()]) { + CanvasNote* const old_rect = _active_notes[note->note()]; + boost::shared_ptr old_note = old_rect->note(); + old_rect->property_x2() = x; + old_rect->property_outline_what() = (guint32) 0xF; + } + _active_notes[note->note()] = ev; + } + /* outline all but right edge */ + ev->property_outline_what() = (guint32) (0x1 & 0x4 & 0x8); + } else { + /* outline all edges */ + ev->property_outline_what() = (guint32) 0xF; + } +} + +void +MidiRegionView::update_hit (CanvasHit* ev) +{ + boost::shared_ptr note = ev->note(); + + const nframes64_t note_start_frames = beats_to_frames(note->time()); + const double x = trackview.editor().frame_to_pixel(note_start_frames - _region->start()); + 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); + + ev->move_to (x, y); +} + /** Add a MIDI note to the view (with length). * * If in sustained mode, notes with length 0 will be considered active @@ -913,58 +1245,25 @@ MidiRegionView::note_in_visible_range(const boost::shared_ptr note) co * event arrives, to properly display the note. */ void -MidiRegionView::add_note(const boost::shared_ptr note) +MidiRegionView::add_note(const boost::shared_ptr note, bool visible) { + CanvasNoteEvent* event = 0; + assert(note->time() >= 0); assert(midi_view()->note_mode() == Sustained || midi_view()->note_mode() == Percussive); - - const nframes64_t note_start_frames = beats_to_frames(note->time()); - const nframes64_t note_end_frames = beats_to_frames(note->end_time()); ArdourCanvas::Group* const group = (ArdourCanvas::Group*)get_canvas_group(); - CanvasNoteEvent* event = 0; - - const double x = trackview.editor().frame_to_pixel(note_start_frames - _region->start()); - if (midi_view()->note_mode() == Sustained) { - 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()); - + CanvasNote* ev_rect = new CanvasNote(*this, *group, note); - ev_rect->property_x1() = x; - ev_rect->property_y1() = y1; - if (note->length() > 0) { - ev_rect->property_x2() = note_endpixel; - } else { - ev_rect->property_x2() = trackview.editor().frame_to_pixel(_region->length()); - } - ev_rect->property_y2() = y1 + floor(midi_stream_view()->note_height()); - - if (note->length() == 0) { - if (_active_notes) { - assert(note->note() < 128); - // If this note is already active there's a stuck note, - // finish the old note rectangle - if (_active_notes[note->note()]) { - CanvasNote* const old_rect = _active_notes[note->note()]; - boost::shared_ptr old_note = old_rect->note(); - old_rect->property_x2() = x; - old_rect->property_outline_what() = (guint32) 0xF; - } - _active_notes[note->note()] = ev_rect; - } - /* outline all but right edge */ - ev_rect->property_outline_what() = (guint32) (0x1 & 0x4 & 0x8); - } else { - /* outline all edges */ - ev_rect->property_outline_what() = (guint32) 0xF; - } + + update_note (ev_rect); event = ev_rect; MidiGhostRegion* gr; + for (std::vector::iterator g = ghosts.begin(); g != ghosts.end(); ++g) { if ((gr = dynamic_cast(*g)) != 0) { gr->add_note(ev_rect); @@ -972,12 +1271,15 @@ MidiRegionView::add_note(const boost::shared_ptr note) } } else if (midi_view()->note_mode() == Percussive) { + 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); CanvasHit* ev_diamond = new CanvasHit(*this, *group, diamond_size, note); - ev_diamond->move(x, y); + + update_hit (ev_diamond); + event = ev_diamond; + } else { event = 0; } @@ -986,45 +1288,69 @@ MidiRegionView::add_note(const boost::shared_ptr note) if (_marked_for_selection.find(note) != _marked_for_selection.end()) { note_selected(event, true); } + 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); - if (note_in_visible_range(note)) { + + if (visible) { event->show(); } else { - event->hide(); + event->hide (); } } } +void +MidiRegionView::add_note (uint8_t channel, uint8_t number, uint8_t velocity, + Evoral::MusicalTime pos, Evoral::MusicalTime len) +{ + boost::shared_ptr new_note (new NoteType (channel, pos, len, number, velocity)); + + start_delta_command (_("step add")); + delta_add_note (new_note, true, false); + apply_delta(); + + /* potentially extend region to hold new note */ + + nframes64_t end_frame = _region->position() + beats_to_frames (new_note->end_time()); + nframes64_t region_end = _region->position() + _region->length() - 1; + + if (end_frame > region_end) { + _region->set_length (end_frame, this); + } else { + redisplay_model (); + } +} + void MidiRegionView::add_pgm_change(PCEvent& program, const string& displaytext) { assert(program.time >= 0); - + ArdourCanvas::Group* const group = (ArdourCanvas::Group*)get_canvas_group(); const double x = trackview.editor().frame_to_pixel(beats_to_frames(program.time)); - + double height = midi_stream_view()->contents_height(); - + boost::shared_ptr pgm_change = boost::shared_ptr( new CanvasProgramChange(*this, *group, - displaytext, - height, - x, 1.0, - _model_name, - _custom_device_mode, + displaytext, + height, + x, 1.0, + _model_name, + _custom_device_mode, program.time, program.channel, program.value)); - + // Show unless program change is beyond the region bounds if (program.time - _region->start() >= _region->length() || program.time < _region->start()) { pgm_change->hide(); } else { pgm_change->show(); } - + _pgm_changes.push_back(pgm_change); } @@ -1047,7 +1373,7 @@ MidiRegionView::get_patch_key_at(double time, uint8_t channel, MIDI::Name::Patch lsb = lsb_control->get_float(true, time); cerr << " got lsb " << lsb; } - + Evoral::Parameter program_change(MidiPgmChangeAutomation, channel, 0); boost::shared_ptr program_control = _model->control(program_change); float program_number = -1.0; @@ -1055,7 +1381,7 @@ MidiRegionView::get_patch_key_at(double time, uint8_t channel, MIDI::Name::Patch program_number = program_control->get_float(true, time); cerr << " got program " << program_number << endl; } - + key.msb = (int) floor(msb + 0.5); key.lsb = (int) floor(lsb + 0.5); key.program_number = (int) floor(program_number + 0.5); @@ -1063,7 +1389,7 @@ MidiRegionView::get_patch_key_at(double time, uint8_t channel, MIDI::Name::Patch } -void +void MidiRegionView::alter_program_change(PCEvent& old_program, const MIDI::Name::PatchPrimaryKey& new_patch) { // TODO: Get the real event here and alter them at the original times @@ -1079,13 +1405,13 @@ MidiRegionView::alter_program_change(PCEvent& old_program, const MIDI::Name::Pat if (lsb_control != 0) { lsb_control->set_float(float(new_patch.lsb), true, old_program.time); } - + Evoral::Parameter program_change(MidiPgmChangeAutomation, old_program.channel, 0); boost::shared_ptr program_control = _model->control(program_change); - + assert(program_control != 0); program_control->set_float(float(new_patch.program_number), true, old_program.time); - + redisplay_model(); } @@ -1096,37 +1422,37 @@ MidiRegionView::program_selected(CanvasProgramChange& program, const MIDI::Name: alter_program_change(program_change_event, new_patch); } -void +void MidiRegionView::previous_program(CanvasProgramChange& program) { MIDI::Name::PatchPrimaryKey key; get_patch_key_at(program.event_time(), program.channel(), key); - - boost::shared_ptr patch = + + boost::shared_ptr patch = MIDI::Name::MidiPatchManager::instance().previous_patch( _model_name, - _custom_device_mode, - program.channel(), + _custom_device_mode, + program.channel(), key); - + PCEvent program_change_event(program.event_time(), program.program(), program.channel()); if (patch) { alter_program_change(program_change_event, patch->patch_primary_key()); } } -void +void MidiRegionView::next_program(CanvasProgramChange& program) { MIDI::Name::PatchPrimaryKey key; get_patch_key_at(program.event_time(), program.channel(), key); - - boost::shared_ptr patch = + + boost::shared_ptr patch = MIDI::Name::MidiPatchManager::instance().next_patch( _model_name, - _custom_device_mode, - program.channel(), - key); + _custom_device_mode, + program.channel(), + key); PCEvent program_change_event(program.event_time(), program.program(), program.channel()); if (patch) { @@ -1141,9 +1467,7 @@ MidiRegionView::delete_selection() return; } - if (!_delta_command) { - _delta_command = _model->new_delta_command("delete selection"); - } + start_delta_command (_("delete selection")); for (Selection::iterator i = _selection.begin(); i != _selection.end(); ++i) { if ((*i)->selected()) { @@ -1152,6 +1476,8 @@ MidiRegionView::delete_selection() } _selection.clear(); + + apply_delta (); } void @@ -1171,89 +1497,136 @@ void MidiRegionView::unique_select(ArdourCanvas::CanvasNoteEvent* ev) { for (Selection::iterator i = _selection.begin(); i != _selection.end(); ) { + if ((*i) != ev) { - Selection::iterator tmp = i; - ++tmp; + Selection::iterator tmp = i; + ++tmp; - if ((*i) != ev) { - remove_from_selection (*i); - } + (*i)->selected (false); + _selection.erase (i); + + i = tmp; - 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. + */ + if (!ev->selected()) { add_to_selection (ev); } } void -MidiRegionView::note_selected(ArdourCanvas::CanvasNoteEvent* ev, bool add) +MidiRegionView::note_selected(ArdourCanvas::CanvasNoteEvent* ev, bool add, bool extend) { if (!add) { clear_selection_except(ev); } - if (!ev->selected()) { - add_to_selection (ev); + if (!extend) { + + if (!ev->selected()) { + add_to_selection (ev); + } + + } else { + /* find end of latest note selected, select all between that and the start of "ev" */ + + Evoral::MusicalTime earliest = DBL_MAX; + Evoral::MusicalTime latest = 0; + + for (Selection::iterator i = _selection.begin(); i != _selection.end(); ++i) { + if ((*i)->note()->end_time() > latest) { + latest = (*i)->note()->end_time(); + } + if ((*i)->note()->time() < earliest) { + earliest = (*i)->note()->time(); + } + } + + if (ev->note()->end_time() > latest) { + latest = ev->note()->end_time(); + } + + if (ev->note()->time() < earliest) { + earliest = ev->note()->time(); + } + + for (Events::iterator i = _events.begin(); i != _events.end(); ++i) { + + /* find notes entirely within OR spanning the earliest..latest range */ + + if (((*i)->note()->time() >= earliest && (*i)->note()->end_time() <= latest) || + ((*i)->note()->time() <= earliest && (*i)->note()->end_time() >= latest)) { + 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 + } } } - void -MidiRegionView::note_deselected(ArdourCanvas::CanvasNoteEvent* ev, bool add) +MidiRegionView::note_deselected(ArdourCanvas::CanvasNoteEvent* ev) { - if (!add) { - clear_selection_except(ev); - } - remove_from_selection (ev); } - void MidiRegionView::update_drag_selection(double x1, double x2, double y1, double y2) { - const double last_y = std::min(y1, y2); - const double y = std::max(y1, y2); + if (x1 > x2) { + swap (x1, x2); + } + + 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. -#ifndef NDEBUG - double last_x1 = 0.0; -#endif + for (Events::iterator i = _events.begin(); i != _events.end(); ++i) { - if (x1 < x2) { - for (Events::iterator i = _events.begin(); i != _events.end(); ++i) { -#ifndef NDEBUG - // Events should always be sorted by increasing x1() here - assert((*i)->x1() >= last_x1); - last_x1 = (*i)->x1(); -#endif - if ((*i)->x1() >= x1 && (*i)->x1() <= x2 && (*i)->y1() >= last_y && (*i)->y1() <= y) { - // Inside rectangle - add_to_selection (*i); - } else if ((*i)->selected()) { - // Not inside rectangle - remove_from_selection (*i); - } - } - } else { - for (Events::iterator i = _events.begin(); i != _events.end(); ++i) { -#ifndef NDEBUG - // Events should always be sorted by increasing x1() here - assert((*i)->x1() >= last_x1); - last_x1 = (*i)->x1(); -#endif - if ((*i)->x2() <= x1 && (*i)->x2() >= x2 && (*i)->y1() >= last_y && (*i)->y1() <= y) { - // Inside rectangle + /* 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. + */ + + const double ix1 = (*i)->x1(); + const double ix2 = (*i)->x2(); + const double iy1 = (*i)->y1(); + const double iy2 = (*i)->y2(); + + if ((ix1 >= x1 && ix1 <= x2 && iy1 >= y1 && iy1 <= y2) || + (ix1 >= x1 && ix1 <= x2 && iy2 >= y1 && iy2 <= y2) || + (ix2 >= x1 && ix2 <= x2 && iy1 >= y1 && iy1 <= y2) || + (ix2 >= x1 && ix2 <= x2 && iy2 >= y1 && iy2 <= y2)) { + + // Inside rectangle + if (!(*i)->selected()) { add_to_selection (*i); - } else if ((*i)->selected()) { - // Not inside rectangle - remove_from_selection (*i); } + } else if ((*i)->selected()) { + // Not inside rectangle + remove_from_selection (*i); } } } @@ -1269,7 +1642,7 @@ MidiRegionView::remove_from_selection (CanvasNoteEvent* ev) ev->selected (false); ev->hide_velocity (); - + if (_selection.empty()) { PublicEditor& editor (trackview.editor()); editor.get_selection().remove (this); @@ -1305,62 +1678,63 @@ MidiRegionView::move_selection(double dx, double dy) } void -MidiRegionView::note_dropped(CanvasNoteEvent* ev, double dt, uint8_t dnote) +MidiRegionView::note_dropped(CanvasNoteEvent *, double dt, int8_t dnote) { - // TODO: This would be faster/nicer with a MoveCommand that doesn't need to copy... - if (_selection.find(ev) == _selection.end()) { - return; - } + assert (!_selection.empty()); - uint8_t lowest_note_in_selection = midi_stream_view()->lowest_note(); - uint8_t highest_note_in_selection = midi_stream_view()->highest_note(); + uint8_t lowest_note_in_selection = 127; + uint8_t highest_note_in_selection = 0; uint8_t highest_note_difference = 0; // find highest and lowest notes first + for (Selection::iterator i = _selection.begin(); i != _selection.end(); ++i) { uint8_t pitch = (*i)->note()->note(); lowest_note_in_selection = std::min(lowest_note_in_selection, pitch); highest_note_in_selection = std::max(highest_note_in_selection, pitch); } - + /* cerr << "dnote: " << (int) dnote << endl; - cerr << "lowest note (streamview): " << int(midi_stream_view()->lowest_note()) + cerr << "lowest note (streamview): " << int(midi_stream_view()->lowest_note()) << " highest note (streamview): " << int(midi_stream_view()->highest_note()) << endl; - cerr << "lowest note (selection): " << int(lowest_note_in_selection) << " highest note(selection): " + cerr << "lowest note (selection): " << int(lowest_note_in_selection) << " highest note(selection): " << int(highest_note_in_selection) << endl; cerr << "selection size: " << _selection.size() << endl; cerr << "Highest note in selection: " << (int) highest_note_in_selection << endl; */ - + // Make sure the note pitch does not exceed the MIDI standard range - if (dnote <= 127 && (highest_note_in_selection + dnote > 127)) { + if (highest_note_in_selection + dnote > 127) { highest_note_difference = highest_note_in_selection - 127; } - - start_delta_command(_("move notes")); - for (Selection::iterator i = _selection.begin(); i != _selection.end() ; ) { - Selection::iterator next = i; - ++next; + start_diff_command(_("move notes")); - const boost::shared_ptr copy(new NoteType(*(*i)->note().get())); + for (Selection::iterator i = _selection.begin(); i != _selection.end() ; ++i) { nframes64_t start_frames = beats_to_frames((*i)->note()->time()); + if (dt >= 0) { start_frames += snap_frame_to_frame(trackview.editor().pixel_to_frame(dt)); } else { start_frames -= snap_frame_to_frame(trackview.editor().pixel_to_frame(-dt)); } - copy->set_time(frames_to_beats(start_frames)); + Evoral::MusicalTime new_time = frames_to_beats(start_frames); + + if (new_time < 0) { + continue; + } + + diff_add_change (*i, MidiModel::DiffCommand::StartTime, new_time); uint8_t original_pitch = (*i)->note()->note(); uint8_t new_pitch = original_pitch + dnote - highest_note_difference; - + // 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)) { @@ -1370,19 +1744,14 @@ MidiRegionView::note_dropped(CanvasNoteEvent* ev, double dt, uint8_t dnote) lowest_note_in_selection = std::min(lowest_note_in_selection, new_pitch); highest_note_in_selection = std::max(highest_note_in_selection, new_pitch); - copy->set_note(new_pitch); - - command_remove_note(*i); - command_add_note(copy, (*i)->selected()); - - i = next; + diff_add_change (*i, MidiModel::DiffCommand::NoteNumber, new_pitch); } - apply_command(); - + apply_diff(); + // care about notes being moved beyond the upper/lower bounds on the canvas if (lowest_note_in_selection < midi_stream_view()->lowest_note() || - highest_note_in_selection > midi_stream_view()->highest_note()) { + highest_note_in_selection > midi_stream_view()->highest_note()) { midi_stream_view()->set_note_range(MidiStreamView::ContentsRange); } } @@ -1420,6 +1789,13 @@ MidiRegionView::get_position_pixels() return trackview.editor().frame_to_pixel(region_frame); } +double +MidiRegionView::get_end_position_pixels() +{ + nframes64_t frame = get_position() + get_duration (); + return trackview.editor().frame_to_pixel(frame); +} + nframes64_t MidiRegionView::beats_to_frames(double beats) const { @@ -1433,7 +1809,7 @@ MidiRegionView::frames_to_beats(nframes64_t frames) const } void -MidiRegionView::begin_resizing(CanvasNote::NoteEnd note_end) +MidiRegionView::begin_resizing (bool /*at_front*/) { _resize_data.clear(); @@ -1467,37 +1843,36 @@ MidiRegionView::begin_resizing(CanvasNote::NoteEnd note_end) ARDOUR_UI::config()->canvasvar_MidiNoteSelected.get()); resize_data->resize_rect = resize_rect; - - if (note_end == CanvasNote::NOTE_ON) { - resize_data->current_x = note->x1(); - } else { // NOTE_OFF - resize_data->current_x = note->x2(); - } - _resize_data.push_back(resize_data); } } } void -MidiRegionView::update_resizing(CanvasNote::NoteEnd note_end, double x, bool relative) +MidiRegionView::update_resizing (bool at_front, double delta_x, bool relative) { for (std::vector::iterator i = _resize_data.begin(); i != _resize_data.end(); ++i) { SimpleRect* resize_rect = (*i)->resize_rect; CanvasNote* canvas_note = (*i)->canvas_note; + double current_x; - const double region_start = get_position_pixels(); - - if (relative) { - (*i)->current_x = (*i)->current_x + x; + if (at_front) { + if (relative) { + current_x = canvas_note->x1() + delta_x; + } else { + // x is in track relative, transform it to region relative + current_x = delta_x - get_position_pixels(); + } } else { - // x is in track relative, transform it to region relative - (*i)->current_x = x - region_start; + if (relative) { + current_x = canvas_note->x2() + delta_x; + } else { + // x is in track relative, transform it to region relative + current_x = delta_x - get_end_position_pixels (); + } } - double current_x = (*i)->current_x; - - if (note_end == CanvasNote::NOTE_ON) { + if (at_front) { resize_rect->property_x1() = snap_to_pixel(current_x); resize_rect->property_x2() = canvas_note->x2(); } else { @@ -1508,40 +1883,54 @@ MidiRegionView::update_resizing(CanvasNote::NoteEnd note_end, double x, bool rel } void -MidiRegionView::commit_resizing(CanvasNote::NoteEnd note_end, double event_x, bool relative) +MidiRegionView::commit_resizing (bool at_front, double delta_x, bool relative) { - start_delta_command(_("resize notes")); + start_diff_command(_("resize notes")); 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; - double current_x = (*i)->current_x; - const double position = get_position_pixels(); + const double region_start = get_position_pixels(); + double current_x; - if (!relative) { - // event_x is in track relative, transform it to region relative - current_x = event_x - position; + if (at_front) { + if (relative) { + current_x = canvas_note->x1() + delta_x; + } else { + // x is in track relative, transform it to region relative + current_x = region_start + delta_x; + } + } else { + if (relative) { + current_x = canvas_note->x2() + delta_x; + } else { + // x is in track relative, transform it to region relative + current_x = region_start + delta_x; + } } - // because snapping works on world coordinates we have to transform current_x - // to world coordinates before snapping and transform it back afterwards - nframes64_t current_frame = snap_pixel_to_frame(current_x); - // transform to region start relative - current_frame += _region->start(); - - const boost::shared_ptr copy(new NoteType(*(canvas_note->note().get()))); - - // resize beginning of note - if (note_end == CanvasNote::NOTE_ON && current_frame < copy->end_time()) { - command_remove_note(canvas_note); - copy->on_event().time() = current_frame; - command_add_note(copy, _selection.find(canvas_note) != _selection.end()); + current_x = snap_pixel_to_frame (current_x); + current_x = frames_to_beats (current_x); + + if (at_front && current_x < canvas_note->note()->end_time()) { + diff_add_change (canvas_note, MidiModel::DiffCommand::StartTime, current_x); + + double len = canvas_note->note()->time() - current_x; + len += canvas_note->note()->length(); + + if (len > 0) { + /* XXX convert to beats */ + diff_add_change (canvas_note, MidiModel::DiffCommand::Length, len); + } } - // resize end of note - if (note_end == CanvasNote::NOTE_OFF && current_frame > copy->time()) { - command_remove_note(canvas_note); - copy->off_event().time() = current_frame; - command_add_note(copy, _selection.find(canvas_note) != _selection.end()); + + if (!at_front) { + double len = current_x - canvas_note->note()->time(); + + if (len > 0) { + /* XXX convert to beats */ + diff_add_change (canvas_note, MidiModel::DiffCommand::Length, len); + } } delete resize_rect; @@ -1549,65 +1938,324 @@ MidiRegionView::commit_resizing(CanvasNote::NoteEnd note_end, double event_x, bo } _resize_data.clear(); - apply_command(); + apply_diff(); } void MidiRegionView::change_note_velocity(CanvasNoteEvent* event, int8_t velocity, bool relative) { - const boost::shared_ptr copy(new NoteType(*(event->note().get()))); + uint8_t new_velocity; if (relative) { - uint8_t new_velocity = copy->velocity() + velocity; + new_velocity = event->note()->velocity() + velocity; clamp_to_0_127(new_velocity); - copy->set_velocity(new_velocity); } else { - copy->set_velocity(velocity); + new_velocity = velocity; + } + + diff_add_change (event, MidiModel::DiffCommand::Velocity, new_velocity); +} + +void +MidiRegionView::change_note_note (CanvasNoteEvent* event, int8_t note, bool relative) +{ + uint8_t new_note; + + if (relative) { + new_note = event->note()->note() + note; + } else { + new_note = note; } - command_remove_note(event); - command_add_note(copy, event->selected(), true); + clamp_to_0_127 (new_note); + diff_add_change (event, MidiModel::DiffCommand::NoteNumber, new_note); } void -MidiRegionView::change_velocity(CanvasNoteEvent* ev, int8_t velocity, bool relative) +MidiRegionView::trim_note (CanvasNoteEvent* event, Evoral::MusicalTime front_delta, Evoral::MusicalTime end_delta) { - start_delta_command(_("change velocity")); - - change_note_velocity(ev, velocity, relative); + bool change_start = false; + bool change_length = false; + Evoral::MusicalTime new_start; + Evoral::MusicalTime new_length; + + /* NOTE: the semantics of the two delta arguments are slightly subtle: + + front_delta: if positive - move the start of the note later in time (shortening it) + if negative - move the start of the note earlier in time (lengthening it) + + end_delta: if positive - move the end of the note later in time (lengthening it) + if negative - move the end of the note earlier in time (shortening it) + */ + + if (front_delta) { + if (front_delta < 0) { + + if (event->note()->time() < -front_delta) { + new_start = 0; + } else { + new_start = event->note()->time() + front_delta; // moves earlier + } + + /* start moved toward zero, so move the end point out to where it used to be. + Note that front_delta is negative, so this increases the length. + */ + + new_length = event->note()->length() - front_delta; + change_start = true; + change_length = true; + + } else { + + Evoral::MusicalTime new_pos = event->note()->time() + front_delta; + + if (new_pos < event->note()->end_time()) { + new_start = event->note()->time() + front_delta; + /* start moved toward the end, so move the end point back to where it used to be */ + new_length = event->note()->length() - front_delta; + change_start = true; + change_length = true; + } + } + + } + + if (end_delta) { + bool can_change = true; + if (end_delta < 0) { + if (event->note()->length() < -end_delta) { + can_change = false; + } + } + + if (can_change) { + new_length = event->note()->length() + end_delta; + change_length = true; + } + } + + if (change_start) { + diff_add_change (event, MidiModel::DiffCommand::StartTime, new_start); + } + + if (change_length) { + diff_add_change (event, MidiModel::DiffCommand::Length, new_length); + } +} + +void +MidiRegionView::change_note_time (CanvasNoteEvent* event, Evoral::MusicalTime delta, bool relative) +{ + Evoral::MusicalTime new_time; + + if (relative) { + if (delta < 0.0) { + if (event->note()->time() < -delta) { + new_time = 0; + } else { + new_time = event->note()->time() + delta; + } + } else { + new_time = event->note()->time() + delta; + } + } else { + new_time = delta; + } + + diff_add_change (event, MidiModel::DiffCommand::StartTime, new_time); +} + +void +MidiRegionView::change_velocities (bool up, bool fine, bool allow_smush) +{ + int8_t delta; + + if (_selection.empty()) { + return; + } + + if (fine) { + delta = 1; + } else { + delta = 10; + } + + if (!up) { + delta = -delta; + } + + if (!allow_smush) { + for (Selection::iterator i = _selection.begin(); i != _selection.end(); ++i) { + if ((*i)->note()->velocity() + delta == 0 || (*i)->note()->velocity() + delta == 127) { + return; + } + } + } + + start_diff_command(_("change velocities")); for (Selection::iterator i = _selection.begin(); i != _selection.end();) { Selection::iterator next = i; ++next; - if ( !(*((*i)->note()) == *(ev->note())) ) { - change_note_velocity(*i, velocity, relative); + change_note_velocity (*i, delta, true); + i = next; + } + + apply_diff(); +} + + +void +MidiRegionView::transpose (bool up, bool fine, bool allow_smush) +{ + if (_selection.empty()) { + return; + } + + int8_t delta; + + if (fine) { + delta = 1; + } else { + delta = 12; + } + + if (!up) { + delta = -delta; + } + + if (!allow_smush) { + for (Selection::iterator i = _selection.begin(); i != _selection.end(); ++i) { + if (!up) { + if ((int8_t) (*i)->note()->note() + delta <= 0) { + return; + } + } else { + if ((int8_t) (*i)->note()->note() + delta > 127) { + return; + } + } } + } + + start_diff_command (_("transpose")); + + for (Selection::iterator i = _selection.begin(); i != _selection.end(); ) { + Selection::iterator next = i; + ++next; + change_note_note (*i, delta, true); i = next; } - - apply_command(); + + apply_diff (); } void -MidiRegionView::change_channel(uint8_t channel) +MidiRegionView::change_note_lengths (bool fine, bool shorter, bool start, bool end) { - start_delta_command(_("change channel")); - for (Selection::iterator i = _selection.begin(); i != _selection.end();) { + Evoral::MusicalTime delta; + + if (fine) { + delta = 1.0/128.0; + } else { + /* grab the current grid distance */ + bool success; + 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"; + return; + } + } + + if (shorter) { + delta = -delta; + } + + start_diff_command (_("change note lengths")); + + for (Selection::iterator i = _selection.begin(); i != _selection.end(); ) { Selection::iterator next = i; ++next; - CanvasNoteEvent* event = *i; - const boost::shared_ptr copy(new NoteType(*(event->note().get()))); + /* note the negation of the delta for start */ + + trim_note (*i, (start ? -delta : 0), (end ? delta : 0)); + i = next; + } + + apply_diff (); + +} + +void +MidiRegionView::nudge_notes (bool forward) +{ + if (_selection.empty()) { + return; + } + + /* pick a note as the point along the timeline to get the nudge distance. + its not necessarily the earliest note, so we may want to pull the notes out + into a vector and sort before using the first one. + */ + + nframes64_t ref_point = _region->position() + beats_to_frames ((*(_selection.begin()))->note()->time()); + nframes64_t unused; + nframes64_t distance; + + if ((distance = trackview.editor().get_nudge_distance (ref_point, unused)) == 0) { + + /* no nudge distance set - use grid */ + + nframes64_t next_pos = ref_point; + + if (forward) { + /* XXX need check on max_frames, but that needs max_frames64 or something */ + next_pos += 1; + } else { + if (next_pos == 0) { + return; + } + next_pos -= 1; + } + + cerr << "ref point was " << ref_point << " next was " << next_pos; + trackview.editor().snap_to (next_pos, (forward ? 1 : -1), false); + distance = ref_point - next_pos; + cerr << " final is " << next_pos << " distance = " << distance << endl; + } + + if (distance == 0) { + return; + } + + Evoral::MusicalTime delta = frames_to_beats (fabs (distance)); + + if (!forward) { + delta = -delta; + } + + start_diff_command (_("nudge")); - copy->set_channel(channel); - - command_remove_note(event); - command_add_note(copy, event->selected()); - + for (Selection::iterator i = _selection.begin(); i != _selection.end(); ) { + Selection::iterator next = i; + ++next; + change_note_time (*i, delta, true); i = next; } - - apply_command(); + + apply_diff (); +} + +void +MidiRegionView::change_channel(uint8_t channel) +{ + start_diff_command(_("change channel")); + for (Selection::iterator i = _selection.begin(); i != _selection.end(); ++i) { + diff_add_change (*i, MidiModel::DiffCommand::Channel, channel); + } + apply_diff(); } @@ -1617,6 +2265,19 @@ MidiRegionView::note_entered(ArdourCanvas::CanvasNoteEvent* ev) if (_mouse_state == SelectTouchDragging) { note_selected(ev, true); } + + PublicEditor& editor (trackview.editor()); + char buf[4]; + snprintf (buf, sizeof (buf), "%d", (int) ev->note()->note()); + //editor.show_verbose_canvas_cursor_with (Evoral::midi_note_name (ev->note()->note())); + editor.show_verbose_canvas_cursor_with (buf); +} + +void +MidiRegionView::note_left (ArdourCanvas::CanvasNoteEvent*) +{ + PublicEditor& editor (trackview.editor()); + editor.hide_verbose_canvas_cursor (); } @@ -1640,7 +2301,7 @@ MidiRegionView::set_frame_color() } } -void +void MidiRegionView::midi_channel_mode_changed(ChannelMode mode, uint16_t mask) { switch (mode) { @@ -1661,7 +2322,7 @@ MidiRegionView::midi_channel_mode_changed(ChannelMode mode, uint16_t mask) _last_channel_selection = mask; } -void +void MidiRegionView::midi_patch_settings_changed(std::string model, std::string custom_device_mode) { _model_name = model; @@ -1686,7 +2347,7 @@ MidiRegionView::cut_copy_clear (Editing::CutCopyOp op) default: break; } - + start_delta_command(); for (Selection::iterator i = _selection.begin(); i != _selection.end(); ++i) { @@ -1694,32 +2355,28 @@ MidiRegionView::cut_copy_clear (Editing::CutCopyOp op) case Copy: break; case Cut: - command_remove_note (*i); + delta_remove_note (*i); break; case Clear: break; } } - apply_command(); + apply_delta(); } MidiCutBuffer* MidiRegionView::selection_as_cut_buffer () const { - Evoral::Sequence::Notes notes; + Notes notes; for (Selection::iterator i = _selection.begin(); i != _selection.end(); ++i) { - notes.push_back (boost::shared_ptr (new NoteType (*((*i)->note().get())))); + notes.insert (boost::shared_ptr (new NoteType (*((*i)->note().get())))); } - /* sort them into time order */ - - sort (notes.begin(), notes.end(), Evoral::Sequence::note_time_comparator); - MidiCutBuffer* cb = new MidiCutBuffer (trackview.session()); cb->set (notes); - + return cb; } @@ -1732,28 +2389,28 @@ MidiRegionView::paste (nframes64_t pos, float times, const MidiCutBuffer& mcb) start_delta_command (_("paste")); - MidiModel::TimeType beat_delta; - MidiModel::TimeType paste_pos_beats; - MidiModel::TimeType duration; - MidiModel::TimeType end_point; + Evoral::MusicalTime beat_delta; + Evoral::MusicalTime paste_pos_beats; + Evoral::MusicalTime duration; + Evoral::MusicalTime end_point; - duration = mcb.notes().back()->end_time() - mcb.notes().front()->time(); + duration = (*mcb.notes().rbegin())->end_time() - (*mcb.notes().begin())->time(); paste_pos_beats = frames_to_beats (pos - _region->position()); - beat_delta = mcb.notes().front()->time() - paste_pos_beats; + beat_delta = (*mcb.notes().begin())->time() - paste_pos_beats; paste_pos_beats = 0; _selection.clear (); for (int n = 0; n < (int) times; ++n) { - for (Evoral::Sequence::Notes::const_iterator i = mcb.notes().begin(); i != mcb.notes().end(); ++i) { - + for (Notes::const_iterator i = mcb.notes().begin(); i != mcb.notes().end(); ++i) { + boost::shared_ptr copied_note (new NoteType (*((*i).get()))); copied_note->set_time (paste_pos_beats + copied_note->time() - beat_delta); /* make all newly added notes selected */ - command_add_note (copied_note, true); + delta_add_note (copied_note, true); end_point = copied_note->end_time(); } @@ -1762,14 +2419,107 @@ MidiRegionView::paste (nframes64_t pos, float times, const MidiCutBuffer& mcb) /* if we pasted past the current end of the region, extend the region */ - nframes64_t end_frame = beats_to_frames (end_point); + nframes64_t end_frame = _region->position() + beats_to_frames (end_point); nframes64_t region_end = _region->position() + _region->length() - 1; if (end_frame > region_end) { + + trackview.session().begin_reversible_command (_("paste")); + XMLNode& before (_region->get_state()); _region->set_length (end_frame, this); trackview.session().add_command (new MementoCommand(*_region, &before, &_region->get_state())); } - - apply_command (); + + apply_delta (); } + +struct EventNoteTimeEarlyFirstComparator { + bool operator() (CanvasNoteEvent* a, CanvasNoteEvent* b) { + return a->note()->time() < b->note()->time(); + } +}; + +void +MidiRegionView::time_sort_events () +{ + if (!_sort_needed) { + return; + } + + EventNoteTimeEarlyFirstComparator cmp; + _events.sort (cmp); + + _sort_needed = false; +} + +void +MidiRegionView::goto_next_note () +{ + // nframes64_t pos = -1; + bool use_next = false; + + if (_events.back()->selected()) { + return; + } + + time_sort_events (); + + 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; + } + } + + /* use the first one */ + + unique_select (_events.front()); + +} + +void +MidiRegionView::goto_previous_note () +{ + // nframes64_t pos = -1; + bool use_next = false; + + if (_events.front()->selected()) { + return; + } + + time_sort_events (); + + 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; + } + } + + /* use the last one */ + + unique_select (*(_events.rbegin())); +} + +void +MidiRegionView::selection_as_notelist (Notes& selected) +{ + time_sort_events (); + + for (Events::iterator i = _events.begin(); i != _events.end(); ++i) { + if ((*i)->selected()) { + selected.insert ((*i)->note()); + } + } +} + +