diff --git a/gtk2_ardour/audio_clock.cc b/gtk2_ardour/audio_clock.cc index fdd1e795e7..b2b72dfffd 100644 --- a/gtk2_ardour/audio_clock.cc +++ b/gtk2_ardour/audio_clock.cc @@ -866,7 +866,7 @@ AudioClock::set_duration (Temporal::timecnt_t const & dur, bool force) switch (_mode) { case Timecode: - d = dur.is_zero() ? dur : dur.decrement_by_domain (); + d = dur.is_zero() ? dur : dur.decrement (); break; default: d = dur; diff --git a/gtk2_ardour/editor_drag.cc b/gtk2_ardour/editor_drag.cc index 4af0414758..48d3ca6fcd 100644 --- a/gtk2_ardour/editor_drag.cc +++ b/gtk2_ardour/editor_drag.cc @@ -4333,7 +4333,7 @@ MarkerDrag::start_grab (GdkEvent* event, Gdk::Cursor* cursor) s = min (s, e); e = max (s, e); 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)); 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->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 (); } diff --git a/gtk2_ardour/editor_ops.cc b/gtk2_ardour/editor_ops.cc index 82639bc66c..99accd7a90 100644 --- a/gtk2_ardour/editor_ops.cc +++ b/gtk2_ardour/editor_ops.cc @@ -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 */ 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); @@ -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 */ @@ -976,7 +976,7 @@ 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) { - pos = pos.increment_by_domain(); + pos = pos.increment(); } 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.. if (dir > 0 || pos.is_positive()) - pos = pos.increment_by_domain(); + pos = pos.increment(); 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.. 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) { @@ -1199,7 +1199,7 @@ Editor::selected_marker_to_region_point (RegionPoint point, int32_t dir) // so we don't find the current region again.. if (dir > 0 || pos > 0) { - pos = pos.increment_by_domain(); + pos = pos.increment(); } if (!selection->tracks.empty()) { @@ -3428,7 +3428,7 @@ Editor::separate_under_selected_regions () } //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 playlist->add_region ((*rl), (*rl)->position()); @@ -3553,7 +3553,7 @@ Editor::region_fill_track () 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; } @@ -3973,7 +3973,7 @@ Editor::trim_to_region(bool forward) } /* 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)); } else { @@ -9635,7 +9635,7 @@ Editor::effective_ripple_mark_start (boost::shared_ptr target_playlist } if (last_region_end_before_at < pos) { - pos = last_region_end_before_at.increment_by_domain(); + pos = last_region_end_before_at.increment(); } #endif diff --git a/gtk2_ardour/editor_selection.cc b/gtk2_ardour/editor_selection.cc index cdcccf8d74..0f57542e97 100644 --- a/gtk2_ardour/editor_selection.cc +++ b/gtk2_ardour/editor_selection.cc @@ -2186,7 +2186,7 @@ Editor::select_all_selectables_using_edit (bool after, bool from_context_menu) } else { if ((end = get_preferred_edit_position(EDIT_IGNORE_NONE, from_context_menu)) > 1) { start = timepos_t (); - end = end.decrement_by_domain(); + end = end.decrement(); } else { return; } diff --git a/gtk2_ardour/region_editor.cc b/gtk2_ardour/region_editor.cc index 242e537984..41ce36d60b 100644 --- a/gtk2_ardour/region_editor.cc +++ b/gtk2_ardour/region_editor.cc @@ -337,7 +337,7 @@ RegionEditor::length_clock_changed () /* new end is actually 1 domain unit before the clock duration * 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); _session->add_command(new StatefulDiffCommand (_region)); } diff --git a/gtk2_ardour/region_view.cc b/gtk2_ardour/region_view.cc index 7f7e43af83..143d49f019 100644 --- a/gtk2_ardour/region_view.cc +++ b/gtk2_ardour/region_view.cc @@ -1008,7 +1008,7 @@ RegionView::update_coverage_frame (LayerDisplay d) while (t < end) { - t = t.increment_by_domain (); + t = t.increment (); /* is this region is on top at time 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. */ 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; - if (region_right && (last == region_right->position().decrement_by_domain())) { + if (region_right && (last == region_right->position().decrement())) { regions_touching = true; } diff --git a/gtk2_ardour/time_axis_view.cc b/gtk2_ardour/time_axis_view.cc index 99301ccfda..aed370613e 100644 --- a/gtk2_ardour/time_axis_view.cc +++ b/gtk2_ardour/time_axis_view.cc @@ -895,7 +895,7 @@ TimeAxisView::show_selection (TimeSelection& ts) rect = get_selection_rect ((*i).id); 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; if (dynamic_cast(this)) { diff --git a/gtk2_ardour/time_info_box.cc b/gtk2_ardour/time_info_box.cc index 82c47b4a19..9aee51fde4 100644 --- a/gtk2_ardour/time_info_box.cc +++ b/gtk2_ardour/time_info_box.cc @@ -242,7 +242,7 @@ TimeInfoBox::region_selection_changed () selection_end->set_off (false); selection_length->set_off (false); selection_start->set (s); - selection_end->set (e.decrement_by_domain()); + selection_end->set (e.decrement()); selection_length->set_duration (s.distance (e), true); } @@ -273,7 +273,7 @@ TimeInfoBox::selection_changed () selection_end->set_off (false); selection_length->set_off (false); 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())); } else { selection_start->set_off (true); @@ -292,7 +292,7 @@ TimeInfoBox::selection_changed () selection_end->set_off (false); selection_length->set_off (false); selection_start->set (s); - selection_end->set (e.decrement_by_domain()); + selection_end->set (e.decrement()); selection_length->set_duration (s.distance (e), false); } } else { @@ -324,7 +324,7 @@ TimeInfoBox::selection_changed () selection_end->set_off (false); selection_length->set_off (false); selection_start->set (s); - selection_end->set (e.decrement_by_domain()); + selection_end->set (e.decrement()); selection_length->set_duration(s.distance (e)); } else { selection_start->set_off (true); @@ -336,7 +336,7 @@ TimeInfoBox::selection_changed () selection_end->set_off (false); selection_length->set_off (false); 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()); } break;