ardour/livetrax
13
0
Fork 0
Code

Rename private method

Browse Source 
The same name (automation_run) is used in different context (mute) for
only processing automation.
This commit is contained in:
Robin Gareus 2017-07-16 15:13:04 +02:00
parent 6c5262012b
commit 906cf85982
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libs/ardour/ardour/plugin_insert.h
View File

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

4
libs/ardour/plugin_insert.cc
View File

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