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

increment/decrement name changes ... out with old in with the new (gui)

Browse source
This commit is contained in:
Paul Davis 2022-10-07 17:30:45 -06:00
parent 88396347e6
commit 254297355e
8 changed files with 24 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

2
gtk2_ardour/audio_clock.cc
View file

@ -866,7 +866,7 @@ AudioClock::set_duration (Temporal::timecnt_t const & dur, bool force)
switch (_mode) { switch (_mode) {
case Timecode: case Timecode:
d = dur.is_zero() ? dur : dur.decrement_by_domain (); d = dur.is_zero() ? dur : dur.decrement ();
break; break;
default: default:
d = dur; d = dur;

4
gtk2_ardour/editor_drag.cc
View file

@ -4333,7 +4333,7 @@ MarkerDrag::start_grab (GdkEvent* event, Gdk::Cursor* cursor)
s = min (s, e); s = min (s, e);
e = max (s, e); e = max (s, e);
if (e < timepos_t::max (e.time_domain())) { if (e < timepos_t::max (e.time_domain())) {
e.increment_by_domain(); e.increment();
} }
_editor->session()->locations()->find_all_between (s, e, ll, Location::Flags (0)); _editor->session()->locations()->find_all_between (s, e, ll, Location::Flags (0));
for (Locations::LocationList::iterator i = ll.begin(); i != ll.end(); ++i) { for (Locations::LocationList::iterator i = ll.begin(); i != ll.end(); ++i) {
@ -6632,7 +6632,7 @@ EditorRubberbandSelectDrag::select_things (int button_state, timepos_t const & x
_editor->begin_reversible_selection_op (X_("rubberband selection")); _editor->begin_reversible_selection_op (X_("rubberband selection"));
_editor->select_all_within (x1, x2.decrement_by_domain(), y1, y2, _editor->track_views, op, false); _editor->select_all_within (x1, x2.decrement(), y1, y2, _editor->track_views, op, false);
_editor->commit_reversible_selection_op (); _editor->commit_reversible_selection_op ();
} }

20
gtk2_ardour/editor_ops.cc
View file

@ -350,7 +350,7 @@ Editor::move_range_selection_start_or_end_to_region_boundary (bool move_end, boo
/* so we don't find the current region again */ /* so we don't find the current region again */
if (dir > 0 || pos.is_positive()) { if (dir > 0 || pos.is_positive()) {
pos = pos.increment_by_domain (); pos = pos.increment ();
} }
timepos_t const target = get_region_boundary (pos, dir, true, false); timepos_t const target = get_region_boundary (pos, dir, true, false);
@ -835,7 +835,7 @@ Editor::build_region_boundary_cache ()
} }
} }
pos = lpos.increment_by_domain(); pos = lpos.increment();
} }
/* finally sort to be sure that the order is correct */ /* finally sort to be sure that the order is correct */
@ -976,7 +976,7 @@ Editor::cursor_to_region_boundary (bool with_selection, int32_t dir)
// so we don't find the current region again.. // so we don't find the current region again..
if (dir > 0 || pos > 0) { if (dir > 0 || pos > 0) {
pos = pos.increment_by_domain(); pos = pos.increment();
} }
if ((target = get_region_boundary (pos, dir, with_selection, false)) < 0) { if ((target = get_region_boundary (pos, dir, with_selection, false)) < 0) {
@ -1012,7 +1012,7 @@ Editor::cursor_to_region_point (EditorCursor* cursor, RegionPoint point, int32_t
// so we don't find the current region again.. // so we don't find the current region again..
if (dir > 0 || pos.is_positive()) if (dir > 0 || pos.is_positive())
pos = pos.increment_by_domain(); pos = pos.increment();
if (!selection->tracks.empty()) { if (!selection->tracks.empty()) {
@ -1155,7 +1155,7 @@ Editor::selected_marker_to_region_boundary (bool with_selection, int32_t dir)
// so we don't find the current region again.. // so we don't find the current region again..
if (dir > 0 || pos.is_positive()) { if (dir > 0 || pos.is_positive()) {
pos = pos.increment_by_domain(); pos = pos.increment();
} }
if ((target = get_region_boundary (pos, dir, with_selection, false)) < 0) { if ((target = get_region_boundary (pos, dir, with_selection, false)) < 0) {
@ -1199,7 +1199,7 @@ Editor::selected_marker_to_region_point (RegionPoint point, int32_t dir)
// so we don't find the current region again.. // so we don't find the current region again..
if (dir > 0 || pos > 0) { if (dir > 0 || pos > 0) {
pos = pos.increment_by_domain(); pos = pos.increment();
} }
if (!selection->tracks.empty()) { if (!selection->tracks.empty()) {
@ -3428,7 +3428,7 @@ Editor::separate_under_selected_regions ()
} }
//Partition on the region bounds //Partition on the region bounds
playlist->partition ((*rl)->position().decrement_by_domain(), (*rl)->end(), true); playlist->partition ((*rl)->position().decrement(), (*rl)->end(), true);
//Re-add region that was just removed due to the partition operation //Re-add region that was just removed due to the partition operation
playlist->add_region ((*rl), (*rl)->position()); playlist->add_region ((*rl), (*rl)->position());
@ -3553,7 +3553,7 @@ Editor::region_fill_track ()
timepos_t const end (_session->current_end_sample ()); timepos_t const end (_session->current_end_sample ());
if (regions.empty () || regions.end_time().increment_by_domain() >= end) { if (regions.empty () || regions.end_time().increment() >= end) {
return; return;
} }
@ -3973,7 +3973,7 @@ Editor::trim_to_region(bool forward)
} }
/* new end is 1 domain unit before the next region */ /* new end is 1 domain unit before the next region */
region->trim_end (next_region->position().decrement_by_domain()); region->trim_end (next_region->position().decrement());
arv->region_changed (PropertyChange (ARDOUR::Properties::length)); arv->region_changed (PropertyChange (ARDOUR::Properties::length));
} }
else { else {
@ -9635,7 +9635,7 @@ Editor::effective_ripple_mark_start (boost::shared_ptr<Playlist> target_playlist
} }
if (last_region_end_before_at < pos) { if (last_region_end_before_at < pos) {
pos = last_region_end_before_at.increment_by_domain(); pos = last_region_end_before_at.increment();
} }
#endif #endif

2
gtk2_ardour/editor_selection.cc
View file

@ -2186,7 +2186,7 @@ Editor::select_all_selectables_using_edit (bool after, bool from_context_menu)
} else { } else {
if ((end = get_preferred_edit_position(EDIT_IGNORE_NONE, from_context_menu)) > 1) { if ((end = get_preferred_edit_position(EDIT_IGNORE_NONE, from_context_menu)) > 1) {
start = timepos_t (); start = timepos_t ();
end = end.decrement_by_domain(); end = end.decrement();
} else { } else {
return; return;
} }

2
gtk2_ardour/region_editor.cc
View file

@ -337,7 +337,7 @@ RegionEditor::length_clock_changed ()
/* new end is actually 1 domain unit before the clock duration /* new end is actually 1 domain unit before the clock duration
* would otherwise indicate * would otherwise indicate
*/ */
const timepos_t new_end = (_region->position() + len).decrement_by_domain (); const timepos_t new_end = (_region->position() + len).decrement ();
_region->trim_end (new_end); _region->trim_end (new_end);
_session->add_command(new StatefulDiffCommand (_region)); _session->add_command(new StatefulDiffCommand (_region));
} }

6
gtk2_ardour/region_view.cc
View file

@ -1008,7 +1008,7 @@ RegionView::update_coverage_frame (LayerDisplay d)
while (t < end) { while (t < end) {
t = t.increment_by_domain (); t = t.increment ();
/* is this region is on top at time t? */ /* is this region is on top at time t? */
bool const new_me = pl->region_is_audible_at (_region, t); bool const new_me = pl->region_is_audible_at (_region, t);
@ -1086,7 +1086,7 @@ RegionView::trim_front (timepos_t const & new_bound, bool no_overlap)
/* Only trim region on the left if the first sample has gone beyond the left region's last sample. */ /* Only trim region on the left if the first sample has gone beyond the left region's last sample. */
if (region_left && (region_left->nt_last() > _region->position() || regions_touching)) { if (region_left && (region_left->nt_last() > _region->position() || regions_touching)) {
region_left->trim_end (_region->position().decrement_by_domain()); region_left->trim_end (_region->position().decrement());
} }
} }
@ -1113,7 +1113,7 @@ RegionView::trim_end (timepos_t const & new_bound, bool no_overlap)
bool regions_touching = false; bool regions_touching = false;
if (region_right && (last == region_right->position().decrement_by_domain())) { if (region_right && (last == region_right->position().decrement())) {
regions_touching = true; regions_touching = true;
} }

2
gtk2_ardour/time_axis_view.cc
View file

@ -895,7 +895,7 @@ TimeAxisView::show_selection (TimeSelection& ts)
rect = get_selection_rect ((*i).id); rect = get_selection_rect ((*i).id);
x1 = _editor.time_to_pixel (start); x1 = _editor.time_to_pixel (start);
x2 = _editor.time_to_pixel (end.decrement_by_domain()); x2 = _editor.time_to_pixel (end.decrement());
y2 = current_height() - 1; y2 = current_height() - 1;
if (dynamic_cast<AudioTimeAxisView*>(this)) { if (dynamic_cast<AudioTimeAxisView*>(this)) {

10
gtk2_ardour/time_info_box.cc
View file

@ -242,7 +242,7 @@ TimeInfoBox::region_selection_changed ()
selection_end->set_off (false); selection_end->set_off (false);
selection_length->set_off (false); selection_length->set_off (false);
selection_start->set (s); selection_start->set (s);
selection_end->set (e.decrement_by_domain()); selection_end->set (e.decrement());
selection_length->set_duration (s.distance (e), true); selection_length->set_duration (s.distance (e), true);
} }
@ -273,7 +273,7 @@ TimeInfoBox::selection_changed ()
selection_end->set_off (false); selection_end->set_off (false);
selection_length->set_off (false); selection_length->set_off (false);
selection_start->set (selection.time.start_time()); selection_start->set (selection.time.start_time());
selection_end->set (selection.time.end_time().decrement_by_domain()); selection_end->set (selection.time.end_time().decrement());
selection_length->set_duration (selection.time.start_time().distance (selection.time.end_time())); selection_length->set_duration (selection.time.start_time().distance (selection.time.end_time()));
} else { } else {
selection_start->set_off (true); selection_start->set_off (true);
@ -292,7 +292,7 @@ TimeInfoBox::selection_changed ()
selection_end->set_off (false); selection_end->set_off (false);
selection_length->set_off (false); selection_length->set_off (false);
selection_start->set (s); selection_start->set (s);
selection_end->set (e.decrement_by_domain()); selection_end->set (e.decrement());
selection_length->set_duration (s.distance (e), false); selection_length->set_duration (s.distance (e), false);
} }
} else { } else {
@ -324,7 +324,7 @@ TimeInfoBox::selection_changed ()
selection_end->set_off (false); selection_end->set_off (false);
selection_length->set_off (false); selection_length->set_off (false);
selection_start->set (s); selection_start->set (s);
selection_end->set (e.decrement_by_domain()); selection_end->set (e.decrement());
selection_length->set_duration(s.distance (e)); selection_length->set_duration(s.distance (e));
} else { } else {
selection_start->set_off (true); selection_start->set_off (true);
@ -336,7 +336,7 @@ TimeInfoBox::selection_changed ()
selection_end->set_off (false); selection_end->set_off (false);
selection_length->set_off (false); selection_length->set_off (false);
selection_start->set (selection.time.start_time()); selection_start->set (selection.time.start_time());
selection_end->set (selection.time.end_time().decrement_by_domain()); selection_end->set (selection.time.end_time().decrement());
selection_length->set_duration (selection.time.length()); selection_length->set_duration (selection.time.length());
} }
break; break;