Rename private method

The same name (automation_run) is used in different context (mute) for
only processing automation.

diff --git a/libs/ardour/ardour/plugin_insert.h b/libs/ardour/ardour/plugin_insert.h
index b801207eaa9ee1e4b0fdd4208702d3bb758522f4..f212528082d488c6b477aa119f9ad8ff45f7df26 100644 (file)
--- 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 6dbfcc6a2b36b9706e969a4524ea6fdbefc8d86f..a29381e6747374ad2f29b6c7e9241912b204edb2 100644 (file)
--- 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;