diff options
| author | Robin Gareus <robin@gareus.org> | 2017-07-16 15:13:04 +0200 |
|---|---|---|
| committer | Robin Gareus <robin@gareus.org> | 2017-07-16 16:49:30 +0200 |
| commit | 906cf85982c209caebed3053c3a33d77ca6ddee0 (patch) | |
| tree | 1441bc4b1db54596786c2cf8bb029809f35d1874 /libs | |
| parent | 6c5262012b9b31bf0b012fca8d09d1ae7e99ae0d (diff) | |
Rename private method
The same name (automation_run) is used in different context (mute) for
only processing automation.
Diffstat (limited to 'libs')
| -rw-r--r-- | libs/ardour/ardour/plugin_insert.h | 2 | ||||
| -rw-r--r-- | libs/ardour/plugin_insert.cc | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/libs/ardour/ardour/plugin_insert.h b/libs/ardour/ardour/plugin_insert.h index b801207eaa..f212528082 100644 --- a/libs/ardour/ardour/plugin_insert.h +++ b/libs/ardour/ardour/plugin_insert.h @@ -355,7 +355,7 @@ class LIBARDOUR_API PluginInsert : public Processor PinMappings _out_map; ChanMapping _thru_map; // out-idx <= in-idx - void automation_run (BufferSet& bufs, framepos_t start, framepos_t end, double speed, pframes_t nframes); + void automate_and_run (BufferSet& bufs, framepos_t start, framepos_t end, double speed, pframes_t nframes); void connect_and_run (BufferSet& bufs, framepos_t start, framecnt_t end, double speed, pframes_t nframes, framecnt_t offset, bool with_auto); void bypass (BufferSet& bufs, pframes_t nframes); void inplace_silence_unconnected (BufferSet&, const PinMappings&, framecnt_t nframes, framecnt_t offset) const; diff --git a/libs/ardour/plugin_insert.cc b/libs/ardour/plugin_insert.cc index 6dbfcc6a2b..a29381e674 100644 --- a/libs/ardour/plugin_insert.cc +++ b/libs/ardour/plugin_insert.cc @@ -1162,7 +1162,7 @@ PluginInsert::run (BufferSet& bufs, framepos_t start_frame, framepos_t end_frame /* run as normal if we are active or moving from inactive to active */ if (_session.transport_rolling() || _session.bounce_processing()) { - automation_run (bufs, start_frame, end_frame, speed, nframes); + automate_and_run (bufs, start_frame, end_frame, speed, nframes); } else { Glib::Threads::Mutex::Lock lm (control_lock(), Glib::Threads::TRY_LOCK); connect_and_run (bufs, start_frame, end_frame, speed, nframes, 0, lm.locked()); @@ -1181,7 +1181,7 @@ PluginInsert::run (BufferSet& bufs, framepos_t start_frame, framepos_t end_frame } void -PluginInsert::automation_run (BufferSet& bufs, framepos_t start, framepos_t end, double speed, pframes_t nframes) +PluginInsert::automate_and_run (BufferSet& bufs, framepos_t start, framepos_t end, double speed, pframes_t nframes) { Evoral::ControlEvent next_event (0, 0.0f); framecnt_t offset = 0; |