From cbef72b8a1301bc69e9a52d3119e35ffd90de30a Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Sun, 4 Nov 2018 02:15:28 +0100 Subject: [PATCH] Optimize Plugin connect & run API, use const maps --- libs/ardour/ardour/audio_unit.h | 2 +- libs/ardour/ardour/ladspa_plugin.h | 2 +- libs/ardour/ardour/luaproc.h | 2 +- libs/ardour/ardour/lv2_plugin.h | 2 +- libs/ardour/ardour/plugin.h | 2 +- libs/ardour/ardour/vst_plugin.h | 2 +- libs/ardour/audio_unit.cc | 2 +- libs/ardour/ladspa_plugin.cc | 2 +- libs/ardour/luaproc.cc | 2 +- libs/ardour/lv2_plugin.cc | 2 +- libs/ardour/plugin.cc | 2 +- libs/ardour/vst_plugin.cc | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/libs/ardour/ardour/audio_unit.h b/libs/ardour/ardour/audio_unit.h index 407be7a6dc..3a01349dd3 100644 --- a/libs/ardour/ardour/audio_unit.h +++ b/libs/ardour/ardour/audio_unit.h @@ -85,7 +85,7 @@ class LIBARDOUR_API AUPlugin : public ARDOUR::Plugin int connect_and_run (BufferSet& bufs, samplepos_t start, samplepos_t end, double speed, - ChanMapping in, ChanMapping out, + ChanMapping const& in, ChanMapping const& out, pframes_t nframes, samplecnt_t offset); std::set automatable() const; std::string describe_parameter (Evoral::Parameter); diff --git a/libs/ardour/ardour/ladspa_plugin.h b/libs/ardour/ardour/ladspa_plugin.h index 97744abc34..ab2780e879 100644 --- a/libs/ardour/ardour/ladspa_plugin.h +++ b/libs/ardour/ardour/ladspa_plugin.h @@ -84,7 +84,7 @@ class LIBARDOUR_API LadspaPlugin : public ARDOUR::Plugin int connect_and_run (BufferSet& bufs, samplepos_t start, samplepos_t end, double speed, - ChanMapping in, ChanMapping out, + ChanMapping const& in, ChanMapping const& out, pframes_t nframes, samplecnt_t offset); std::string describe_parameter (Evoral::Parameter); diff --git a/libs/ardour/ardour/luaproc.h b/libs/ardour/ardour/luaproc.h index 45b730ff73..a077254179 100644 --- a/libs/ardour/ardour/luaproc.h +++ b/libs/ardour/ardour/luaproc.h @@ -89,7 +89,7 @@ public: int connect_and_run (BufferSet& bufs, samplepos_t start, samplepos_t end, double speed, - ChanMapping in, ChanMapping out, + ChanMapping const& in, ChanMapping const& out, pframes_t nframes, samplecnt_t offset); std::string describe_parameter (Evoral::Parameter); diff --git a/libs/ardour/ardour/lv2_plugin.h b/libs/ardour/ardour/lv2_plugin.h index 01dbaf4adc..f12953633b 100644 --- a/libs/ardour/ardour/lv2_plugin.h +++ b/libs/ardour/ardour/lv2_plugin.h @@ -113,7 +113,7 @@ class LIBARDOUR_API LV2Plugin : public ARDOUR::Plugin, public ARDOUR::Workee int connect_and_run (BufferSet& bufs, samplepos_t start, samplepos_t end, double speed, - ChanMapping in, ChanMapping out, + ChanMapping const& in, ChanMapping const& out, pframes_t nframes, samplecnt_t offset); std::string describe_parameter (Evoral::Parameter); diff --git a/libs/ardour/ardour/plugin.h b/libs/ardour/ardour/plugin.h index 892ae8c6c6..7ae524b0eb 100644 --- a/libs/ardour/ardour/plugin.h +++ b/libs/ardour/ardour/plugin.h @@ -115,7 +115,7 @@ class LIBARDOUR_API Plugin : public PBD::StatefulDestructible, public Latent virtual int connect_and_run (BufferSet& bufs, samplepos_t start, samplepos_t end, double speed, - ChanMapping in, ChanMapping out, + ChanMapping const& in, ChanMapping const& out, pframes_t nframes, samplecnt_t offset); virtual std::set automatable() const = 0; diff --git a/libs/ardour/ardour/vst_plugin.h b/libs/ardour/ardour/vst_plugin.h index 39838e1b21..b2189143d3 100644 --- a/libs/ardour/ardour/vst_plugin.h +++ b/libs/ardour/ardour/vst_plugin.h @@ -74,7 +74,7 @@ public: int connect_and_run (BufferSet&, samplepos_t start, samplepos_t end, double speed, - ChanMapping in, ChanMapping out, + ChanMapping const& in, ChanMapping const& out, pframes_t nframes, samplecnt_t offset ); diff --git a/libs/ardour/audio_unit.cc b/libs/ardour/audio_unit.cc index 4dba7ea835..0482ff2bb6 100644 --- a/libs/ardour/audio_unit.cc +++ b/libs/ardour/audio_unit.cc @@ -1639,7 +1639,7 @@ AUPlugin::render_callback(AudioUnitRenderActionFlags*, int AUPlugin::connect_and_run (BufferSet& bufs, samplepos_t start, samplepos_t end, double speed, - ChanMapping in_map, ChanMapping out_map, + ChanMapping const& in_map, ChanMapping const& out_map, pframes_t nframes, samplecnt_t offset) { Plugin::connect_and_run(bufs, start, end, speed, in_map, out_map, nframes, offset); diff --git a/libs/ardour/ladspa_plugin.cc b/libs/ardour/ladspa_plugin.cc index 570c5109ff..be0edee8b5 100644 --- a/libs/ardour/ladspa_plugin.cc +++ b/libs/ardour/ladspa_plugin.cc @@ -558,7 +558,7 @@ LadspaPlugin::automatable () const int LadspaPlugin::connect_and_run (BufferSet& bufs, samplepos_t start, samplepos_t end, double speed, - ChanMapping in_map, ChanMapping out_map, + ChanMapping const& in_map, ChanMapping const& out_map, pframes_t nframes, samplecnt_t offset) { Plugin::connect_and_run (bufs, start, end, speed, in_map, out_map, nframes, offset); diff --git a/libs/ardour/luaproc.cc b/libs/ardour/luaproc.cc index bf93e1df67..58167e7f06 100644 --- a/libs/ardour/luaproc.cc +++ b/libs/ardour/luaproc.cc @@ -614,7 +614,7 @@ LuaProc::configure_io (ChanCount in, ChanCount out) int LuaProc::connect_and_run (BufferSet& bufs, samplepos_t start, samplepos_t end, double speed, - ChanMapping in, ChanMapping out, + ChanMapping const& in, ChanMapping const& out, pframes_t nframes, samplecnt_t offset) { if (!_lua_dsp) { diff --git a/libs/ardour/lv2_plugin.cc b/libs/ardour/lv2_plugin.cc index 6f8dad9396..3ae3140577 100644 --- a/libs/ardour/lv2_plugin.cc +++ b/libs/ardour/lv2_plugin.cc @@ -2568,7 +2568,7 @@ write_position(LV2_Atom_Forge* forge, int LV2Plugin::connect_and_run(BufferSet& bufs, samplepos_t start, samplepos_t end, double speed, - ChanMapping in_map, ChanMapping out_map, + ChanMapping const& in_map, ChanMapping const& out_map, pframes_t nframes, samplecnt_t offset) { DEBUG_TRACE(DEBUG::LV2, string_compose("%1 run %2 offset %3\n", name(), nframes, offset)); diff --git a/libs/ardour/plugin.cc b/libs/ardour/plugin.cc index 2d1ffbed74..f3d66971b8 100644 --- a/libs/ardour/plugin.cc +++ b/libs/ardour/plugin.cc @@ -353,7 +353,7 @@ Plugin::write_immediate_event (size_t size, const uint8_t* buf) int Plugin::connect_and_run (BufferSet& bufs, samplepos_t /*start*/, samplepos_t /*end*/, double /*speed*/, - ChanMapping /*in_map*/, ChanMapping /*out_map*/, + ChanMapping const& /*in_map*/, ChanMapping const& /*out_map*/, pframes_t nframes, samplecnt_t /*offset*/) { if (bufs.count().n_midi() > 0) { diff --git a/libs/ardour/vst_plugin.cc b/libs/ardour/vst_plugin.cc index a85c9ca678..cbd88877cd 100644 --- a/libs/ardour/vst_plugin.cc +++ b/libs/ardour/vst_plugin.cc @@ -671,7 +671,7 @@ VSTPlugin::automatable () const int VSTPlugin::connect_and_run (BufferSet& bufs, samplepos_t start, samplepos_t end, double speed, - ChanMapping in_map, ChanMapping out_map, + ChanMapping const& in_map, ChanMapping const& out_map, pframes_t nframes, samplecnt_t offset) { Plugin::connect_and_run(bufs, start, end, speed, in_map, out_map, nframes, offset);