From 30b087ab3d28f1585987fa3f6ae006562ae192e3 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Mon, 18 Sep 2017 12:39:17 -0400 Subject: globally change all use of "frame" to refer to audio into "sample". Generated by tools/f2s. Some hand-editing will be required in a few places to fix up comments related to timecode and video in order to keep the legible --- libs/ardour/return.cc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'libs/ardour/return.cc') diff --git a/libs/ardour/return.cc b/libs/ardour/return.cc index 29c3c01632..5bc0a695a5 100644 --- a/libs/ardour/return.cc +++ b/libs/ardour/return.cc @@ -113,7 +113,7 @@ Return::set_state (const XMLNode& node, int version) } void -Return::run (BufferSet& bufs, framepos_t start_frame, framepos_t end_frame, double speed, pframes_t nframes, bool) +Return::run (BufferSet& bufs, samplepos_t start_sample, samplepos_t end_sample, double speed, pframes_t nframes, bool) { if ((!_active && !_pending_active) || _input->n_ports() == ChanCount::ZERO) { return; @@ -124,14 +124,14 @@ Return::run (BufferSet& bufs, framepos_t start_frame, framepos_t end_frame, doub // Can't automate gain for sends or returns yet because we need different buffers // so that we don't overwrite the main automation data for the route amp - // _amp->setup_gain_automation (start_frame, end_frame, nframes); - _amp->run (bufs, start_frame, end_frame, speed, nframes, true); + // _amp->setup_gain_automation (start_sample, end_sample, nframes); + _amp->run (bufs, start_sample, end_sample, speed, nframes, true); if (_metering) { if (_amp->gain_control()->get_value() == 0) { _meter->reset(); } else { - _meter->run (bufs, start_frame, end_frame, speed, nframes, true); + _meter->run (bufs, start_sample, end_sample, speed, nframes, true); } } -- cgit v1.2.3