X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=scripts%2Fscope.lua;h=1952c100c431151fa6ac3534105cf646618c8a70;hb=a0b117b9481a1a3091a6d0c1fe0deacf17e20529;hp=32881feddef4807e0e8f126944c6243fd0d171fc;hpb=b47fb7a0b2669ff66f651d0457e3753659df8350;p=ardour.git

diff --git a/scripts/scope.lua b/scripts/scope.lua
index 32881fedde..1952c100c4 100644
--- a/scripts/scope.lua
+++ b/scripts/scope.lua
@@ -1,11 +1,10 @@
 ardour {
 	["type"]    = "dsp",
-	name        = "Inline Scope",
-	license     = "GPLv2",
-	author      = "Robin Gareus",
-	email       = "robin@gareus.org",
-	site        = "http://gareus.org",
-	description = [[An Example DSP Plugin to display the waveform on the mixer strip]]
+	name        = "a-Inline Scope",
+	category    = "Visualization",
+	license     = "MIT",
+	author      = "Ardour Team",
+	description = [[Mixer strip inline waveform display]]
 }
 
 -- return possible i/o configurations
@@ -19,7 +18,7 @@ function dsp_params ()
 	{
 		{ ["type"] = "input", name = "Timescale", min = .1, max = 5, default = 2, unit="sec", logarithmic = true },
 		{ ["type"] = "input", name = "Logscale", min = 0, max = 1, default = 0, toggled = true },
-		{ ["type"] = "input", name = "Height", min = 0, max = 3, default = 1, unit="dB", enum = true, scalepoints =
+		{ ["type"] = "input", name = "Height (Aspect)", min = 0, max = 3, default = 1, enum = true, scalepoints =
 			{
 				["Min"] = 0,
 				["16:10"] = 1,
@@ -42,8 +41,6 @@ end
 function dsp_configure (ins, outs)
 	-- store configuration in global variable
 	audio_ins = ins:n_audio ()
-	local audio_outs = outs:n_audio ()
-	assert (audio_ins == audio_outs)
 	-- allocate shared memory area
 	-- this is used to speed up DSP computaton (using a C array)
 	-- and to share data with the GUI
@@ -63,14 +60,35 @@ function dsp_runmap (bufs, in_map, out_map, n_samples, offset)
 	for c = 1,audio_ins do
 		-- Note: lua starts counting at 1, ardour's ChanMapping::get() at 0
 		local ib = in_map:get (ARDOUR.DataType ("audio"), c - 1); -- get id of mapped input buffer for given cannel
-		assert (ib ~= ARDOUR.ChanMapping.Invalid)
+		local ob = out_map:get (ARDOUR.DataType ("audio"), c - 1); -- get id of mapped output buffer for given cannel
 		local chn_off = 4 + bufsiz * (c - 1)
-		if (write_ptr + n_samples < bufsiz) then
-			ARDOUR.DSP.copy_vector (shmem:to_float (write_ptr + chn_off), bufs:get_audio (ib):data (offset), n_samples)
+		if (ib ~= ARDOUR.ChanMapping.Invalid) then
+			if (write_ptr + n_samples < bufsiz) then
+				ARDOUR.DSP.copy_vector (shmem:to_float (write_ptr + chn_off), bufs:get_audio (ib):data (offset), n_samples)
+			else
+				local w0 = bufsiz - write_ptr;
+				ARDOUR.DSP.copy_vector (shmem:to_float (write_ptr + chn_off), bufs:get_audio (ib):data (offset), w0)
+				ARDOUR.DSP.copy_vector (shmem:to_float (chn_off)            , bufs:get_audio (ib):data (offset + w0), n_samples - w0)
+			end
+			if (ob ~= ARDOUR.ChanMapping.Invalid and ib ~= ob) then
+				ARDOUR.DSP.copy_vector (bufs:get_audio (ob):data (offset), bufs:get_audio (ib):data (offset), n_samples)
+			end
 		else
-			local w0 = bufsiz - write_ptr;
-			ARDOUR.DSP.copy_vector (shmem:to_float (write_ptr + chn_off), bufs:get_audio (ib):data (offset), w0)
-			ARDOUR.DSP.copy_vector (shmem:to_float (chn_off)            , bufs:get_audio (ib):data (offset), n_samples - w0)
+			if (write_ptr + n_samples < bufsiz) then
+				ARDOUR.DSP.memset (shmem:to_float (write_ptr + chn_off), 0, n_samples)
+			else
+				local w0 = bufsiz - write_ptr;
+				ARDOUR.DSP.memset (shmem:to_float (write_ptr + chn_off), 0, w0)
+				ARDOUR.DSP.memset (shmem:to_float (chn_off)            , 0, n_samples - w0)
+			end
+		end
+	end
+	-- clear unconnected inplace buffers
+	for c = 1,audio_ins do
+		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
+		if (ib == ARDOUR.ChanMapping.Invalid and ob ~= ARDOUR.ChanMapping.Invalid) then
+			bufs:get_audio (ob):silence (n_samples, offset)
 		end
 	end