From 5bbfd0d1bd7d0fc443b25ed16a6df38d8937b19d Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Thu, 14 Apr 2016 03:08:58 +0200 Subject: luaproc: assert instance access --- scripts/amp2.lua | 13 +++++++++++-- scripts/amp3.lua | 8 ++++---- 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/scripts/amp2.lua b/scripts/amp2.lua index f6328ff404..42316af493 100644 --- a/scripts/amp2.lua +++ b/scripts/amp2.lua @@ -34,8 +34,17 @@ end function dsp_runmap (bufs, in_map, out_map, n_samples, offset) for c = 1,audio_ins do - local b = in_map:get(ARDOUR.DataType("audio"), c - 1); -- get id of mapped buffer - local a = bufs:get_audio(b):data(offset):array() -- get a reference (pointer to array) + -- ensure that processing does happen in-place + local ib = in_map:get(ARDOUR.DataType("audio"), c - 1); -- get id of mapped input buffer for given cannel + local ob = out_map:get(ARDOUR.DataType("audio"), c - 1); -- get id of mapped output buffer for given cannel + assert (ib ~= ARDOUR.ChanMapping.Invalid); + assert (ob ~= ARDOUR.ChanMapping.Invalid); + + local bi = bufs:get_audio(ib) + local bo = bufs:get_audio(ob) + assert (bi:sameinstance(bo)) + + local a = bufs:get_audio(ib):data(offset):array() -- get a reference (pointer to array) for s = 1,n_samples do a[s] = a[s] * 2; -- modify data in-place (shared with ardour) end diff --git a/scripts/amp3.lua b/scripts/amp3.lua index 2f246a252d..ffffd57361 100644 --- a/scripts/amp3.lua +++ b/scripts/amp3.lua @@ -31,15 +31,15 @@ end -- This is as efficient as Ardour doing it itself in C++ -- Lua function overhead is negligible -- --- this also exemplifies the /simpler/ way of letting ardour to --- the channel and offset mapping. +-- this also exemplifies the /simpler/ way of delegating the +-- channel-mapping to ardour. function dsp_run (ins, outs, n_samples) local ctrl = CtrlPorts:array() -- get control port array (read/write) local gain = ARDOUR.DSP.dB_to_coefficient (ctrl[1]) - assert (#ins == #outs) -- ensure that we can run in-place + assert (#ins == #outs) -- ensure that we can run in-place (channel count matches) for c = 1,#ins do - --for c in pairs (ins) do -- also works, slightly less effective + assert (ins[c]:sameinstance(outs[c])) -- check in-place ARDOUR.DSP.apply_gain_to_buffer (ins[c], n_samples, gain); -- process in-place end end -- cgit v1.2.3