From 159048550d66e1fa15ba08b724dff76c220111b6 Mon Sep 17 00:00:00 2001 From: Luna Date: Wed, 10 Jul 2019 20:19:40 -0300 Subject: [PATCH] add reverb command --- README.md | 1 + doc/README.md | 6 ++++++ examples/reverb.scri | 3 +++ src/lang.zig | 2 ++ src/plugin.zig | 2 +- src/runner.zig | 22 ++++++++++++++++++++++ 6 files changed, 35 insertions(+), 1 deletion(-) create mode 100644 examples/reverb.scri diff --git a/README.md b/README.md index 629374c..1d172d9 100644 --- a/README.md +++ b/README.md @@ -18,6 +18,7 @@ glitch art "framework", ???????? language??? something? ## plugin depedencies: - lv2 default plugins (most specifically the eg-amp plugin) - the SWH plugins ( https://github.com/swh/lv2 ) + - the Invada Studio plugins ( https://launchpad.net/invada-studio/ ) ```bash # build and install diff --git a/doc/README.md b/doc/README.md index 9792d7a..205d950 100644 --- a/doc/README.md +++ b/doc/README.md @@ -89,6 +89,12 @@ Runs the Higher Quality Pitch Scaler from the SWH plugins. The `mult` parameter is the pitch coefficient, range from 0.5..2, default 1. +## `reverb split index bypass roomLength roomHeight sourceLR sourceFB listLR listFB hpf warmth diffusion` + +Run the Early Reflection Reverb from the Invada Studio plugins. + +**TODO** Parameters. + ## TODO `echo split index delay` Run an echo filter on the given loaded file. diff --git a/examples/reverb.scri b/examples/reverb.scri new file mode 100644 index 0000000..619faf9 --- /dev/null +++ b/examples/reverb.scri @@ -0,0 +1,3 @@ +load :0; +reverb 3 1 0 25 30 0 0.8 0 0.2 1000 50 50; +quicksave; diff --git a/src/lang.zig b/src/lang.zig index 015e65b..7add67f 100644 --- a/src/lang.zig +++ b/src/lang.zig @@ -20,6 +20,7 @@ pub const CommandType = enum { Mbeq, Chorus, PitchScaler, + Reverb, }; pub const Command = struct { @@ -128,6 +129,7 @@ pub const Lang = struct { _ = try self.keywords.put("phaser", .Phaser); _ = try self.keywords.put("chorus", .Chorus); _ = try self.keywords.put("pitchscaler", .PitchScaler); + _ = try self.keywords.put("reverb", .Reverb); } pub fn parse(self: *Lang, data: []const u8) !CommandList { diff --git a/src/plugin.zig b/src/plugin.zig index 6ee0c94..79094f6 100644 --- a/src/plugin.zig +++ b/src/plugin.zig @@ -74,7 +74,7 @@ pub const RunContext = struct { return RunContext{ .in_buf = try allocator.alloc(f32, 1), - .out_buf = try allocator.alloc(f32, 1), + .out_buf = try allocator.alloc(f32, 2), .instance = instance.?, }; } diff --git a/src/runner.zig b/src/runner.zig index 7121ee7..92f450f 100644 --- a/src/runner.zig +++ b/src/runner.zig @@ -199,6 +199,11 @@ pub const Runner = struct { try image.runPlugin("http://plugin.org.uk/swh-plugins/pitchScaleHQ", pos, params); } + fn reverbCmd(self: *Runner, pos: Position, params: ParamList) !void { + var image = try self.getImage(); + try image.runPlugin("http://invadarecords.com/plugins/lv2/erreverb/mono", pos, params); + } + fn runCommand(self: *Runner, cmd: *lang.Command) !void { var params = ParamList.init(self.allocator); defer params.deinit(); @@ -270,6 +275,23 @@ pub const Runner = struct { try self.pitchScalerCmd(pos, params); }, + .Reverb => blk: { + const pos = try cmd.consumePosition(); + + try cmd.appendParam(¶ms, "bypass", 2); + try cmd.appendParam(¶ms, "roomLength", 3); + try cmd.appendParam(¶ms, "roomHeight", 4); + try cmd.appendParam(¶ms, "sourceLR", 5); + try cmd.appendParam(¶ms, "sourceFB", 6); + try cmd.appendParam(¶ms, "listLR", 7); + try cmd.appendParam(¶ms, "listFB", 8); + try cmd.appendParam(¶ms, "hpf", 9); + try cmd.appendParam(¶ms, "warmth", 10); + try cmd.appendParam(¶ms, "diffusion", 11); + + try self.reverbCmd(pos, params); + }, + else => blk: { std.debug.warn("Unsupported command: {}\n", cmd.command); break :blk RunError.UnknownCommand;