minor fixups post-rebase

This commit is contained in:
Paul Davis 2021-03-27 10:17:52 -06:00
parent bccdc95f32
commit bcca1ad289
2 changed files with 1 additions and 2 deletions

View File

@ -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) {

View File

@ -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)