ardour/livetrax
13
0
Fork 0
Code

corrections for methods that move playhead to region boundaries

Browse Source 
1. "not found" is now indicated by a timepos_t::max() value, not a negative one.
2. if the direction to search is negative we should decrement (when possible)
before searching, to avoid finding the current position.
This commit is contained in:
Paul Davis 2022-12-10 18:06:35 -07:00
parent d62cba8ba5
commit 5e9e21911c
1 changed files with 39 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
gtk2_ardour/editor_ops.cc
View File

@ -350,12 +350,18 @@ Editor::move_range_selection_start_or_end_to_region_boundary (bool move_end, boo
int dir = next ? 1 : -1;
/* so we don't find the current region again */
if (dir > 0 || pos.is_positive()) {
if (dir > 0) {
pos = pos.increment ();
} else {
if (!pos.is_zero()) {
pos = pos.decrement ();
} else {
return;
}
}
timepos_t const target = get_region_boundary (pos, dir, true, false);
if (target.is_negative ()) {
if (target == timepos_t::max (target.time_domain())) {
return;
}
@ -976,11 +982,17 @@ Editor::cursor_to_region_boundary (bool with_selection, int32_t dir)
}
// so we don't find the current region again..
if (dir > 0 || pos > 0) {
if (dir > 0) {
pos = pos.increment();
} else {
if (!pos.is_zero()) {
pos = pos.decrement ();
} else {
return;
}
}
if ((target = get_region_boundary (pos, dir, with_selection, false)) < 0) {
if ((target = get_region_boundary (pos, dir, with_selection, false)) == timepos_t::max (target.time_domain())) {
return;
}
@ -1012,8 +1024,15 @@ Editor::cursor_to_region_point (EditorCursor* cursor, RegionPoint point, int32_t
TimeAxisView *ontrack = 0;
// so we don't find the current region again..
if (dir > 0 || pos.is_positive())
if (dir > 0) {
pos = pos.increment();
} else {
if (!pos.is_zero ()) {
pos = pos.decrement ();
} else {
return;
}
}
if (!selection->tracks.empty()) {
@ -1155,11 +1174,17 @@ Editor::selected_marker_to_region_boundary (bool with_selection, int32_t dir)
timepos_t pos = loc->start();
// so we don't find the current region again..
if (dir > 0 || pos.is_positive()) {
if (dir > 0) {
pos = pos.increment();
} else {
if (!pos.is_zero()) {
pos = pos.decrement ();
} else {
return;
}
}
if ((target = get_region_boundary (pos, dir, with_selection, false)) < 0) {
if ((target = get_region_boundary (pos, dir, with_selection, false)) == timepos_t::max (target.time_domain())) {
return;
}
@ -1199,8 +1224,14 @@ Editor::selected_marker_to_region_point (RegionPoint point, int32_t dir)
pos = loc->start();
// so we don't find the current region again..
if (dir > 0 || pos > 0) {
if (dir > 0) {
pos = pos.increment();
} else {
if (!pos.is_zero()) {
pos = pos.decrement ();
} else {
return;
}
}
if (!selection->tracks.empty()) {