From bcca1ad28906e219c934bc54c9a1c0d07907f377 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Sat, 27 Mar 2021 10:17:52 -0600 Subject: [PATCH] minor fixups post-rebase --- gtk2_ardour/region_peak_cursor.cc | 2 +- libs/ardour/session.cc | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/gtk2_ardour/region_peak_cursor.cc b/gtk2_ardour/region_peak_cursor.cc index 49e65d5762..487242d98f 100644 --- a/gtk2_ardour/region_peak_cursor.cc +++ b/gtk2_ardour/region_peak_cursor.cc @@ -94,7 +94,7 @@ RegionPeakCursor::set (AudioRegionView* arv, samplepos_t when, samplecnt_t sampl } /* read_peaks() offset is relative to the region's source */ - s += ar->start (); + s += ar->start_sample (); PeakData p; for (uint32_t chn = 0; chn < ar->n_channels (); ++chn) { diff --git a/libs/ardour/session.cc b/libs/ardour/session.cc index 46f9c6ccfe..e37148c79b 100644 --- a/libs/ardour/session.cc +++ b/libs/ardour/session.cc @@ -272,7 +272,6 @@ Session::Session (AudioEngine &eng, , ltc_timecode_negative_offset (false) , midi_control_ui (0) , _punch_or_loop (NoConstraint) - , current_usecs_per_track (1000) , _all_route_group (new RouteGroup (*this, "all")) , routes (new RouteList) , _adding_routes_in_progress (false)