diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2009-06-10 18:10:07 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2009-06-10 18:10:07 +0000 |
| commit | 6e9b9294e1e7a22f31eabbafa39cee5844b3449a (patch) | |
| tree | 67285ddc9b3cb0fa656ed711cc7d78cff35075d9 /libs/ardour/return.cc | |
| parent | ff26317d4f7904c071d7ecfb96fd84e71728f6d0 (diff) | |
nick m's fix for markers etc ; several tweaks for mute/solo ; rename run_in_place() as run()
git-svn-id: svn://localhost/ardour2/branches/3.0@5155 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/return.cc')
| -rw-r--r-- | libs/ardour/return.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libs/ardour/return.cc b/libs/ardour/return.cc index 4942f9023b..574b6736a0 100644 --- a/libs/ardour/return.cc +++ b/libs/ardour/return.cc @@ -119,7 +119,7 @@ Return::set_state(const XMLNode& node) } void -Return::run_in_place (BufferSet& bufs, sframes_t start_frame, sframes_t end_frame, nframes_t nframes) +Return::run (BufferSet& bufs, sframes_t start_frame, sframes_t end_frame, nframes_t nframes) { if (!active() || _input->n_ports() == ChanCount::ZERO) { return; @@ -131,13 +131,13 @@ Return::run_in_place (BufferSet& bufs, sframes_t start_frame, sframes_t end_fram // 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_in_place (bufs, start_frame, end_frame, nframes); + _amp->run (bufs, start_frame, end_frame, nframes); if (_metering) { if (_amp->gain_control()->get_value() == 0) { _meter->reset(); } else { - _meter->run_in_place (bufs, start_frame, end_frame, nframes); + _meter->run (bufs, start_frame, end_frame, nframes); } } } |