smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-12 17:46:34 +01:00
Code Issues Projects Releases Wiki Activity

fix note resizing mid- and end-drag behavior for clip editors

Browse source 
Clip editors show the entire source contents, which alters the conversion
process needed for dealing with pixel/length/duration values versus the
situation when only showing a region (as on the timeline)
This commit is contained in:
Paul Davis 2025-01-09 16:33:37 -07:00
parent cb26e309af
commit c47a3e79e8
1 changed files with 46 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

70
gtk2_ardour/midi_view.cc
View file

@ -3060,9 +3060,9 @@ MidiView::update_resizing (NoteBase* primary, bool at_front, double delta_x, boo
bool cursor_set = false; bool cursor_set = false;
bool const ensure_snap = _editing_context.snap_mode () != SnapMagnetic; bool const ensure_snap = _editing_context.snap_mode () != SnapMagnetic;
for (std::vector<NoteResizeData *>::iterator i = _resize_data.begin(); i != _resize_data.end(); ++i) { for (auto & rd : _resize_data) {
ArdourCanvas::Rectangle* resize_rect = (*i)->resize_rect; ArdourCanvas::Rectangle* resize_rect = rd->resize_rect;
Note* canvas_note = (*i)->note; Note* canvas_note = rd->note;
double current_x; double current_x;
if (at_front) { if (at_front) {
@ -3085,8 +3085,11 @@ MidiView::update_resizing (NoteBase* primary, bool at_front, double delta_x, boo
*/ */
current_x = 0; current_x = 0;
} }
if (current_x > _editing_context.duration_to_pixels (_midi_region->length())) {
current_x = _editing_context.duration_to_pixels (_midi_region->length()); if (!_show_source) {
if (current_x > _editing_context.duration_to_pixels (_midi_region->length())) {
current_x = _editing_context.duration_to_pixels (_midi_region->length());
}
} }
if (at_front) { if (at_front) {
@ -3131,8 +3134,15 @@ MidiView::update_resizing (NoteBase* primary, bool at_front, double delta_x, boo
Temporal::TempoMap::SharedPtr tmap (Temporal::TempoMap::use()); Temporal::TempoMap::SharedPtr tmap (Temporal::TempoMap::use());
const timepos_t abs_beats (tmap->quarters_at (snapped_x)); const timepos_t abs_beats (tmap->quarters_at (snapped_x));
const Temporal::Beats src_beats = _midi_region->absolute_time_to_source_beats (abs_beats); Temporal::Beats src_beats;
Temporal::Beats len = Temporal::Beats();
if (_show_source) {
src_beats = abs_beats.beats();
} else {
src_beats = _midi_region->absolute_time_to_source_beats (abs_beats);
}
Temporal::Beats len;
if (at_front) { if (at_front) {
if (src_beats < canvas_note->note()->end_time()) { if (src_beats < canvas_note->note()->end_time()) {
@ -3158,10 +3168,8 @@ MidiView::update_resizing (NoteBase* primary, bool at_front, double delta_x, boo
show_verbose_cursor (buf, 0, 0); show_verbose_cursor (buf, 0, 0);
cursor_set = true; cursor_set = true;
_editing_context.set_snapped_cursor_position (snapped_x + midi_region()->position()); _editing_context.set_snapped_cursor_position (snapped_x + midi_region()->position());
} }
} }
} }
@ -3185,9 +3193,10 @@ MidiView::finish_resizing (NoteBase* primary, bool at_front, double delta_x, boo
/* XX why doesn't snap_pixel_to_sample() handle this properly? */ /* XX why doesn't snap_pixel_to_sample() handle this properly? */
bool const ensure_snap = _editing_context.snap_mode () != SnapMagnetic; bool const ensure_snap = _editing_context.snap_mode () != SnapMagnetic;
for (std::vector<NoteResizeData *>::iterator i = _resize_data.begin(); i != _resize_data.end(); ++i) { for (auto & rd : _resize_data) {
Note* canvas_note = (*i)->note;
ArdourCanvas::Rectangle* resize_rect = (*i)->resize_rect; Note* canvas_note = rd->note;
ArdourCanvas::Rectangle* resize_rect = rd->resize_rect;
/* Get the new x position for this resize, which is in pixels relative /* Get the new x position for this resize, which is in pixels relative
* to the region position. * to the region position.
@ -3213,8 +3222,10 @@ MidiView::finish_resizing (NoteBase* primary, bool at_front, double delta_x, boo
current_x = 0; current_x = 0;
} }
if (current_x > _editing_context.duration_to_pixels (_midi_region->length())) { if (!_show_source) {
current_x = _editing_context.duration_to_pixels (_midi_region->length()); if (current_x > _editing_context.duration_to_pixels (_midi_region->length())) {
current_x = _editing_context.duration_to_pixels (_midi_region->length());
}
} }
/* Convert snap delta from pixels to beats with sign. */ /* Convert snap delta from pixels to beats with sign. */
@ -3229,22 +3240,31 @@ MidiView::finish_resizing (NoteBase* primary, bool at_front, double delta_x, boo
sign = -1; sign = -1;
} }
/* Convert the new x position to a position within the source */
timecnt_t current_time;
if (with_snap) {
current_time = snap_pixel_to_time (current_x, ensure_snap);
} else {
current_time = timecnt_t (_editing_context.pixel_to_sample (current_x));
}
/* and then to beats */ /* and then to beats */
const Temporal::Beats src_beats = _midi_region->absolute_time_to_source_beats (_midi_region->position() + current_time);
Temporal::Beats src_beats;
if (_show_source) {
src_beats = timepos_t (_editing_context.pixel_to_sample (current_x)).beats();
} else {
/* Convert the new x position to a position within the source */
timecnt_t current_time;
if (with_snap) {
current_time = snap_pixel_to_time (current_x, ensure_snap);
} else {
current_time = timecnt_t (_editing_context.pixel_to_sample (current_x));
}
src_beats = _midi_region->absolute_time_to_source_beats (_midi_region->position() + current_time);
}
if (at_front && src_beats < canvas_note->note()->end_time()) { if (at_front && src_beats < canvas_note->note()->end_time()) {
note_diff_add_change (canvas_note, MidiModel::NoteDiffCommand::StartTime, src_beats - (snap_delta_beats * sign)); note_diff_add_change (canvas_note, MidiModel::NoteDiffCommand::StartTime, src_beats - (snap_delta_beats * sign));
Temporal::Beats len = canvas_note->note()->time() - src_beats + (snap_delta_beats * sign); Temporal::Beats len = canvas_note->note()->time() - src_beats + (snap_delta_beats * sign);
len += canvas_note->note()->length(); len += canvas_note->note()->length();
if (!!len) { if (!!len) {
note_diff_add_change (canvas_note, MidiModel::NoteDiffCommand::Length, len); note_diff_add_change (canvas_note, MidiModel::NoteDiffCommand::Length, len);
} }
@ -3257,7 +3277,7 @@ MidiView::finish_resizing (NoteBase* primary, bool at_front, double delta_x, boo
} }
delete resize_rect; delete resize_rect;
delete (*i); delete rd;
} }
_resize_data.clear(); _resize_data.clear();