aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authors-ol <s-ol@users.noreply.github.com>2020-05-14 14:43:18 +0000
committers-ol <s-ol@users.noreply.github.com>2020-05-14 14:43:18 +0000
commit1ec42e5d1712321097b332ea5a278666e7c09c50 (patch)
tree19c3edef9eef98fa71387c1d8870a77d4f285235
parentformat, remove debug GL output (diff)
downloadglsl-view-1ec42e5d1712321097b332ea5a278666e7c09c50.tar.gz
glsl-view-1ec42e5d1712321097b332ea5a278666e7c09c50.zip
update for zig 0.6.0
-rw-r--r--src/config.zig2
-rw-r--r--src/control.zig2
-rw-r--r--src/main.zig6
3 files changed, 5 insertions, 5 deletions
diff --git a/src/config.zig b/src/config.zig
index ad4a181..5bc449d 100644
--- a/src/config.zig
+++ b/src/config.zig
@@ -60,7 +60,7 @@ pub const Config = struct {
const file = try fs.cwd().openFile(filename, .{});
var buffer: [1024]u8 = undefined;
const len: usize = try file.read(buffer[0..]);
- c.yaml_parser_set_input_string(&parser, buffer[0..].ptr, len);
+ c.yaml_parser_set_input_string(&parser, buffer[0..], len);
var config: Config = .{
.width = 1920,
diff --git a/src/control.zig b/src/control.zig
index f41d32e..b6744b3 100644
--- a/src/control.zig
+++ b/src/control.zig
@@ -26,7 +26,7 @@ pub const ControlServer = struct {
};
std.debug.warn("listening for OSC messages on {} port {}\n", .{ conf.protocol, conf.port });
- self.server = c.lo_server_new_with_proto(port[0..].ptr, proto, handle_error);
+ self.server = c.lo_server_new_with_proto(port[0..], proto, handle_error);
},
.URL => |url| {
std.debug.warn("listening for OSC messages at {s}\n", .{url});
diff --git a/src/main.zig b/src/main.zig
index 1ba1b26..0a8ee9d 100644
--- a/src/main.zig
+++ b/src/main.zig
@@ -59,7 +59,7 @@ pub fn main() !void {
for (config.outputs) |output_config, i| {
try outputs.append(out.Output.create(&arena.allocator, output_config, &constants));
}
- defer for (outputs.toSlice()) |output| {
+ defer for (outputs.items) |output| {
output.destroy(output);
};
@@ -135,7 +135,7 @@ pub fn main() !void {
constants.normalized_quad.draw();
fbo.unbind();
- for (outputs.toSlice()) |output, i| {
+ for (outputs.items) |output, i| {
const close = output.update(output, fbo.texture_id);
if (close) {
const removed = outputs.swapRemove(i);
@@ -144,7 +144,7 @@ pub fn main() !void {
}
}
- if (outputs.len == 0)
+ if (outputs.items.len == 0)
break;
c.glfwPollEvents();