remove old Command struct

This commit is contained in:
Luna 2020-05-31 17:16:57 -03:00
parent d09603c005
commit 8e0ebbe5e0

View file

@ -9,49 +9,6 @@ pub const ParseError = error{
}; };
pub const CommandType = enum { pub const CommandType = enum {
Noop,
Load,
Quicksave,
RunQS,
Amp,
RFlanger,
Eq,
Phaser,
Mbeq,
Chorus,
PitchScaler,
Reverb,
Highpass,
Delay,
Vinyl,
RevDelay,
Gate,
Detune,
Overdrive,
Degrade,
RePsycho,
TalkBox,
DynComp,
ThruZero,
Foverdrive,
Gverb,
Invert,
TapeDelay,
ModDelay,
MultiChorus,
Saturator,
VintageDelay,
Noise,
WildNoise,
Write,
Embed,
Rotate,
};
pub const NewCommandType = enum {
/// "LV2 Commands" are commands that receive split, index, and then receive /// "LV2 Commands" are commands that receive split, index, and then receive
/// any f64 arguments. /// any f64 arguments.
lv2_command, lv2_command,
@ -64,7 +21,7 @@ fn LV2Command(
) type { ) type {
return struct { return struct {
pub const base_tag = tag; pub const base_tag = tag;
pub const command_type = NewCommandType.lv2_command; pub const command_type = CommandType.lv2_command;
pub const lv2_url = plugin_url; pub const lv2_url = plugin_url;
base: NewCommand, base: NewCommand,
@ -226,107 +183,6 @@ pub const NewCommand = struct {
); );
}; };
pub const Command = struct {
command: CommandType,
args: ArgList,
cur_idx: usize = 0,
pub fn print(self: Command) void {
std.debug.warn("cmd:{}\n", .{self.command});
}
pub fn argAt(self: Command, idx: usize) ![]const u8 {
std.debug.warn("{} {}", .{ idx, self.args.items.len });
if (idx > (self.args.items.len - 1)) {
std.debug.warn("Expected argument at index {}\n", .{idx});
return ParseError.ArgRequired;
}
return self.args.items[idx];
}
pub fn usizeArgAt(self: Command, idx: usize) !usize {
var arg = try self.argAt(idx);
return try std.fmt.parseInt(usize, arg, 10);
}
pub fn consumePosition(self: *Command) !plugin.Position {
self.cur_idx = 2;
return plugin.Position{
.split = try self.usizeArgAt(0),
.index = try self.usizeArgAt(1),
};
}
pub fn intArgAt(self: Command, idx: usize) !i32 {
var arg = try self.argAt(idx);
return try std.fmt.parseInt(i32, arg, 10);
}
pub fn floatArgAt(self: Command, idx: usize) !f32 {
var arg = try self.argAt(idx);
return try std.fmt.parseFloat(f32, arg);
}
pub fn floatArgMany(
self: Command,
allocator: *std.mem.Allocator,
start_index: usize,
elements: usize,
default: f32,
) ![]const f32 {
var i: usize = start_index;
var arr = std.ArrayList(f32).init(allocator);
while (i < elements) : (i += 1) {
var value: f32 = self.floatArgAt(i) catch |err| blk: {
std.debug.warn("\tdoing default on arg {}\n", .{i});
break :blk default;
};
try arr.append(value);
}
return arr.items;
}
pub fn appendParam(
self: *Command,
params: *plugin.ParamList,
symbol: []const u8,
) !void {
var val = try self.floatArgAt(self.cur_idx);
self.cur_idx += 1;
try params.append(plugin.Param{
.sym = symbol,
.value = val,
});
}
pub fn appendParamMap(
self: *Command,
map: *plugin.ParamMap,
symbol: []const u8,
) !void {
var val = try self.floatArgAt(self.cur_idx);
self.cur_idx += 1;
_ = try map.put(symbol, val);
}
pub fn copy(self: Command, allocator: *std.mem.Allocator) !*Command {
var cmd = try allocator.create(Command);
cmd.* = Command{
.command = self.command,
.args = self.args,
.cur_idx = self.cur_idx,
};
return cmd;
}
};
pub const CommandList = std.ArrayList(*NewCommand); pub const CommandList = std.ArrayList(*NewCommand);
pub const ArgList = std.ArrayList([]const u8); pub const ArgList = std.ArrayList([]const u8);