add highpass cmd

- remove bypass arg from reverb cmd
This commit is contained in:
Luna 2019-07-10 20:41:17 -03:00
parent 159048550d
commit c743681515
5 changed files with 41 additions and 13 deletions

View File

@ -89,11 +89,20 @@ Runs the Higher Quality Pitch Scaler from the SWH plugins.
The `mult` parameter is the pitch coefficient, range from 0.5..2, default 1. 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` ## `reverb split index roomLength roomHeight sourceLR sourceFB listLR listFB hpf warmth diffusion`
Run the Early Reflection Reverb from the Invada Studio plugins. Run the Early Reflection Reverb from the Invada Studio plugins.
**TODO** Parameters. **TODO** Parameter list
## `highpass split index freq gain noClip`
Run the High Pass Filter from the Invada Studio plugins.
Parameters:
- `freq`: Frequency. 20-20000, default 1000
- `gain`: Gain, 0-12, default 0
- `noClip`: Soft Clip (assumed boolean), 0-1, default 0
## TODO `echo split index delay` ## TODO `echo split index delay`

3
examples/highpass.scri Normal file
View File

@ -0,0 +1,3 @@
load :0;
highpass 3 1 1000 0 0;
quicksave;

View File

@ -1,3 +1,3 @@
load :0; load :0;
reverb 3 1 0 25 30 0 0.8 0 0.2 1000 50 50; reverb 3 1 25 30 0 0.8 0 0.2 1000 50 50;
quicksave; quicksave;

View File

@ -21,6 +21,7 @@ pub const CommandType = enum {
Chorus, Chorus,
PitchScaler, PitchScaler,
Reverb, Reverb,
Highpass,
}; };
pub const Command = struct { pub const Command = struct {
@ -130,6 +131,7 @@ pub const Lang = struct {
_ = try self.keywords.put("chorus", .Chorus); _ = try self.keywords.put("chorus", .Chorus);
_ = try self.keywords.put("pitchscaler", .PitchScaler); _ = try self.keywords.put("pitchscaler", .PitchScaler);
_ = try self.keywords.put("reverb", .Reverb); _ = try self.keywords.put("reverb", .Reverb);
_ = try self.keywords.put("highpass", .Highpass);
} }
pub fn parse(self: *Lang, data: []const u8) !CommandList { pub fn parse(self: *Lang, data: []const u8) !CommandList {

View File

@ -204,6 +204,11 @@ pub const Runner = struct {
try image.runPlugin("http://invadarecords.com/plugins/lv2/erreverb/mono", pos, params); try image.runPlugin("http://invadarecords.com/plugins/lv2/erreverb/mono", pos, params);
} }
fn highpassCmd(self: *Runner, pos: Position, params: ParamList) !void {
var image = try self.getImage();
try image.runPlugin("http://invadarecords.com/plugins/lv2/filter/hpf/mono", pos, params);
}
fn runCommand(self: *Runner, cmd: *lang.Command) !void { fn runCommand(self: *Runner, cmd: *lang.Command) !void {
var params = ParamList.init(self.allocator); var params = ParamList.init(self.allocator);
defer params.deinit(); defer params.deinit();
@ -278,20 +283,29 @@ pub const Runner = struct {
.Reverb => blk: { .Reverb => blk: {
const pos = try cmd.consumePosition(); const pos = try cmd.consumePosition();
try cmd.appendParam(&params, "bypass", 2); try cmd.appendParam(&params, "roomLength", 2);
try cmd.appendParam(&params, "roomLength", 3); try cmd.appendParam(&params, "roomHeight", 3);
try cmd.appendParam(&params, "roomHeight", 4); try cmd.appendParam(&params, "sourceLR", 4);
try cmd.appendParam(&params, "sourceLR", 5); try cmd.appendParam(&params, "sourceFB", 5);
try cmd.appendParam(&params, "sourceFB", 6); try cmd.appendParam(&params, "listLR", 6);
try cmd.appendParam(&params, "listLR", 7); try cmd.appendParam(&params, "listFB", 7);
try cmd.appendParam(&params, "listFB", 8); try cmd.appendParam(&params, "hpf", 8);
try cmd.appendParam(&params, "hpf", 9); try cmd.appendParam(&params, "warmth", 9);
try cmd.appendParam(&params, "warmth", 10); try cmd.appendParam(&params, "diffusion", 10);
try cmd.appendParam(&params, "diffusion", 11);
try self.reverbCmd(pos, params); try self.reverbCmd(pos, params);
}, },
.Highpass => blk: {
const pos = try cmd.consumePosition();
try cmd.appendParam(&params, "freq", 2);
try cmd.appendParam(&params, "gain", 3);
try cmd.appendParam(&params, "noClip", 4);
try self.highpassCmd(pos, params);
},
else => blk: { else => blk: {
std.debug.warn("Unsupported command: {}\n", cmd.command); std.debug.warn("Unsupported command: {}\n", cmd.command);
break :blk RunError.UnknownCommand; break :blk RunError.UnknownCommand;