aboutsummaryrefslogtreecommitdiffstats
path: root/src/main.zig
diff options
context:
space:
mode:
authors-ol <s-ol@users.noreply.github.com>2020-01-25 16:36:11 +0000
committers-ol <s-ol@users.noreply.github.com>2020-01-25 16:57:31 +0000
commit9d2d72db724de3b21a7ade4623c3b1a8603e85f3 (patch)
tree3f2ef21dfcc66db486b4871c2352ece0eea744e4 /src/main.zig
parentbasic OSC support (diff)
downloadglsl-view-9d2d72db724de3b21a7ade4623c3b1a8603e85f3.tar.gz
glsl-view-9d2d72db724de3b21a7ade4623c3b1a8603e85f3.zip
OSC configuration in config.yaml
Diffstat (limited to 'src/main.zig')
-rw-r--r--src/main.zig12
1 files changed, 7 insertions, 5 deletions
diff --git a/src/main.zig b/src/main.zig
index 41ad341..bde9767 100644
--- a/src/main.zig
+++ b/src/main.zig
@@ -16,8 +16,10 @@ fn errorCallback(err: c_int, description: [*c]const u8) callconv(.C) void {
}
pub fn main() !void {
- var config = try cfg.Config.parse("config.yaml");
- defer config.arena.deinit();
+ var arena = std.heap.ArenaAllocator.init(std.heap.page_allocator);
+ defer arena.deinit();
+
+ var config = try cfg.Config.parse(&arena.allocator, "config.yaml");
_ = c.glfwSetErrorCallback(errorCallback);
@@ -52,10 +54,10 @@ pub fn main() !void {
var constants = try gl.Constants.create(window);
defer constants.destroy();
- var outputs = try std.ArrayList(*out.Output).initCapacity(&config.arena.allocator, config.outputs.len);
+ var outputs = try std.ArrayList(*out.Output).initCapacity(&arena.allocator, config.outputs.len);
defer outputs.deinit();
for (config.outputs) |output_config, i| {
- try outputs.append(out.Output.create(&config.arena.allocator, output_config, &constants));
+ try outputs.append(out.Output.create(&arena.allocator, output_config, &constants));
}
defer for (outputs.toSlice()) |output| {
output.destroy(output);
@@ -106,7 +108,7 @@ pub fn main() !void {
var offset: f32 = 0;
- const control = try ctrl.ControlServer.init(&config.arena.allocator);
+ const control = try ctrl.ControlServer.init(&arena.allocator, config.osc);
defer control.destroy();
while (c.glfwWindowShouldClose(window) == c.GL_FALSE) {